Fixed error in CMakeLists, renaming not completed...
Merged cmake, was the same..