Renamed models appropriately