BUG: CMake variables needed rename as well for previous commit.