better naming in policies