- Renamed (fixed) enumerations to match class names exactly