Merge "Change case to use the canonical names."