Fixed name changes in CMakeLists.txt