diff --git a/jenkins/client/job/debian/init.yml b/jenkins/client/job/debian/init.yml
index b5b2ebd..d0b40a0 100644
--- a/jenkins/client/job/debian/init.yml
+++ b/jenkins/client/job/debian/init.yml
@@ -1,2 +1,2 @@
 classes:
-  - system_extra.jenkins.client.job.debian.packages
+  - system.jenkins.client.job.debian.packages
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 3681993..137d4ea 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -1,5 +1,5 @@
 classes:
-  - system_extra.jenkins.client.job.common
+  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/debian/packages/horizon/init.yml b/jenkins/client/job/debian/packages/horizon/init.yml
index 827f11a..a899680 100644
--- a/jenkins/client/job/debian/packages/horizon/init.yml
+++ b/jenkins/client/job/debian/packages/horizon/init.yml
@@ -1,3 +1,3 @@
 classes:
-  - system_extra.jenkins.client.job.debian.packages.horizon.modules
-  - system_extra.jenkins.client.job.debian.packages.horizon.themes
+  - system.jenkins.client.job.debian.packages.horizon.modules
+  - system.jenkins.client.job.debian.packages.horizon.themes
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index 29336e9..86a5990 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -1,5 +1,5 @@
 classes:
-  - system_extra.jenkins.client.job.common
+  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/debian/packages/horizon/themes.yml b/jenkins/client/job/debian/packages/horizon/themes.yml
index e6989b9..b94518c 100644
--- a/jenkins/client/job/debian/packages/horizon/themes.yml
+++ b/jenkins/client/job/debian/packages/horizon/themes.yml
@@ -1,5 +1,5 @@
 classes:
-  - system_extra.jenkins.client.job.common
+  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/debian/packages/init.yml b/jenkins/client/job/debian/packages/init.yml
index 972b7df..56f6f12 100644
--- a/jenkins/client/job/debian/packages/init.yml
+++ b/jenkins/client/job/debian/packages/init.yml
@@ -1,5 +1,5 @@
 classes:
-  - system_extra.jenkins.client.job.debian.packages.extra
-  - system_extra.jenkins.client.job.debian.packages.salt
-  - system_extra.jenkins.client.job.debian.packages.salt-multi
-  - system_extra.jenkins.client.job.debian.packages.horizon
+  - system.jenkins.client.job.debian.packages.extra
+  - system.jenkins.client.job.debian.packages.salt
+  - system.jenkins.client.job.debian.packages.salt-multi
+  - system.jenkins.client.job.debian.packages.horizon
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index 35e1aa9..f8e8991 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -1,5 +1,5 @@
 classes:
-  - system_extra.jenkins.client.job.common
+  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 73eedef..f848660 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -1,5 +1,5 @@
 classes:
-  - system_extra.jenkins.client.job.common
+  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client: