Further capitalization fixes