Renamed some enums