cosmetic naming changes in c++ code