CMakeLists updated
Fix name shadowing