Fixing C++ reserved identifiers