refactor C++ sources - renaming exercise