Fixes to capitalization inconsistencies