Fix namespace issues and CMake configuration.