renamed models to entities