diff --git a/README.md b/README.md
index 939ce6f..c6aa3ed 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,17 @@
 instructions: [Downloading testing and QA
 repositories](https://guide.opencord.org/developer/getting_the_code.html#testing-and-qa-repositories)
 
-> NOTE: This repo uses git submodules. If you have trouble with the tests or
-> other tasks, please run: `git submodule init && git submodule update` to
-> obtain these submodules, as `repo` won't do this automatically for you.
+> NOTE: This repo uses git submodules. If you get an error like this when
+> testing:
+>
+>     jenkins_jobs.errors.JenkinsJobsException: Failed to find suitable template named '{project-name}-ci-jobs'
+>
+> or have trouble with the other tasks, please run:
+>
+>     git submodule init && git submodule update
+>
+> to obtain these submodules, as a clone of the repo won't automatically
+> checkout these submodules.
 
 ## Jenkins Job Builder (JJB) Documentation
 
diff --git a/jjb/api-test.yaml b/jjb/api-test.yaml
index 57a01f0..8b14843 100644
--- a/jjb/api-test.yaml
+++ b/jjb/api-test.yaml
@@ -5,7 +5,7 @@
     id: api-test
     name: 'verify_{project}{name-extension}_api-test'
     description: |
-      Created by {id} job-template from ci-management/jjb/api-test.yaml, using pipeline: {pipeline_script}
+      Created by {id} job-template from ci-management/jjb/api-test.yaml, using script: {pipeline-script}
 
 
     triggers:
@@ -28,7 +28,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -60,4 +60,4 @@
     project-type: pipeline
     concurrent: true
 
-    dsl: !include-raw-escape: pipeline/{pipeline_script}
+    dsl: !include-raw-escape: pipeline/{pipeline-script}
diff --git a/jjb/bbr.yaml b/jjb/bbr.yaml
index 12b9da2..4ac6ce2 100644
--- a/jjb/bbr.yaml
+++ b/jjb/bbr.yaml
@@ -23,25 +23,30 @@
                   Created from job-template bbsim_scale_test from ci-management/jjb/bbr.yaml <br />
                   Created by Matteo Scandolo, teo@opennetworking.org <br />
                   Copyright (c) 2017 Open Networking Foundation (ONF)
+
     project-type: pipeline
     sandbox: true
+
     properties:
       - cord-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
           artifact-num-to-keep: '{artifact-num-to-keep}'
+
     pipeline-scm:
       script-path: './tests/bbr.groovy'
       scm:
         - git:
-            url: 'https://gerrit.opencord.org/bbsim'
+            url: '{gerrit-server-url}/bbsim'
             branches:
               - 'master'
+
     triggers:
       - timed: |
           TZ=America/Los_Angeles
           H * * * *
+
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'
diff --git a/jjb/bbsim-validation.yaml b/jjb/bbsim-validation.yaml
index 7c75fc3..a8aa632 100644
--- a/jjb/bbsim-validation.yaml
+++ b/jjb/bbsim-validation.yaml
@@ -31,7 +31,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'qct-pod2-node1'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -101,7 +101,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'qct-pod2-node1'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 25b2281..04c3573 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -18,7 +18,8 @@
     destination-dir: ''
     basedir: ''
 
-    # used to rename jobs if required
+    # used to rename jobs as is required, if running same job more than once
+    # for a project
     name-extension: ''
 
     # How long to keep builds and artifacts
@@ -40,8 +41,8 @@
     twice-a-day: "H */12 * * *"
     once-a-day: "H 0 * * *"
 
-    # The most frequently used type of build node
-    # see other build node types under "Cloud > Amazon EC2" at
+    # The most frequently used type of Build Executor. Name is per the LF global-jjb.
+    # See build node types under "Cloud > Amazon EC2" at
     #  https://jenkins.opencord.org/configure
     build-node: ubuntu16.04-basebuild-1c-1g
 
diff --git a/jjb/docker-publish-github.yaml b/jjb/docker-publish-github.yaml
index 7ac444d..aed5882 100644
--- a/jjb/docker-publish-github.yaml
+++ b/jjb/docker-publish-github.yaml
@@ -25,7 +25,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-1c-2g'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/docker-publish.yaml b/jjb/docker-publish.yaml
index ac1aeed..04f26ce 100644
--- a/jjb/docker-publish.yaml
+++ b/jjb/docker-publish.yaml
@@ -5,7 +5,7 @@
     id: docker-publish
     name: 'docker-publish_{project}'
     description: |
-      Created by {id} job-template from ci-management/jjb/docker-publish.yaml
+      Created by {id} job-template from ci-management/jjb/docker-publish.yaml, script pipeline/docker-publish.groovy
 
     triggers:
       - cord-infra-gerrit-trigger-merge:
@@ -27,9 +27,9 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-1c-2g'
-          description: 'Name of the Jenkins node to run the job on'
+          description: 'Name of the Jenkins build executor to run the job on'
 
       - string:
           name: gitUrl
diff --git a/jjb/fossa.yaml b/jjb/fossa.yaml
index 66fc131..9d6e09b 100644
--- a/jjb/fossa.yaml
+++ b/jjb/fossa.yaml
@@ -67,7 +67,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: '{build-node}'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/imagebuilder.yaml b/jjb/imagebuilder.yaml
index 10eac84..1c52e87 100644
--- a/jjb/imagebuilder.yaml
+++ b/jjb/imagebuilder.yaml
@@ -37,7 +37,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'imagebuilder'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/k8install.yaml b/jjb/k8install.yaml
index 99cd47b..c6b634c 100644
--- a/jjb/k8install.yaml
+++ b/jjb/k8install.yaml
@@ -30,7 +30,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'qa-testvm-pod'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index f14219c..1c6efc6 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -18,7 +18,7 @@
 # generic OMEC test-case jobs, shared by other projects and triggered within pipelines
 - project:
     name: omec
-    executor_node: 'intel-102'
+    build-node: 'intel-102'
 
     github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
     github_pr_org_list:
@@ -33,7 +33,7 @@
     name: ngic-rtc
     project: '{name}'
 
-    executor_node: 'intel-102'
+    build-node: 'intel-102'
 
     github-organization: 'omec-project'
 
@@ -56,7 +56,7 @@
     name: c3po
     project: '{name}'
 
-    executor_node: 'intel-102'
+    build-node: 'intel-102'
 
     github-organization: 'omec-project'
 
@@ -82,7 +82,7 @@
     name: openmme
     project: '{name}'
 
-    executor_node: 'intel-102'
+    build-nod: 'intel-102'
 
     github-organization: 'omec-project'
 
@@ -128,8 +128,8 @@
 
     parameters:
       - string:
-          name: executorNode
-          default: '{executor_node}'
+          name: buildNode
+          default: '{build-node}'
           description: 'Name of the Jenkins executor node to run the job on'
 
       - string:
@@ -177,8 +177,8 @@
 
     parameters:
       - string:
-          name: executorNode
-          default: '{executor_node}'
+          name: buildNode
+          default: '{build-node}'
           description: 'Name of the Jenkins executor node to run the job on'
 
       - string:
@@ -218,8 +218,8 @@
 
     parameters:
       - string:
-          name: executorNode
-          default: '{executor_node}'
+          name: buildNode
+          default: '{build-node}'
           description: 'Name of the Jenkins executor node to run the job on'
 
     concurrent: false
@@ -253,8 +253,8 @@
 
     parameters:
       - string:
-          name: executorNode
-          default: '{executor_node}'
+          name: buildNode
+          default: '{build-node}'
           description: 'Name of the Jenkins executor node to run the job on'
 
     concurrent: false
diff --git a/jjb/pipeline/all-xos-api-test-helm.groovy b/jjb/pipeline/all-xos-api-test-helm.groovy
index b85ce17..0b9e46b 100644
--- a/jjb/pipeline/all-xos-api-test-helm.groovy
+++ b/jjb/pipeline/all-xos-api-test-helm.groovy
@@ -21,7 +21,7 @@
 
     /* no label, executor is determined by JJB */
     agent {
-        label "${params.executorNode}"
+        label "${params.buildNode}"
     }
 
   stages {
diff --git a/jjb/pipeline/all-xos-api-test.groovy b/jjb/pipeline/all-xos-api-test.groovy
index 75e4fcc..3e59a9d 100644
--- a/jjb/pipeline/all-xos-api-test.groovy
+++ b/jjb/pipeline/all-xos-api-test.groovy
@@ -19,7 +19,7 @@
 
     /* no label, executor is determined by JJB */
     agent {
-        label "${params.executorNode}"
+        label "${params.buildNode}"
     }
 
   stages {
diff --git a/jjb/pipeline/bbsim-validation.groovy b/jjb/pipeline/bbsim-validation.groovy
index 2b8d26a..82e8d77 100644
--- a/jjb/pipeline/bbsim-validation.groovy
+++ b/jjb/pipeline/bbsim-validation.groovy
@@ -19,7 +19,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   stages {
diff --git a/jjb/pipeline/chart-api-test-helm.groovy b/jjb/pipeline/chart-api-test-helm.groovy
index d9c8ace..abb5e68 100644
--- a/jjb/pipeline/chart-api-test-helm.groovy
+++ b/jjb/pipeline/chart-api-test-helm.groovy
@@ -19,7 +19,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   stages {
diff --git a/jjb/pipeline/docker-publish.groovy b/jjb/pipeline/docker-publish.groovy
index b864af4..285b4e0 100644
--- a/jjb/pipeline/docker-publish.groovy
+++ b/jjb/pipeline/docker-publish.groovy
@@ -15,9 +15,9 @@
 /* docker-publish pipeline */
 pipeline {
 
-  /* no label, executor is determined by JJB */
+  /* executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
   stages {
 
diff --git a/jjb/pipeline/fossa-verify.groovy b/jjb/pipeline/fossa-verify.groovy
index 02662b9..da5c0e9 100644
--- a/jjb/pipeline/fossa-verify.groovy
+++ b/jjb/pipeline/fossa-verify.groovy
@@ -17,7 +17,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${buildNode}"
   }
 
   // Set so that fossa will know where to run golang tools from
@@ -91,7 +91,7 @@
       }
     }
 
-    stage ("fossa") {
+    stage ("Run FOSSA") {
       steps {
         // catch any errors that occur so that logs can be saved in the next stage
         // docs: https://jenkins.io/doc/pipeline/steps/workflow-basic-steps/#catcherror-catch-error-and-set-build-result-to-failure
diff --git a/jjb/pipeline/imagebuilder.groovy b/jjb/pipeline/imagebuilder.groovy
index 1d5a950..25891d3 100644
--- a/jjb/pipeline/imagebuilder.groovy
+++ b/jjb/pipeline/imagebuilder.groovy
@@ -3,7 +3,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
   stages {
 
diff --git a/jjb/pipeline/kubespray-install.groovy b/jjb/pipeline/kubespray-install.groovy
index dfe9820..89a1124 100644
--- a/jjb/pipeline/kubespray-install.groovy
+++ b/jjb/pipeline/kubespray-install.groovy
@@ -4,7 +4,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
   stages {
 
diff --git a/jjb/pipeline/mcord-build-test.groovy b/jjb/pipeline/mcord-build-test.groovy
index acdf489..a5ebb66 100644
--- a/jjb/pipeline/mcord-build-test.groovy
+++ b/jjb/pipeline/mcord-build-test.groovy
@@ -4,7 +4,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   stages {
diff --git a/jjb/pipeline/siab-test.groovy b/jjb/pipeline/siab-test.groovy
index f2ee19b..20b905f 100644
--- a/jjb/pipeline/siab-test.groovy
+++ b/jjb/pipeline/siab-test.groovy
@@ -4,7 +4,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   options {
diff --git a/jjb/pipeline/siab.groovy b/jjb/pipeline/siab.groovy
index 0c6b833..c4ce6e8 100644
--- a/jjb/pipeline/siab.groovy
+++ b/jjb/pipeline/siab.groovy
@@ -4,7 +4,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   options {
diff --git a/jjb/pipeline/synopsys-check.groovy b/jjb/pipeline/synopsys-check.groovy
index 1bd7828..f521c91 100644
--- a/jjb/pipeline/synopsys-check.groovy
+++ b/jjb/pipeline/synopsys-check.groovy
@@ -16,7 +16,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   // Set so that synopsys_detect will know where to run golang tools from
diff --git a/jjb/pipeline/synopsys-single.groovy b/jjb/pipeline/synopsys-single.groovy
index 8b0d093..8b63d89 100644
--- a/jjb/pipeline/synopsys-single.groovy
+++ b/jjb/pipeline/synopsys-single.groovy
@@ -17,7 +17,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   // Set so that synopsys_detect will know where to run golang tools from
diff --git a/jjb/pipeline/voltha-atest-provisioning.groovy b/jjb/pipeline/voltha-atest-provisioning.groovy
index de7ef0b..297c27d 100755
--- a/jjb/pipeline/voltha-atest-provisioning.groovy
+++ b/jjb/pipeline/voltha-atest-provisioning.groovy
@@ -4,7 +4,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   stages {
diff --git a/jjb/pipeline/voltha-automated-build.groovy b/jjb/pipeline/voltha-automated-build.groovy
index 6b11292..3b2ac05 100644
--- a/jjb/pipeline/voltha-automated-build.groovy
+++ b/jjb/pipeline/voltha-automated-build.groovy
@@ -4,7 +4,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   stages {
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index ada7df4..8c5e7f8 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -20,7 +20,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
   options {
       timeout(time: 90, unit: 'MINUTES')
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index 2f2637a..3af8bd9 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -20,7 +20,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
   options {
       timeout(time: 40, unit: 'MINUTES')
diff --git a/jjb/pipeline/voltha-publish.groovy b/jjb/pipeline/voltha-publish.groovy
index c8c48ef..7af9a53 100644
--- a/jjb/pipeline/voltha-publish.groovy
+++ b/jjb/pipeline/voltha-publish.groovy
@@ -3,7 +3,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
   stages {
 
diff --git a/jjb/pipeline/xos-core.groovy b/jjb/pipeline/xos-core.groovy
index 99aacb1..b6001fb 100644
--- a/jjb/pipeline/xos-core.groovy
+++ b/jjb/pipeline/xos-core.groovy
@@ -19,7 +19,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   stages {
diff --git a/jjb/pipeline/xos-integration-tests.groovy b/jjb/pipeline/xos-integration-tests.groovy
index 27bc34f..5874c43 100644
--- a/jjb/pipeline/xos-integration-tests.groovy
+++ b/jjb/pipeline/xos-integration-tests.groovy
@@ -19,7 +19,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   stages {
diff --git a/jjb/pipeline/xos-service-upgrade.groovy b/jjb/pipeline/xos-service-upgrade.groovy
index 6d4d07e..173c463 100644
--- a/jjb/pipeline/xos-service-upgrade.groovy
+++ b/jjb/pipeline/xos-service-upgrade.groovy
@@ -21,7 +21,7 @@
 
   /* no label, executor is determined by JJB */
   agent {
-    label "${params.executorNode}"
+    label "${params.buildNode}"
   }
 
   stages {
diff --git a/jjb/pipeline/xos-synchronizer-update.groovy b/jjb/pipeline/xos-synchronizer-update.groovy
index d895cfc..77045e7 100644
--- a/jjb/pipeline/xos-synchronizer-update.groovy
+++ b/jjb/pipeline/xos-synchronizer-update.groovy
@@ -22,7 +22,7 @@
 
     /* no label, executor is determined by JJB */
     agent {
-        label "${params.executorNode}"
+        label "${params.buildNode}"
     }
 
   stages {
diff --git a/jjb/siab.yaml b/jjb/siab.yaml
index 7844856..3d12c2c 100644
--- a/jjb/siab.yaml
+++ b/jjb/siab.yaml
@@ -33,7 +33,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'qct-pod3-node1'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -83,7 +83,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'qct-pod3-node1'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -133,7 +133,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'qct-pod3-node1'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -184,7 +184,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'qct-pod1-node2'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/synopsys-check.yaml b/jjb/synopsys-check.yaml
index 9682bca..ea66e53 100644
--- a/jjb/synopsys-check.yaml
+++ b/jjb/synopsys-check.yaml
@@ -23,7 +23,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: '{build-node}'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -87,7 +87,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: '{build-node}'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/triggered-api-test.yaml b/jjb/triggered-api-test.yaml
index d014e2b..853fd5a 100644
--- a/jjb/triggered-api-test.yaml
+++ b/jjb/triggered-api-test.yaml
@@ -6,7 +6,7 @@
     name: 'verify_{project}{name-extension}_triggered-api-test'
     description: |
       Triggers an api test in a pipeline post-merge and on a schedule.
-      Created by {id} job-template from ci-management/jjb/triggered-api-test.yaml, using pipeline: {pipeline_script}
+      Created by {id} job-template from ci-management/jjb/triggered-api-test.yaml, using script: {pipeline-script}
 
     triggers:
       - cord-infra-gerrit-trigger-merge:
@@ -29,7 +29,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -46,4 +46,4 @@
     project-type: pipeline
     concurrent: true
 
-    dsl: !include-raw-escape: pipeline/{pipeline_script}
+    dsl: !include-raw-escape: pipeline/{pipeline-script}
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 5ee9b93..f2fbc43 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -23,7 +23,7 @@
           unit-test-targets: 'test'
           unit-test-keep-going: 'true'
       - 'voltha-patch-test':
-          pipeline: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-bbsim-jobs'
diff --git a/jjb/verify/helm-charts.yaml b/jjb/verify/helm-charts.yaml
index 3c119c6..137586b 100644
--- a/jjb/verify/helm-charts.yaml
+++ b/jjb/verify/helm-charts.yaml
@@ -32,4 +32,4 @@
     name: 'post-merge-helm-charts-jobs'
     jobs:
       - 'triggered-api-test':
-          pipeline_script: 'chart-api-test-helm.groovy'
+          pipeline-script: 'chart-api-test-helm.groovy'
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index 736fa69..2e379fc 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -24,7 +24,7 @@
           unit-test-keep-going: 'true'
           junit-allow-empty-results: true
       - 'voltha-patch-test':
-          pipeline: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-api-server-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index f7fa935..0cbb585 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -33,7 +33,7 @@
           unit-test-keep-going: 'true'
       - 'voltha-patch-test':
           buildImages: true
-          pipeline: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-go-jobs'
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index f0f48a2..a4b7a9d 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -20,5 +20,5 @@
       - 'voltha-patch-test':
           dependency-jobs: 'verify_voltha-helm-charts_helm-lint'
           build-timeout: 20
-          pipeline: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha-bbsim-tests.groovy'
 
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 7d1aa71..893ec19 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -32,7 +32,7 @@
           junit-allow-empty-results: true
           build-node: 'ubuntu16.04-basebuild-2c-4g'
       - 'voltha-patch-test':
-          pipeline: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-openolt-adapter-jobs'
diff --git a/jjb/verify/voltha-openonu-adapter.yaml b/jjb/verify/voltha-openonu-adapter.yaml
index 903e2b6..7d7ec6d 100644
--- a/jjb/verify/voltha-openonu-adapter.yaml
+++ b/jjb/verify/voltha-openonu-adapter.yaml
@@ -23,7 +23,7 @@
           junit-allow-empty-results: true
           build-timeout: 15
       - 'voltha-patch-test':
-          pipeline: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-openonu-adapter-jobs'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index d08ec2f..724589c 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -21,5 +21,5 @@
           junit-allow-empty-results: true
       - 'voltha-patch-test':
           build-timeout: 20
-          pipeline: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha-bbsim-tests.groovy'
           dependency-jobs: 'verify_voltha-system-tests_unit-test'
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index 62340c4..93e0e1e 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -33,7 +33,7 @@
           build-timeout: 45
           build-node: 'ubuntu16.04-basebuild-2c-4g'
       - 'api-test':
-          pipeline_script: 'xos-core.groovy'
+          pipeline-script: 'xos-core.groovy'
 
 - job-group:
     name: 'publish-xos-jobs'
diff --git a/jjb/voltha-atest-provisioning.yaml b/jjb/voltha-atest-provisioning.yaml
index 7ac4eed..703baf4 100644
--- a/jjb/voltha-atest-provisioning.yaml
+++ b/jjb/voltha-atest-provisioning.yaml
@@ -36,7 +36,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'qct-pod3-voltha-testing'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/voltha-automated-build.yaml b/jjb/voltha-automated-build.yaml
index ec477d5..a852607 100644
--- a/jjb/voltha-automated-build.yaml
+++ b/jjb/voltha-automated-build.yaml
@@ -32,7 +32,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'onf-build'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index c32a845..9de0ca2 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -9,7 +9,7 @@
     jobs:
       - 'voltha-periodic-test':
           name: 'voltha-system-tests'
-          pipeline: 'voltha-go-tests.groovy'
+          pipeline-script: 'voltha-go-tests.groovy'
           default-image-tag: 'master'
 
 - job-template:
@@ -33,7 +33,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -70,7 +70,7 @@
     project-type: pipeline
     concurrent: false
 
-    dsl: !include-raw-escape: pipeline/{pipeline}
+    dsl: !include-raw-escape: pipeline/{pipeline-script}
 
     triggers:
       - timed: |
@@ -98,7 +98,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -155,7 +155,7 @@
     project-type: pipeline
     concurrent: true
 
-    dsl: !include-raw-escape: pipeline/{pipeline}
+    dsl: !include-raw-escape: pipeline/{pipeline-script}
 
     triggers:
       - cord-infra-gerrit-trigger-patchset:
diff --git a/jjb/voltha-publish.yaml b/jjb/voltha-publish.yaml
index e58a5ef..d8b8246 100644
--- a/jjb/voltha-publish.yaml
+++ b/jjb/voltha-publish.yaml
@@ -9,7 +9,7 @@
       - 'voltha-publish':
           project-regexp: 'voltha'
           branch-regexp: '^(master|voltha-1.6|voltha-1.7)$'
-          executor-node: 'ubuntu16.04-basebuild-1c-2g'
+          build-node: 'ubuntu16.04-basebuild-1c-2g'
           dependency-jobs: ''
 
 - job-template:
@@ -38,8 +38,8 @@
 
     parameters:
       - string:
-          name: executorNode
-          default: '{executor-node}'
+          name: buildNode
+          default: '{build-node}'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
index b8597ab..c894947 100644
--- a/jjb/xos-integration-tests.yaml
+++ b/jjb/xos-integration-tests.yaml
@@ -32,7 +32,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -91,7 +91,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -150,7 +150,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'
 
@@ -209,7 +209,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/xos-synchronizer-update.yaml b/jjb/xos-synchronizer-update.yaml
index 7b4d519..2f49512 100644
--- a/jjb/xos-synchronizer-update.yaml
+++ b/jjb/xos-synchronizer-update.yaml
@@ -27,7 +27,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'
 
diff --git a/jjb/xos-upgrade.yaml b/jjb/xos-upgrade.yaml
index a9a9e8e..506d5dd 100644
--- a/jjb/xos-upgrade.yaml
+++ b/jjb/xos-upgrade.yaml
@@ -5,7 +5,7 @@
     id: xos-service-upgrade
     name: 'verify_{project}_service-upgrade-test'
     description: |
-      Created by {id} job-template from ci-management/jjb/xos-upgrade.yaml, using pipeline: xos-service-upgrade.groovy
+      Created by {id} job-template from ci-management/jjb/xos-upgrade.yaml, using script: xos-service-upgrade.groovy
 
 
     triggers:
@@ -28,7 +28,7 @@
 
     parameters:
       - string:
-          name: executorNode
+          name: buildNode
           default: 'ubuntu16.04-basebuild-4c-8g'
           description: 'Name of the Jenkins node to run the job on'