Renamed ENUM to shorter all caps names