Renamed the rest of the model objects.