[refactoring] renamed EntitlementsEntity to EntitlementEntitty and

RolesEntity to RoleEntitiy