Fix casing.
Fix casing and conflicts.