Cleanup for consistent capitalization