Update CMakeLists.txt
Rename all functions to match new convention