Revising policy key names to match new UI