[cleanup] EntitlementsEntity_ replaced by EntitlementEntity