Standardize enum cf_srv_policy -> ServicePolicy