CLN: Clean up some uneven capitalization