More capitalization fixes