diff --git a/metadata/service/master/pillar/composite/gpg.yml b/metadata/service/master/pillar/composite/gpg.yml
index 92641e8..8dc0218 100644
--- a/metadata/service/master/pillar/composite/gpg.yml
+++ b/metadata/service/master/pillar/composite/gpg.yml
@@ -1,5 +1,5 @@
 classes:
-- service.master.pillar.composite
+- service.salt.master.pillar.composite
 parameters:
   salt:
     master:
diff --git a/metadata/service/master/pillar/composite/nacl.yml b/metadata/service/master/pillar/composite/nacl.yml
index 9aa76e6..8a84a8c 100644
--- a/metadata/service/master/pillar/composite/nacl.yml
+++ b/metadata/service/master/pillar/composite/nacl.yml
@@ -1,6 +1,6 @@
 classes:
-- service.master.nacl
-- service.master.pillar.composite
+- service.salt.master.nacl
+- service.salt.master.pillar.composite
 parameters:
   salt:
     master:
diff --git a/metadata/service/master/pillar/composite/reclass.yml b/metadata/service/master/pillar/composite/reclass.yml
index 93c8c0d..68b6b30 100644
--- a/metadata/service/master/pillar/composite/reclass.yml
+++ b/metadata/service/master/pillar/composite/reclass.yml
@@ -1,5 +1,5 @@
 classes:
-- service.master.pillar.composite
+- service.salt.master.pillar.composite
 parameters:
   salt:
     master:
diff --git a/metadata/service/master/pillar/composite/saltclass.yml b/metadata/service/master/pillar/composite/saltclass.yml
index 6dfab2e..832c7b7 100644
--- a/metadata/service/master/pillar/composite/saltclass.yml
+++ b/metadata/service/master/pillar/composite/saltclass.yml
@@ -1,5 +1,5 @@
 classes:
-- service.master.pillar.composite
+- service.salt.master.pillar.composite
 parameters:
   salt:
     master: