Renamed to suffix Model classes with *Model