More entitlement -> subscription renaming