Capitalization fixes