Fixed C++ keyword in names