Renamed Model classes