renamed views and models