Merge "Giving consistent names to IDCT 16x16 functions."