Renamed enum, fixed format