Refactored enum names to be UPPER_CASE