Renaming some enumerations
Renaming enums
Continuted renaming