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"