Fixed capitalization issues