Refactored Enum names