Enum name changes to be more readable