Merge "Change name of policy ID in API"