diff --git a/kubernetes/Templates/OpenBMC-build-job-v2.yaml b/kubernetes/Templates/OpenBMC-build-job-v2.yaml
index f379bff..a6719c7 100644
--- a/kubernetes/Templates/OpenBMC-build-job-v2.yaml
+++ b/kubernetes/Templates/OpenBMC-build-job-v2.yaml
@@ -9,7 +9,7 @@
 spec:
   template:
     metadata:
-      name: ${podname}
+      name: ${pod_name}
       labels:
         target: ${target}
     spec:
@@ -18,14 +18,14 @@
       volumes:
       - name: workspace
         persistentVolumeClaim:
-          claimName: ${wclaim}
-      - name: sscdir
+          claimName: ${w_claim}
+      - name: ssc-dir
         persistentVolumeClaim:
-          claimName: ${sclaim}
+          claimName: ${s_claim}
       restartPolicy: Never
       hostNetwork: True
       containers:
-      - image: ${imgname}
+      - image: ${img_name}
         name: builder
         command: ["/bin/bash","-c"]
         args: ["sleep 2h"]
@@ -33,8 +33,8 @@
         env:
         - name: WORKSPACE
           value: ${WORKSPACE}
-        - name: builddir
-          value: ${builddir}
+        - name: build-dir
+          value: ${build_dir}
         securityContext:
           capabilities:
             add:
@@ -42,7 +42,7 @@
         volumeMounts:
         - name: workspace
           mountPath: ${HOME}/workspace
-        - name: sscdir
-          mountPath: ${sscdir}
+        - name: ssc-dir
+          mountPath: ${ssc_dir}
       imagePullSecrets:
-      - name: ${imgplsec}
+      - name: ${img_pl_sec}
diff --git a/kubernetes/Templates/OpenBMC-build-job.yaml b/kubernetes/Templates/OpenBMC-build-job.yaml
index c035193..7f9c017 100644
--- a/kubernetes/Templates/OpenBMC-build-job.yaml
+++ b/kubernetes/Templates/OpenBMC-build-job.yaml
@@ -9,7 +9,7 @@
 spec:
   template:
     metadata:
-      name: ${podname}
+      name: ${pod_name}
       labels:
         target: ${target}
     spec:
@@ -18,22 +18,22 @@
       volumes:
       - name: workspace
         persistentVolumeClaim:
-          claimName: ${wclaim}
-      - name: sscdir
+          claimName: ${w_claim}
+      - name: ssc-dir
         persistentVolumeClaim:
-          claimName: ${sclaim}
+          claimName: ${s_claim}
       restartPolicy: Never
       hostNetwork: True
       containers:
-      - image: ${imgname}
+      - image: ${img_name}
         name: builder
         command: [\"${WORKSPACE}/build.sh\"]
         workingDir: ${HOME}
         env:
         - name: WORKSPACE
           value: ${WORKSPACE}
-        - name: builddir
-          value: ${builddir}
+        - name: build-dir
+          value: ${build_dir}
         securityContext:
           capabilities:
             add:
@@ -41,7 +41,7 @@
         volumeMounts:
         - name: workspace
           mountPath: ${HOME}/workspace
-        - name: sscdir
-          mountPath: ${sscdir}
+        - name: ssc-dir
+          mountPath: ${ssc_dir}
       imagePullSecrets:
-      - name: ${imgplsec}
+      - name: ${img_pl_sec}
diff --git a/kubernetes/Templates/OpenBMC-build-pod-v2.yaml b/kubernetes/Templates/OpenBMC-build-pod-v2.yaml
index 75adac8..11c4419 100644
--- a/kubernetes/Templates/OpenBMC-build-pod-v2.yaml
+++ b/kubernetes/Templates/OpenBMC-build-pod-v2.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: ${podname}
+  name: ${pod_name}
   namespace: ${namespace}
 spec:
   nodeSelector:
@@ -9,13 +9,13 @@
   volumes:
   - name: workspace
     persistentVolumeClaim:
-      claimName: ${wclaim}
-  - name: sscdir
+      claimName: ${w_claim}
+  - name: ssc-dir
     persistentVolumeClaim:
-      claimName: ${sclaim}
+      claimName: ${s_claim}
   hostNetwork: True
   containers:
-  - image: ${imgname}
+  - image: ${img_name}
     name: builder
     command: ["/bin/bash","-c"]
     args: ["sleep 2h"]
@@ -23,8 +23,8 @@
     env:
     - name: WORKSPACE
       value: ${WORKSPACE}
-    - name: builddir
-      value: ${builddir}
+    - name: build-dir
+      value: ${build_dir}
     securityContext:
       capabilities:
         add:
@@ -32,8 +32,8 @@
     volumeMounts:
     - name: workspace
       mountPath: ${HOME}/workspace
-    - name: sscdir
-      mountPath: ${sscdir}
+    - name: ssc-dir
+      mountPath: ${ssc_dir}
   restartPolicy: Never
   imagePullSecrets:
-  - name: ${imgplsec}
+  - name: ${img_pl_sec}
diff --git a/kubernetes/Templates/OpenBMC-build-pod.yaml b/kubernetes/Templates/OpenBMC-build-pod.yaml
index 4eb76da..a383367 100644
--- a/kubernetes/Templates/OpenBMC-build-pod.yaml
+++ b/kubernetes/Templates/OpenBMC-build-pod.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: ${podname}
+  name: ${pod_name}
   namespace: ${namespace}
 spec:
   nodeSelector:
@@ -9,21 +9,21 @@
   volumes:
   - name: workspace
     persistentVolumeClaim:
-      claimName: ${wclaim}
-  - name: sscdir
+      claimName: ${w_claim}
+  - name: ssc-dir
     persistentVolumeClaim:
-      claimName: ${sclaim}
+      claimName: ${s_claim}
   hostNetwork: True
   containers:
-  - image: ${imgname}
+  - image: ${img_name}
     name: builder
     command: [\"${WORKSPACE}/build.sh\"]
     workingDir: ${HOME}
     env:
     - name: WORKSPACE
       value: ${WORKSPACE}
-    - name: builddir
-      value: ${builddir}
+    - name: build-dir
+      value: ${build_dir}
     securityContext:
       capabilities:
         add:
@@ -31,8 +31,8 @@
     volumeMounts:
     - name: workspace
       mountPath: ${HOME}/workspace
-    - name: sscdir
-      mountPath: ${sscdir}
+    - name: ssc-dir
+      mountPath: ${ssc_dir}
   restartPolicy: Never
   imagePullSecrets:
-  - name: ${imgplsec}
+  - name: ${img_pl_sec}
diff --git a/kubernetes/Templates/QEMU-build-job.yaml b/kubernetes/Templates/QEMU-build-job.yaml
index 04a8c4e..1fe635f 100644
--- a/kubernetes/Templates/QEMU-build-job.yaml
+++ b/kubernetes/Templates/QEMU-build-job.yaml
@@ -9,33 +9,33 @@
 spec:
   template:
     metadata:
-      name: ${podname}
+      name: ${pod_name}
     spec:
       nodeSelector:
         beta.kubernetes.io/arch: ${ARCH}
       volumes:
       - name: workspace
         persistentVolumeClaim:
-          claimName: ${wclaim}
-      - name: qemudir
+          claimName: ${w_claim}
+      - name: qemu-dir
         persistentVolumeClaim:
-          claimName: ${qclaim}
+          claimName: ${q_claim}
       restartPolicy: Never
       hostNetwork: True
       containers:
-      - image: ${imgname}
+      - image: ${img_name}
         name: builder
         command: [\"${WORKSPACE}/build.sh\"]
         workingDir: ${HOME}
         env:
         - name: WORKSPACE
           value: ${WORKSPACE}
-        - name: qemudir
-          value: ${qemudir}
+        - name: qemu-dir
+          value: ${qemu_dir}
         volumeMounts:
         - name: workspace
           mountPath: ${HOME}/workspace
-        - name: qemudir
-          mountPath: ${qemudir}
+        - name: qemu-dir
+          mountPath: ${qemu_dir}
       imagePullSecrets:
-      - name: ${imgplsec}
+      - name: ${img_pl_sec}
diff --git a/kubernetes/Templates/QEMU-build-pod.yaml b/kubernetes/Templates/QEMU-build-pod.yaml
index 3a23af7..eb3088d 100644
--- a/kubernetes/Templates/QEMU-build-pod.yaml
+++ b/kubernetes/Templates/QEMU-build-pod.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: ${podname}
+  name: ${pod_name}
   namespace: ${namespace}
 spec:
   nodeSelector:
@@ -9,26 +9,26 @@
   volumes:
   - name: workspace
     persistentVolumeClaim:
-      claimName: ${wclaim}
-  - name: qemudir
+      claimName: ${w_claim}
+  - name: qemu-dir
     persistentVolumeClaim:
-      claimName: ${qclaim}
+      claimName: ${q_claim}
   restartPolicy: Never
   hostNetwork: True
   containers:
-  - image: ${imgname}
+  - image: ${img_name}
     name: builder
     command: [\"${WORKSPACE}/build.sh\"]
     workingDir: ${HOME}
     env:
     - name: WORKSPACE
       value: ${WORKSPACE}
-    - name: qemudir
-      value: ${qemudir}
+    - name: qemu-dir
+      value: ${qemu_dir}
     volumeMounts:
     - name: workspace
       mountPath: ${HOME}/workspace
-    - name: qemudir
-      mountPath: ${qemudir}
+    - name: qemu-dir
+      mountPath: ${qemu_dir}
   imagePullSecrets:
-  - name: ${imgplsec}
+  - name: ${img_pl_sec}
diff --git a/kubernetes/Templates/QEMU-launch-deployment.yaml b/kubernetes/Templates/QEMU-launch-deployment.yaml
index c17df73..c8bdc9f 100644
--- a/kubernetes/Templates/QEMU-launch-deployment.yaml
+++ b/kubernetes/Templates/QEMU-launch-deployment.yaml
@@ -1,29 +1,29 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: ${deployname}
+  name: ${deploy_name}
   namespace: ${namespace}
 spec:
   replicas: ${replicas}
   selector:
     matchLabels:
-      app: ${deployname}
+      app: ${deploy_name}
   template:
     metadata:
       labels:
-        app: ${deployname}
+        app: ${deploy_name}
     spec:
       volumes:
       - name: workspace
         persistentVolumeClaim:
-          claimName: ${wclaim}
+          claimName: ${w_claim}
       nodeSelector:
         beta.kubernetes.io/arch: ${ARCH}
       securityContext:
         runAsUser: 0
       containers:
-      - image: ${imgname}
-        name: ${podname}
+      - image: ${img_name}
+        name: ${pod_name}
         command: [\"${OBMC_BUILD_DIR}/boot-qemu.sh\"]
         tty: true
         workingDir: ${OBMC_BUILD_DIR}
@@ -59,4 +59,4 @@
           subPath: ${jenkins_subpath}
           mountPath: ${OBMC_BUILD_DIR}
       imagePullSecrets:
-      - name: ${imgplsec}
+      - name: ${img_pl_sec}