CMake: Cleanup more names.