Merge "Giving consistent names to IDCT/IWHT functions."