refactored entity to entityName