improve names in CMakeLists