Renamed grammar classes