diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index f1c03fb..b6398ce 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -1,5 +1,5 @@
 classes:
-  - system_extra.jenkins.client.job.common
+  - system.jenkins.client.job.common
 
 parameters:
   jenkins:
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:
diff --git a/jenkins/client/job/deploy/init.yml b/jenkins/client/job/deploy/init.yml
index 459ac39..62c92b4 100644
--- a/jenkins/client/job/deploy/init.yml
+++ b/jenkins/client/job/deploy/init.yml
@@ -1,5 +1,5 @@
 classes:
-  - system_extra.jenkins.client.job.deploy.mk_lab
-  - system_extra.jenkins.client.job.deploy.cicd_lab
-  - system_extra.jenkins.client.job.deploy.demo
-  - system_extra.jenkins.client.job.deploy.reclass_update
+  - system.jenkins.client.job.deploy.mk_lab
+  - system.jenkins.client.job.deploy.cicd_lab
+  - system.jenkins.client.job.deploy.demo
+  - system.jenkins.client.job.deploy.reclass_update
diff --git a/jenkins/client/job/opencontrail/build/dpdk-extra.yml b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
index 3f83a25..d4960a4 100644
--- a/jenkins/client/job/opencontrail/build/dpdk-extra.yml
+++ b/jenkins/client/job/opencontrail/build/dpdk-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/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 5bf7e5d..a550d3f 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.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/opencontrail/build/init.yml b/jenkins/client/job/opencontrail/build/init.yml
index 9ca87f5..759d78a 100644
--- a/jenkins/client/job/opencontrail/build/init.yml
+++ b/jenkins/client/job/opencontrail/build/init.yml
@@ -1,3 +1,3 @@
 classes:
-  - system_extra.jenkins.client.job.opencontrail.build.generic
-  - system_extra.jenkins.client.job.opencontrail.build.dpdk-extra
+  - system.jenkins.client.job.opencontrail.build.generic
+  - system.jenkins.client.job.opencontrail.build.dpdk-extra
diff --git a/jenkins/client/job/opencontrail/git-mirrors/2way.yml b/jenkins/client/job/opencontrail/git-mirrors/2way.yml
index 2d9a4b3..989ef68 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/2way.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/2way.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/opencontrail/git-mirrors/downstream.yml b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
index f10e339..1cdb7e8 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/downstream.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/opencontrail/git-mirrors/init.yml b/jenkins/client/job/opencontrail/git-mirrors/init.yml
index b73dfe5..4a06885 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/init.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/init.yml
@@ -1,4 +1,4 @@
 classes:
-  - system_extra.jenkins.client.job.opencontrail.git-mirrors.downstream
-  - system_extra.jenkins.client.job.opencontrail.git-mirrors.upstream
-  - system_extra.jenkins.client.job.opencontrail.git-mirrors.2way
+  - system.jenkins.client.job.opencontrail.git-mirrors.downstream
+  - system.jenkins.client.job.opencontrail.git-mirrors.upstream
+  - system.jenkins.client.job.opencontrail.git-mirrors.2way
diff --git a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
index f665658..303b035 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/upstream.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/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index 0a6613d..72ee4fe 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -1,6 +1,6 @@
 classes:
-  - system_extra.jenkins.client.job.opencontrail.build
-  - system_extra.jenkins.client.job.opencontrail.git-mirrors
+  - system.jenkins.client.job.opencontrail.build
+  - system.jenkins.client.job.opencontrail.git-mirrors
 parameters:
   _param:
     contrail_branches: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,master"
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/init.yml b/jenkins/client/job/salt-formulas/git-mirrors/init.yml
index a0f3f34..9b1d77d 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/init.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/init.yml
@@ -1,5 +1,5 @@
 classes:
-  - system_extra.jenkins.client.job.salt-formulas.git-mirrors.2way
+  - system.jenkins.client.job.salt-formulas.git-mirrors.2way
 parameters:
   _param:
     salt_formulas_branches: master
diff --git a/jenkins/client/job/salt-formulas/init.yml b/jenkins/client/job/salt-formulas/init.yml
index 2a506b9..c498032 100644
--- a/jenkins/client/job/salt-formulas/init.yml
+++ b/jenkins/client/job/salt-formulas/init.yml
@@ -1,4 +1,4 @@
 classes:
-  - system_extra.jenkins.client.job.salt-formulas.git-mirrors
-  - system_extra.jenkins.client.job.salt-formulas.tests
-  - system_extra.jenkins.client.job.salt-formulas.release
+  - system.jenkins.client.job.salt-formulas.git-mirrors
+  - system.jenkins.client.job.salt-formulas.tests
+  - system.jenkins.client.job.salt-formulas.release
diff --git a/jenkins/client/job/salt-models/git-mirrors.yml b/jenkins/client/job/salt-models/git-mirrors.yml
index 2cb3b24..2ff917b 100644
--- a/jenkins/client/job/salt-models/git-mirrors.yml
+++ b/jenkins/client/job/salt-models/git-mirrors.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/salt-models/init.yml b/jenkins/client/job/salt-models/init.yml
index 82f8345..9a98130 100644
--- a/jenkins/client/job/salt-models/init.yml
+++ b/jenkins/client/job/salt-models/init.yml
@@ -1,6 +1,6 @@
 classes:
-  - system_extra.jenkins.client.job.salt-models.git-mirrors
-  - system_extra.jenkins.client.job.salt-models.tests
+  - system.jenkins.client.job.salt-models.git-mirrors
+  - system.jenkins.client.job.salt-models.tests
 parameters:
   _param:
     salt_formulas_branches: master