diff --git a/policies/role-administrator/role-administrator.hcl b/policies/administrator/administrator.hcl
similarity index 100%
rename from policies/role-administrator/role-administrator.hcl
rename to policies/administrator/administrator.hcl
diff --git a/policies/role-administrator/role-auditor.hcl b/policies/administrator/auditor.hcl
similarity index 100%
rename from policies/role-administrator/role-auditor.hcl
rename to policies/administrator/auditor.hcl
diff --git a/policies/role-cfgmgmt/role-cfgmgmt.hcl b/policies/cfgmgmt/cfgmgmt.hcl
similarity index 100%
rename from policies/role-cfgmgmt/role-cfgmgmt.hcl
rename to policies/cfgmgmt/cfgmgmt.hcl
diff --git a/policies/role-human/role-change-own-password.hcl b/policies/human/change-own-password.hcl
similarity index 100%
rename from policies/role-human/role-change-own-password.hcl
rename to policies/human/change-own-password.hcl
diff --git a/policies/role-kv-writer/role-kv-writer.hcl b/policies/kv-writer/kv-writer.hcl
similarity index 100%
rename from policies/role-kv-writer/role-kv-writer.hcl
rename to policies/kv-writer/kv-writer.hcl
diff --git a/policies/role-zabbix/role-zabbix.hcl b/policies/zabbix/zabbix.hcl
similarity index 100%
rename from policies/role-zabbix/role-zabbix.hcl
rename to policies/zabbix/zabbix.hcl