renamed enumerations with Gv prefix