Changed entity to model. Cleaning up more models.