Merge "Consistent names for inverse hybrid transforms (1 of 2)."