Merge "Align the naming format for Color correction."