fixed naming due to removal of Role model