Renamed rule classes