Add policy on naming