rename production for OW C++ grammar