Fix capitalization issues