Hacks to bypass reserved cpp keywords in enumerated values. -- only affects cpp, not cli