Fixed namings and updated CMakeBuild.txt to new names