Standardize members of enum ServicePolicy
Remove enum monitord_rep, enum software_rep