Rename models to singular and working page objects