diff --git a/jenkins/jobs/akanda.yaml b/jenkins/jobs/akanda.yaml
index 8e421920e1..56af6e3e08 100644
--- a/jenkins/jobs/akanda.yaml
+++ b/jenkins/jobs/akanda.yaml
@@ -38,7 +38,7 @@
           ./safe-devstack-vm-gate-wrap.sh
 
 - job-template:
-    name: '{pipeline}-functional-dsvm-akanda{branch-designator}'
+    name: '{pipeline}-functional-dsvm-akanda{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -59,7 +59,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-functional-dsvm-akanda-appliance-src{branch-designator}'
+    name: '{pipeline}-functional-dsvm-akanda-appliance-src{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml
index 3f08ebaf71..f7fac51c6f 100644
--- a/jenkins/jobs/ceilometer.yaml
+++ b/jenkins/jobs/ceilometer.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-tempest-dsvm-ceilometer-{backend}{branch-designator}'
+    name: 'gate-tempest-dsvm-ceilometer-{backend}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -34,7 +34,7 @@
 
 
 - job-template:
-    name: 'gate-tempest-dsvm-ceilometer-{backend}-full{branch-designator}'
+    name: 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -69,7 +69,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-tempest-dsvm-ceilometer-{backend}-neutron-full{branch-designator}'
+    name: 'gate-tempest-dsvm-ceilometer-{backend}-neutron-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -102,7 +102,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ceilometer-dsvm-functional-{backend}{branch-designator}'
+    name: '{pipeline}-ceilometer-dsvm-functional-{backend}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -144,7 +144,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ceilometerclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-ceilometerclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/cinder.yaml b/jenkins/jobs/cinder.yaml
index e202b8f667..045cb3a295 100644
--- a/jenkins/jobs/cinder.yaml
+++ b/jenkins/jobs/cinder.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-cinderclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-cinderclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -37,7 +37,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-cinder-dsvm-apache{branch-designator}'
+    name: '{pipeline}-cinder-dsvm-apache{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/congress.yaml b/jenkins/jobs/congress.yaml
index 10c46756ff..71822ef625 100644
--- a/jenkins/jobs/congress.yaml
+++ b/jenkins/jobs/congress.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-congress-dsvm-api{branch-designator}'
+    name: '{pipeline}-congress-dsvm-api{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 131b2c86b0..5afd861145 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -39,7 +39,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -78,7 +78,7 @@
 # the main tempest-dsvm jobs will be using only released versions of
 # libraries.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-src-{name}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-src-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -122,7 +122,7 @@
 # Expiration: once neutron replaces nova-network as the default, this
 # can be removed.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-{name}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -155,7 +155,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-{name}{branch-designator}-plugin'
+    name: '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}-plugin'
     node: '{node}'
 
     wrappers:
@@ -205,7 +205,7 @@
 # rootwrap, olso.db, and oslo.messaging that can create performance
 # regressions in the API layer.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-largeops-src-{name}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -239,7 +239,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-master-dsvm-full{branch-designator}'
+    name: '{pipeline}-tempest-master-dsvm-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -270,7 +270,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-non-isolated{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-non-isolated{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -300,7 +300,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-non-isolated{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -330,7 +330,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-test-accounts{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-test-accounts{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -361,7 +361,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-test-accounts{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-test-accounts{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -393,7 +393,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-non-admin{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-non-admin{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -425,7 +425,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -457,7 +457,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-master-dsvm-neutron{branch-designator}'
+    name: '{pipeline}-tempest-master-dsvm-neutron{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -490,7 +490,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -522,7 +522,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-pg-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-pg-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -556,7 +556,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-nova-v20-api{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-nova-v20-api{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -589,7 +589,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-nova-v20-api-legacy{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-nova-v20-api-legacy{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -627,7 +627,7 @@
 # that things like unstack.sh and clean.sh work correctly. This should
 # only be run on the devstack tree.
 - job-template:
-    name: '{pipeline}-devstack-dsvm-updown{branch-designator}'
+    name: '{pipeline}-devstack-dsvm-updown{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -665,7 +665,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-nova-wsgi-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-nova-wsgi-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -697,7 +697,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-devstack-dsvm-cells{branch-designator}'
+    name: '{pipeline}-devstack-dsvm-cells{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -777,7 +777,7 @@
           ./safe-devstack-vm-gate-wrap.sh
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-trove{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-trove{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -812,7 +812,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -839,7 +839,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -866,7 +866,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -895,7 +895,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-parallel{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-parallel{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -935,7 +935,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -963,7 +963,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -991,7 +991,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-agent_ssh{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-agent_ssh{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1018,7 +1018,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1045,7 +1045,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-python-ironicclient-src{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-python-ironicclient-src{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1072,7 +1072,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-lib-src{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-lib-src{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1099,7 +1099,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-cells{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-cells{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1133,7 +1133,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-large-ops{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-large-ops{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1165,7 +1165,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-large-ops-testing{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-large-ops-testing{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1196,7 +1196,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-large-ops{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-large-ops{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1229,7 +1229,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-large-ops-testing{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-large-ops-testing{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1262,7 +1262,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-postgres-zeromq-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1295,7 +1295,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-postgres-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-postgres-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1330,7 +1330,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-keystonev3-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1362,7 +1362,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-keystonev3-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1401,7 +1401,7 @@
 # ``*keystonev3-full*``, (which do not disable v2) should be replaced by this
 # one and the flag DEVSTACK_GATE_KEYSTONE_V3 will be no longer used.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1434,7 +1434,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm{branch-designator}'
+    name: '{pipeline}-grenade-dsvm{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1466,7 +1466,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-forward{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-forward{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1498,7 +1498,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-neutron{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1531,7 +1531,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-forward{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-neutron-forward{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1564,7 +1564,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-vpnaas{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-neutron-vpnaas{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1599,7 +1599,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-partial-ncpu{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-partial-ncpu{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1631,7 +1631,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-ironic{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-ironic{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1672,7 +1672,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-partial-ironic{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-partial-ironic{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1711,7 +1711,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-ironic-sideways{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1751,7 +1751,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-neutron-sideways{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1784,7 +1784,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-ceilometer{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-ceilometer{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1817,7 +1817,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-all{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-all{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1849,7 +1849,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-coverage{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-coverage{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1880,7 +1880,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-stress{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-stress{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1913,7 +1913,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-stress-keystonev3{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-stress-keystonev3{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2001,7 +2001,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-multinode-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-multinode-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2034,7 +2034,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-multinode{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-multinode{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2068,7 +2068,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-multinode-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-multinode-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2105,7 +2105,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2142,7 +2142,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-ceph{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-ceph{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2181,7 +2181,7 @@
 # but use the zuul git ref for name instead of the released library
 # version.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-ceph-src-{name}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-ceph-src-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2219,7 +2219,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-lio{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-lio{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2254,7 +2254,7 @@
 # but use the zuul git ref for name instead of the released library
 # version.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-lio-src-{name}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-lio-src-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2292,7 +2292,7 @@
 # A template for any project with a devstack-plugin to run the full
 # tempest suite with their project/plugin enabled.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-{plugin}{job-suffix}'
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:
@@ -2324,7 +2324,7 @@
 # A Template to to run a oslo.messaging devstack-plugin with oslo.messaging
 # code picked up from source
 - job-template:
-    name: '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{branch-designator}'
+    name: '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{job-suffix}'
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:
@@ -2357,7 +2357,7 @@
 # A template for the misnamed drbd-devstack project.
 # Runs the full tempest suite.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-drbd-devstack{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-drbd-devstack{job-suffix}'
     node: 'devstack-trusty'
 
     wrappers:
@@ -2393,7 +2393,7 @@
 
 
 - job-template:
-    name: '{pipeline}-cinder-tempest-dsvm-glusterfs{branch-designator}'
+    name: '{pipeline}-cinder-tempest-dsvm-glusterfs{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2433,7 +2433,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-bdd{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-bdd{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2467,7 +2467,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-trove{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-trove{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2499,7 +2499,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-ssh{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-ssh{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2555,62 +2555,62 @@
 - job-group:
     name: devstack-jobs
     jobs:
-      - '{pipeline}-tempest-dsvm-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-src-{name}{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-src-{name}{branch-designator}'
-      - '{pipeline}-tempest-dsvm-largeops-src-{name}{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-ceph-src-{name}{branch-designator}'
-      - '{pipeline}-tempest-master-dsvm-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron{branch-designator}'
-      - '{pipeline}-tempest-master-dsvm-neutron{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-dvr{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-full-ssh{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-pg-full{branch-designator}'
-      - '{pipeline}-devstack-dsvm-cells{branch-designator}'
-      - '{pipeline}-devstack-dsvm-updown{branch-designator}'
-      - '{pipeline}-tempest-dsvm-cells{branch-designator}'
-      - '{pipeline}-tempest-dsvm-large-ops{branch-designator}'
-      - '{pipeline}-tempest-dsvm-large-ops-testing{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-large-ops{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-large-ops-testing{branch-designator}'
-      - '{pipeline}-tempest-dsvm-postgres-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}'
-      - '{pipeline}-grenade-dsvm{branch-designator}'
-      - '{pipeline}-grenade-dsvm-forward{branch-designator}'
-      - '{pipeline}-grenade-dsvm-neutron{branch-designator}'
-      - '{pipeline}-grenade-dsvm-neutron-forward{branch-designator}'
-      - '{pipeline}-grenade-dsvm-neutron-vpnaas{branch-designator}'
-      - '{pipeline}-grenade-dsvm-partial-ncpu{branch-designator}'
-      - '{pipeline}-grenade-dsvm-ironic{branch-designator}'
-      - '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}'
-      - '{pipeline}-grenade-dsvm-partial-ironic{branch-designator}'
-      - '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}'
-      - '{pipeline}-grenade-dsvm-ceilometer{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-agent_ssh{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-parallel{branch-designator}'
-      - '{pipeline}-tempest-dsvm-all{branch-designator}'
-      - '{pipeline}-tempest-dsvm-coverage{branch-designator}'
-      - '{pipeline}-tempest-dsvm-stress{branch-designator}'
-      - '{pipeline}-tempest-dsvm-stress-keystonev3{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-test-accounts{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-full-test-accounts{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-non-isolated{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-full-non-admin{branch-designator}'
-      - '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-ceph{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-lio{branch-designator}'
-      - '{pipeline}-tempest-dsvm-nova-v20-api{branch-designator}'
-      - '{pipeline}-tempest-dsvm-nova-v20-api-legacy{branch-designator}'
-      - '{pipeline}-tempest-dsvm-nova-wsgi-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-trove{branch-designator}'
-      - '{pipeline}-grenade-dsvm-trove{branch-designator}'
-      - '{pipeline}-grenade-dsvm-sahara{branch-designator}'
+      - '{pipeline}-tempest-dsvm-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-src-{name}{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}'
+      - '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-ceph-src-{name}{job-suffix}'
+      - '{pipeline}-tempest-master-dsvm-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron{job-suffix}'
+      - '{pipeline}-tempest-master-dsvm-neutron{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-dvr{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-ssh{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-pg-full{job-suffix}'
+      - '{pipeline}-devstack-dsvm-cells{job-suffix}'
+      - '{pipeline}-devstack-dsvm-updown{job-suffix}'
+      - '{pipeline}-tempest-dsvm-cells{job-suffix}'
+      - '{pipeline}-tempest-dsvm-large-ops{job-suffix}'
+      - '{pipeline}-tempest-dsvm-large-ops-testing{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-large-ops{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-large-ops-testing{job-suffix}'
+      - '{pipeline}-tempest-dsvm-postgres-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-postgres-zeromq-full{job-suffix}'
+      - '{pipeline}-grenade-dsvm{job-suffix}'
+      - '{pipeline}-grenade-dsvm-forward{job-suffix}'
+      - '{pipeline}-grenade-dsvm-neutron{job-suffix}'
+      - '{pipeline}-grenade-dsvm-neutron-forward{job-suffix}'
+      - '{pipeline}-grenade-dsvm-neutron-vpnaas{job-suffix}'
+      - '{pipeline}-grenade-dsvm-partial-ncpu{job-suffix}'
+      - '{pipeline}-grenade-dsvm-ironic{job-suffix}'
+      - '{pipeline}-grenade-dsvm-ironic-sideways{job-suffix}'
+      - '{pipeline}-grenade-dsvm-partial-ironic{job-suffix}'
+      - '{pipeline}-grenade-dsvm-neutron-sideways{job-suffix}'
+      - '{pipeline}-grenade-dsvm-ceilometer{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-agent_ssh{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-parallel{job-suffix}'
+      - '{pipeline}-tempest-dsvm-all{job-suffix}'
+      - '{pipeline}-tempest-dsvm-coverage{job-suffix}'
+      - '{pipeline}-tempest-dsvm-stress{job-suffix}'
+      - '{pipeline}-tempest-dsvm-stress-keystonev3{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-test-accounts{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-test-accounts{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-non-isolated{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-non-admin{job-suffix}'
+      - '{pipeline}-tempest-dsvm-keystonev3-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-ceph{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-lio{job-suffix}'
+      - '{pipeline}-tempest-dsvm-nova-v20-api{job-suffix}'
+      - '{pipeline}-tempest-dsvm-nova-v20-api-legacy{job-suffix}'
+      - '{pipeline}-tempest-dsvm-nova-wsgi-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-trove{job-suffix}'
+      - '{pipeline}-grenade-dsvm-trove{job-suffix}'
+      - '{pipeline}-grenade-dsvm-sahara{job-suffix}'
diff --git a/jenkins/jobs/dragonflow.yaml b/jenkins/jobs/dragonflow.yaml
index a0d16b9eca..96daab0b90 100644
--- a/jenkins/jobs/dragonflow.yaml
+++ b/jenkins/jobs/dragonflow.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-dragonflow{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-dragonflow{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/ec2-api.yaml b/jenkins/jobs/ec2-api.yaml
index 152d2364e5..9baca7b634 100644
--- a/jenkins/jobs/ec2-api.yaml
+++ b/jenkins/jobs/ec2-api.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ec2api{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ec2api{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -43,7 +43,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-functional-neutron-dsvm-ec2api{branch-designator}'
+    name: '{pipeline}-functional-neutron-dsvm-ec2api{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -85,7 +85,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-functional-nova-network-dsvm-ec2api{branch-designator}'
+    name: '{pipeline}-functional-nova-network-dsvm-ec2api{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/gce-api.yaml b/jenkins/jobs/gce-api.yaml
index e15b555f1a..5c121732ef 100644
--- a/jenkins/jobs/gce-api.yaml
+++ b/jenkins/jobs/gce-api.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-functional-neutron-dsvm-gceapi{branch-designator}'
+    name: '{pipeline}-functional-neutron-dsvm-gceapi{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -40,7 +40,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-functional-nova-network-dsvm-gceapi{branch-designator}'
+    name: '{pipeline}-functional-nova-network-dsvm-gceapi{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/glance.yaml b/jenkins/jobs/glance.yaml
index c4dd947d3c..5668ed53cf 100644
--- a/jenkins/jobs/glance.yaml
+++ b/jenkins/jobs/glance.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-glanceclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-glanceclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/group-based-policy.yaml b/jenkins/jobs/group-based-policy.yaml
index a044197401..8864592d2e 100644
--- a/jenkins/jobs/group-based-policy.yaml
+++ b/jenkins/jobs/group-based-policy.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-group-based-policy-dsvm-functional{branch-designator}'
+    name: '{pipeline}-group-based-policy-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -48,7 +48,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-group-based-policy-dsvm-rally{branch-designator}'
+    name: '{pipeline}-group-based-policy-dsvm-rally{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/groups.yaml b/jenkins/jobs/groups.yaml
index ede2463e93..871b94994c 100644
--- a/jenkins/jobs/groups.yaml
+++ b/jenkins/jobs/groups.yaml
@@ -25,7 +25,7 @@
                   copy-after-failure: true
 
 - job-template:
-    name: 'groups-release-{branch-designator}'
+    name: 'groups-release-{job-suffix}'
     node: '{node}'
 
     builders:
diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml
index de181a05f9..cbf0b3111f 100644
--- a/jenkins/jobs/heat.yaml
+++ b/jenkins/jobs/heat.yaml
@@ -53,7 +53,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{branch-designator}'
+    name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -112,7 +112,7 @@
 
 
 - job-template:
-    name: '{pipeline}-heat-dsvm-functional-aodh-{engine}-{datastore}{branch-designator}'
+    name: '{pipeline}-heat-dsvm-functional-aodh-{engine}-{datastore}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -172,7 +172,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-heat{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-heat{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -204,7 +204,7 @@
 
 
 - job-template:
-   name: '{pipeline}-heatclient-dsvm-functional{branch-designator}'
+   name: '{pipeline}-heatclient-dsvm-functional{job-suffix}'
    node: '{node}'
 
    wrappers:
@@ -244,7 +244,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-heat{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-heat{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml
index f91d73154e..b6045c200c 100644
--- a/jenkins/jobs/ironic.yaml
+++ b/jenkins/jobs/ironic.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-ironic-dsvm-functional{branch-designator}'
+    name: '{pipeline}-ironic-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -36,7 +36,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironicclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-ironicclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -76,7 +76,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironic-inspector-dsvm{branch-designator}'
+    name: '{pipeline}-ironic-inspector-dsvm{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -119,7 +119,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-python-ironic-inspector-client-dsvm{branch-designator}'
+    name: '{pipeline}-python-ironic-inspector-client-dsvm{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/javascript.yaml b/jenkins/jobs/javascript.yaml
index d5ab193fe9..c25ded0127 100644
--- a/jenkins/jobs/javascript.yaml
+++ b/jenkins/jobs/javascript.yaml
@@ -105,7 +105,7 @@
 
 # Builds a release tarball
 - job-template:
-    name: '{name}-js-release-{branch-designator}'
+    name: '{name}-js-release-{job-suffix}'
 
     builders:
       - npm-install
diff --git a/jenkins/jobs/keystone.yaml b/jenkins/jobs/keystone.yaml
index 51ce12f236..6ac80356cb 100644
--- a/jenkins/jobs/keystone.yaml
+++ b/jenkins/jobs/keystone.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-keystoneclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-keystoneclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/magnum.yaml b/jenkins/jobs/magnum.yaml
index 0cfab0aa9d..fe4e52da0d 100644
--- a/jenkins/jobs/magnum.yaml
+++ b/jenkins/jobs/magnum.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-functional-dsvm-magnum{branch-designator}'
+    name: '{pipeline}-functional-dsvm-magnum{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/murano.yaml b/jenkins/jobs/murano.yaml
index 92eedad7d9..f4fa687be4 100644
--- a/jenkins/jobs/murano.yaml
+++ b/jenkins/jobs/murano.yaml
@@ -122,7 +122,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-muranoclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-muranoclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/networking-bgpvpn.yaml b/jenkins/jobs/networking-bgpvpn.yaml
index fde9525275..5fb9dc28c6 100644
--- a/jenkins/jobs/networking-bgpvpn.yaml
+++ b/jenkins/jobs/networking-bgpvpn.yaml
@@ -1,7 +1,7 @@
 # Inspiration largely taken from networking-ovn.yaml
 
 - job-template:
-    name: '{pipeline}-install-dsvm-networking-bgpvpn{branch-designator}'
+    name: '{pipeline}-install-dsvm-networking-bgpvpn{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/networking-midonet.yaml b/jenkins/jobs/networking-midonet.yaml
index e3e3e238d8..4cd4844df7 100644
--- a/jenkins/jobs/networking-midonet.yaml
+++ b/jenkins/jobs/networking-midonet.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-midonet-v1{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-midonet-v1{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -55,7 +55,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-midonet-v2{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-midonet-v2{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -108,7 +108,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-midonet-ml2{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-midonet-ml2{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/networking-odl.yaml b/jenkins/jobs/networking-odl.yaml
index cf707c3af4..ae94db54c9 100644
--- a/jenkins/jobs/networking-odl.yaml
+++ b/jenkins/jobs/networking-odl.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-odl{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-odl{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/networking-onos.yaml b/jenkins/jobs/networking-onos.yaml
index e0c8d18d2a..36adaca808 100644
--- a/jenkins/jobs/networking-onos.yaml
+++ b/jenkins/jobs/networking-onos.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-onos{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-onos{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/networking-ovn.yaml b/jenkins/jobs/networking-ovn.yaml
index 7010c3b02e..2466d30965 100644
--- a/jenkins/jobs/networking-ovn.yaml
+++ b/jenkins/jobs/networking-ovn.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-ovn{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-ovn{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/neutron-fwaas.yaml b/jenkins/jobs/neutron-fwaas.yaml
index 6d59fc71f8..49c084d572 100644
--- a/jenkins/jobs/neutron-fwaas.yaml
+++ b/jenkins/jobs/neutron-fwaas.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-fwaas-dsvm-functional{branch-designator}'
+    name: '{pipeline}-neutron-fwaas-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -44,7 +44,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-fwaas-dsvm-api{branch-designator}'
+    name: '{pipeline}-neutron-fwaas-dsvm-api{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/neutron-lbaas.yaml b/jenkins/jobs/neutron-lbaas.yaml
index bb700f58f2..7d14b2609a 100644
--- a/jenkins/jobs/neutron-lbaas.yaml
+++ b/jenkins/jobs/neutron-lbaas.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}'
+    name: '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/neutron-vpnaas.yaml b/jenkins/jobs/neutron-vpnaas.yaml
index be53d1fcc5..f91177a02c 100644
--- a/jenkins/jobs/neutron-vpnaas.yaml
+++ b/jenkins/jobs/neutron-vpnaas.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-dsvm-functional{branch-designator}'
+    name: '{pipeline}-neutron-vpnaas-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -44,7 +44,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-dsvm-functional-sswan{branch-designator}'
+    name: '{pipeline}-neutron-vpnaas-dsvm-functional-sswan{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -89,7 +89,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{branch-designator}'
+    name: '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index c4b3e5edbc..bf2a3416c2 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-dsvm-api{branch-designator}'
+    name: '{pipeline}-neutron-dsvm-api{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -44,7 +44,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-dvr{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-dvr{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -83,7 +83,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dsvm-functional{python}{branch-designator}'
+    name: '{pipeline}-neutron-dsvm-functional{python}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -142,7 +142,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dsvm-fullstack{branch-designator}'
+    name: '{pipeline}-neutron-dsvm-fullstack{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -187,7 +187,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutronclient-test-dsvm-{which-test}{branch-designator}'
+    name: '{pipeline}-neutronclient-test-dsvm-{which-test}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -231,7 +231,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-ipv6only{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-ipv6only{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -263,7 +263,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-serviceipv6{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-serviceipv6{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -295,7 +295,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-linuxbridge{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-linuxbridge{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/nodepool.yaml b/jenkins/jobs/nodepool.yaml
index 2db7fdd818..bb1a9b2c6c 100644
--- a/jenkins/jobs/nodepool.yaml
+++ b/jenkins/jobs/nodepool.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-dsvm-nodepool{branch-designator}'
+    name: '{pipeline}-dsvm-nodepool{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -51,7 +51,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-dsvm-nodepool-src-shade{branch-designator}'
+    name: '{pipeline}-dsvm-nodepool-src-shade{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/nova.yaml b/jenkins/jobs/nova.yaml
index d6445c2bb2..326c6c743a 100644
--- a/jenkins/jobs/nova.yaml
+++ b/jenkins/jobs/nova.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-novaclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-novaclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/openstack-ansible-jobs.yaml b/jenkins/jobs/openstack-ansible-jobs.yaml
index b3bd449ca3..e9d2f5f89a 100644
--- a/jenkins/jobs/openstack-ansible-jobs.yaml
+++ b/jenkins/jobs/openstack-ansible-jobs.yaml
@@ -32,7 +32,7 @@
       - devstack-logs
 
 - job-template:
-    name: 'gate-{name}-commit{branch-designator}'
+    name: 'gate-{name}-commit{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/openstackid.yaml b/jenkins/jobs/openstackid.yaml
index 4c44570b8b..24e395663e 100644
--- a/jenkins/jobs/openstackid.yaml
+++ b/jenkins/jobs/openstackid.yaml
@@ -20,7 +20,7 @@
                   copy-after-failure: true
 
 - job-template:
-    name: 'openstackid-release-{branch-designator}'
+    name: 'openstackid-release-{job-suffix}'
     node: '{node}'
 
     builders:
diff --git a/jenkins/jobs/osc.yaml b/jenkins/jobs/osc.yaml
index e6c5873841..75bd35eafa 100644
--- a/jenkins/jobs/osc.yaml
+++ b/jenkins/jobs/osc.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-osc-dsvm-functional{branch-designator}'
+    name: '{pipeline}-osc-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/oslo.yaml b/jenkins/jobs/oslo.yaml
index 990ef92344..e141d1f727 100644
--- a/jenkins/jobs/oslo.yaml
+++ b/jenkins/jobs/oslo.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}'
+    name: '{pipeline}-{injectedlib}-dsvm-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -86,13 +86,13 @@
 #     injectedrepo: openstack/oslotest
 #
 #     jobs:
-#       - '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
+#       - '{pipeline}-{injectedlib}-dsvm-{name}{job-suffix}':
 #           pipeline: check
 #           node: 'devstack-precise || devstack-trusty'
-#           branch-designator: ''
+#           job-suffix: ''
 #           branch-override: default
-#       - '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
+#       - '{pipeline}-{injectedlib}-dsvm-{name}{job-suffix}':
 #           pipeline: gate
 #           node: 'devstack-precise || devstack-trusty'
-#           branch-designator: ''
+#           job-suffix: ''
 #           branch-override: default
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 6f0c357fc8..229b6928b5 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -63,15 +63,15 @@
     jobs:
       - python-jobs
       - hook-{name}-rtfd
-      - '{pipeline}-functional-dsvm-akanda{branch-designator}':
+      - '{pipeline}-functional-dsvm-akanda{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: 'stable/liberty'
-      - '{pipeline}-functional-dsvm-akanda-appliance-src{branch-designator}':
+      - '{pipeline}-functional-dsvm-akanda-appliance-src{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: 'stable/liberty'
 
 - project:
@@ -308,53 +308,53 @@
       - translation-jobs
       - translation-jobs-liberty
       - gate-rally-dsvm-fakevirt-{name}
-      - 'gate-tempest-dsvm-ceilometer-{backend}-full{branch-designator}':
+      - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}':
           backend: 'mongodb'
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - 'gate-tempest-dsvm-ceilometer-{backend}-full{branch-designator}':
+      - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}':
           backend: 'mysql'
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - 'gate-tempest-dsvm-ceilometer-{backend}-full{branch-designator}':
+      - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}':
           backend: 'postgresql'
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - 'gate-tempest-dsvm-ceilometer-{backend}{branch-designator}':
+      - 'gate-tempest-dsvm-ceilometer-{backend}{job-suffix}':
           backend: 'es'
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - 'gate-tempest-dsvm-ceilometer-{backend}-full{branch-designator}':
+      - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}':
           backend: 'es'
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - 'gate-tempest-dsvm-ceilometer-{backend}-neutron-full{branch-designator}':
+      - 'gate-tempest-dsvm-ceilometer-{backend}-neutron-full{job-suffix}':
           backend: 'mysql'
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-ceilometer-dsvm-functional-{backend}{branch-designator}':
+      - '{pipeline}-ceilometer-dsvm-functional-{backend}{job-suffix}':
           pipeline: 'gate'
           backend: 'mongodb'
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-ceilometer-dsvm-functional-{backend}{branch-designator}':
+      - '{pipeline}-ceilometer-dsvm-functional-{backend}{job-suffix}':
           pipeline: 'gate'
           backend: 'mysql'
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-ceilometer-dsvm-functional-{backend}{branch-designator}':
+      - '{pipeline}-ceilometer-dsvm-functional-{backend}{job-suffix}':
           node: 'devstack-precise || devstack-trusty'
           pipeline: gate
           backend: postgresql
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -390,11 +390,11 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - '{pipeline}-tempest-dsvm-neutron-src-{name}{branch-designator}-plugin':
+      - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}-plugin':
           project-repo: ceilometer
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -429,10 +429,10 @@
       - translation-jobs
       - translation-jobs-liberty
       - gate-rally-dsvm-{name}
-      - '{pipeline}-cinder-dsvm-apache{branch-designator}':
+      - '{pipeline}-cinder-dsvm-apache{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -582,15 +582,15 @@
 
     jobs:
       - python-jobs
-      - '{pipeline}-congress-dsvm-api{branch-designator}':
+      - '{pipeline}-congress-dsvm-api{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-install-dsvm-networking-bgpvpn{branch-designator}':
+      - '{pipeline}-install-dsvm-networking-bgpvpn{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-liberty'
+          job-suffix: '-liberty'
           branch-override: stable/liberty
 
 - project:
@@ -821,105 +821,105 @@
       - devstack-jobs:
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       # Stable gate jobs for branchless tempest
       - devstack-jobs:
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-juno'
+          job-suffix: '-juno'
           branch-override: stable/juno
       - devstack-jobs:
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-kilo'
+          job-suffix: '-kilo'
           branch-override: stable/kilo
       - devstack-jobs:
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-liberty'
+          job-suffix: '-liberty'
           branch-override: stable/liberty
       # Stable check jobs for testing devstack gate
       # tempest also uses these job definitions
       - devstack-jobs:
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-juno-nv'
+          job-suffix: '-juno-nv'
           branch-override: stable/juno
       - devstack-jobs:
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-kilo-nv'
+          job-suffix: '-kilo-nv'
           branch-override: stable/kilo
       - devstack-jobs:
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-liberty-nv'
+          job-suffix: '-liberty-nv'
           branch-override: stable/liberty
       # Periodic jobs for various branches
       - devstack-jobs:
           pipeline: periodic
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-juno'
+          job-suffix: '-juno'
           branch-override: stable/juno
       - devstack-jobs:
           pipeline: periodic
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-kilo'
+          job-suffix: '-kilo'
           branch-override: stable/kilo
       - devstack-jobs:
           pipeline: periodic
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-liberty'
+          job-suffix: '-liberty'
           branch-override: stable/liberty
       - devstack-jobs:
           pipeline: periodic
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-master'
+          job-suffix: '-master'
           branch-override: master
       # Special jobs for devstack-gate
       - devstack-gate-jobs:
           node: 'devstack-precise || devstack-trusty'
-      - '{pipeline}-grenade-dsvm-multinode{branch-designator}':
+      - '{pipeline}-grenade-dsvm-multinode{job-suffix}':
           pipeline: gate
           node: devstack-trusty-2-node
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-grenade-dsvm-multinode{branch-designator}':
+      - '{pipeline}-grenade-dsvm-multinode{job-suffix}':
           pipeline: gate
           node: devstack-trusty-2-node
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-multinode-full{branch-designator}':
+      - '{pipeline}-tempest-dsvm-multinode-full{job-suffix}':
           pipeline: gate
           node: devstack-trusty-2-node
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-neutron-multinode-full{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron-multinode-full{job-suffix}':
           pipeline: gate
           node: devstack-trusty-2-node
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{job-suffix}':
           pipeline: gate
           node: devstack-trusty-2-node
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       # Experimental jobs for testing dib images.
-      - '{pipeline}-tempest-dsvm-full{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full{job-suffix}':
           pipeline: experimental
           node: ubuntu-trusty
-          branch-designator: '-dibtest'
+          job-suffix: '-dibtest'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron-full{job-suffix}':
           pipeline: experimental
           node: ubuntu-trusty
-          branch-designator: '-dibtest'
+          job-suffix: '-dibtest'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-multinode-full{branch-designator}':
+      - '{pipeline}-tempest-dsvm-multinode-full{job-suffix}':
           pipeline: experimental
           node: ubuntu-trusty-2-node
-          branch-designator: '-dibtest'
+          job-suffix: '-dibtest'
           branch-override: default
       # fedora jobs
       - '{pipeline}-tempest-dsvm-f{fedora-release}':
@@ -937,11 +937,11 @@
 
     jobs:
       - gate-{name}-bashate
-      - '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-{plugin}{job-suffix}':
           pipeline: gate
           plugin: amqp1
           plugin-repo: openstack/devstack-plugin-amqp1
-          branch-designator: ''
+          job-suffix: ''
 
 - project:
     name: devstack-plugin-bdd
@@ -949,14 +949,14 @@
 
     jobs:
       - gate-{name}-bashate
-      - '{pipeline}-tempest-dsvm-full-bdd{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-bdd{job-suffix}':
           node: devstack-precise || devstack-trusty
           pipeline: gate
-          branch-designator: '-nv'
-      - '{pipeline}-tempest-dsvm-full-bdd{branch-designator}':
+          job-suffix: '-nv'
+      - '{pipeline}-tempest-dsvm-full-bdd{job-suffix}':
           node: devstack-precise || devstack-trusty
           pipeline: gate
-          branch-designator: ''
+          job-suffix: ''
 
 - project:
     name: devstack-plugin-glusterfs
@@ -964,14 +964,14 @@
 
     jobs:
       - gate-{name}-bashate
-      - '{pipeline}-cinder-tempest-dsvm-glusterfs{branch-designator}':
+      - '{pipeline}-cinder-tempest-dsvm-glusterfs{job-suffix}':
           node: devstack-precise || devstack-trusty
           pipeline: gate
-          branch-designator: '-nv'
-      - '{pipeline}-cinder-tempest-dsvm-glusterfs{branch-designator}':
+          job-suffix: '-nv'
+      - '{pipeline}-cinder-tempest-dsvm-glusterfs{job-suffix}':
           node: devstack-precise || devstack-trusty
           pipeline: gate
-          branch-designator: ''
+          job-suffix: ''
 
 - project:
     name: devstack-plugin-hdfs
@@ -979,12 +979,12 @@
 
     jobs:
       - gate-{name}-bashate
-      - '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-{plugin}{job-suffix}':
           node: devstack-precise || devstack-trusty
           pipeline: gate
           plugin: hdfs
           plugin-repo: openstack/devstack-plugin-hdfs
-          branch-designator: ''
+          job-suffix: ''
 
 - project:
     name: devstack-plugin-pika
@@ -998,16 +998,16 @@
 
     jobs:
       - gate-{name}-bashate
-      - '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-{plugin}{job-suffix}':
           pipeline: gate
           plugin: sheepdog
           plugin-repo: openstack/devstack-plugin-sheepdog
-          branch-designator: ''
-      - '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}':
+          job-suffix: ''
+      - '{pipeline}-tempest-dsvm-full-{plugin}{job-suffix}':
           pipeline: gate
           plugin: sheepdog
           plugin-repo: openstack/devstack-plugin-sheepdog
-          branch-designator: '-nv'
+          job-suffix: '-nv'
 
 - project:
     name: devstack-plugin-zmq
@@ -1015,11 +1015,11 @@
 
     jobs:
       - gate-{name}-bashate
-      - '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-{plugin}{job-suffix}':
           pipeline: gate
           plugin: zmq
           plugin-repo: openstack/devstack-plugin-zmq
-          branch-designator: ''
+          job-suffix: ''
 
 - project:
     name: dib-utils
@@ -1046,10 +1046,10 @@
           node: devstack-centos7
       - gate-dib-dsvm-functests-{node}:
           node: devstack-f21
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-dib'
+          job-suffix: '-dib'
           branch-override: default
 
 - project:
@@ -1120,10 +1120,10 @@
       - python-jobs
       - pypi-jobs
       - openstack-publish-jobs
-      - '{pipeline}-tempest-dsvm-dragonflow{branch-designator}':
+      - '{pipeline}-tempest-dsvm-dragonflow{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -1132,12 +1132,12 @@
 
     jobs:
       - gate-{name}-bashate
-      - '{pipeline}-tempest-dsvm-full-drbd-devstack{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-drbd-devstack{job-suffix}':
           pipeline: gate
-          branch-designator: '-nv'
-      - '{pipeline}-tempest-dsvm-full-drbd-devstack{branch-designator}':
+          job-suffix: '-nv'
+      - '{pipeline}-tempest-dsvm-full-drbd-devstack{job-suffix}':
           pipeline: gate
-          branch-designator: ''
+          job-suffix: ''
 
 - project:
     name: driverlog
@@ -1155,20 +1155,20 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - '{pipeline}-tempest-dsvm-ec2api{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ec2api{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-functional-neutron-dsvm-ec2api{branch-designator}':
+      - '{pipeline}-functional-neutron-dsvm-ec2api{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-functional-nova-network-dsvm-ec2api{branch-designator}':
+      - '{pipeline}-functional-nova-network-dsvm-ec2api{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -1418,15 +1418,15 @@
 
     jobs:
       - python-jobs
-      - '{pipeline}-functional-neutron-dsvm-gceapi{branch-designator}':
+      - '{pipeline}-functional-neutron-dsvm-gceapi{job-suffix}':
             pipeline: gate
             node: 'devstack-precise || devstack-trusty'
-            branch-designator: ''
+            job-suffix: ''
             branch-override: default
-      - '{pipeline}-functional-nova-network-dsvm-gceapi{branch-designator}':
+      - '{pipeline}-functional-nova-network-dsvm-gceapi{job-suffix}':
             pipeline: gate
             node: 'devstack-precise || devstack-trusty'
-            branch-designator: ''
+            job-suffix: ''
             branch-override: default
 
 - project:
@@ -1573,12 +1573,12 @@
           driver: filesystem
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-full-ceph-src-{name}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-ceph-src-{name}{job-suffix}':
           node: 'devstack-precise || devstack-trusty'
           pipeline: gate
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -1655,15 +1655,15 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - '{pipeline}-group-based-policy-dsvm-functional{branch-designator}':
+      - '{pipeline}-group-based-policy-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-group-based-policy-dsvm-rally{branch-designator}':
+      - '{pipeline}-group-based-policy-dsvm-rally{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -1699,10 +1699,10 @@
 
     jobs:
       - gate-groups-unittests
-      - 'groups-release-{branch-designator}':
-          branch-designator: 'master'
-      - 'groups-release-{branch-designator}':
-          branch-designator: 'branch'
+      - 'groups-release-{job-suffix}':
+          job-suffix: 'master'
+      - 'groups-release-{job-suffix}':
+          job-suffix: 'branch'
 
 - project:
     name: groups-static-pages
@@ -1742,62 +1742,62 @@
 
     jobs:
       - python-jobs
-      - '{pipeline}-heat-dsvm-functional-aodh-{engine}-{datastore}{branch-designator}':
+      - '{pipeline}-heat-dsvm-functional-aodh-{engine}-{datastore}{job-suffix}':
           datastore: postgres
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           engine: orig
-      - '{pipeline}-heat-dsvm-functional-aodh-{engine}-{datastore}{branch-designator}':
+      - '{pipeline}-heat-dsvm-functional-aodh-{engine}-{datastore}{job-suffix}':
           datastore: mysql
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           engine: orig
-      - '{pipeline}-heat-dsvm-functional-aodh-{engine}-{datastore}{branch-designator}':
+      - '{pipeline}-heat-dsvm-functional-aodh-{engine}-{datastore}{job-suffix}':
           datastore: mysql
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           engine: convg
-      - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{branch-designator}':
+      - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{job-suffix}':
           datastore: mysql
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           engine: orig
-      - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{branch-designator}':
+      - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{job-suffix}':
           datastore: postgres
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           engine: orig
-      - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{branch-designator}':
+      - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{job-suffix}':
           datastore: mysql
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           engine: convg
-      - '{pipeline}-tempest-dsvm-heat{branch-designator}':
+      - '{pipeline}-tempest-dsvm-heat{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-grenade-dsvm-heat{branch-designator}':
+      - '{pipeline}-grenade-dsvm-heat{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-grenade-dsvm-heat{branch-designator}':
+      - '{pipeline}-grenade-dsvm-heat{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
       - python-juno-bitrot-jobs
       - python-kilo-bitrot-jobs
@@ -1949,55 +1949,55 @@
       - python-liberty-bitrot-jobs
       - translation-jobs
       - translation-jobs-liberty
-      - '{pipeline}-ironic-dsvm-functional{branch-designator}':
+      - '{pipeline}-ironic-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}':
+      - '{pipeline}-grenade-dsvm-ironic-sideways{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-full{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-full{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-ironic-agent_ssh{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-agent_ssh{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-ironic-parallel{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-parallel{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-ironic-inspector-dsvm{branch-designator}':
+      - '{pipeline}-ironic-inspector-dsvm{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
       - 'gate-tripleo-ci-{jobname}':
           jobname: 'f21-nonha'
@@ -2023,10 +2023,10 @@
       - translation-jobs
       - gate-{name}-tox-{envlist}:
           envlist: func
-      - '{pipeline}-ironic-inspector-dsvm{branch-designator}':
+      - '{pipeline}-ironic-inspector-dsvm{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -2037,10 +2037,10 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - '{pipeline}-tempest-dsvm-ironic-lib-src{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-lib-src{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -2284,10 +2284,10 @@
       - python-jobs
       - openstack-publish-jobs
       - translation-jobs
-      - '{pipeline}-functional-dsvm-magnum{branch-designator}':
+      - '{pipeline}-functional-dsvm-magnum{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - 'gate-{name}-tox-{envlist}':
           envlist: bandit
@@ -2357,10 +2357,10 @@
 
     jobs:
       - javascript-jobs
-      - '{name}-js-release-{branch-designator}':
-          branch-designator: 'master'
-      - '{name}-js-release-{branch-designator}':
-          branch-designator: 'branch'
+      - '{name}-js-release-{job-suffix}':
+          job-suffix: 'master'
+      - '{name}-js-release-{job-suffix}':
+          job-suffix: 'branch'
 
 - project:
     name: mistral
@@ -2623,10 +2623,10 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - '{pipeline}-install-dsvm-networking-bgpvpn{branch-designator}':
+      - '{pipeline}-install-dsvm-networking-bgpvpn{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -2746,20 +2746,20 @@
       - python-jobs
       - pypi-jobs
       - openstack-publish-jobs
-      - '{pipeline}-tempest-dsvm-networking-midonet-v1{branch-designator}':
+      - '{pipeline}-tempest-dsvm-networking-midonet-v1{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-networking-midonet-v2{branch-designator}':
+      - '{pipeline}-tempest-dsvm-networking-midonet-v2{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-networking-midonet-ml2{branch-designator}':
+      - '{pipeline}-tempest-dsvm-networking-midonet-ml2{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -2788,10 +2788,10 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - '{pipeline}-tempest-dsvm-networking-odl{branch-designator}':
+      - '{pipeline}-tempest-dsvm-networking-odl{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -2815,10 +2815,10 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - '{pipeline}-tempest-dsvm-networking-onos{branch-designator}':
+      - '{pipeline}-tempest-dsvm-networking-onos{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -2831,10 +2831,10 @@
       - python-jobs
       - pypi-jobs
       - openstack-publish-jobs
-      - '{pipeline}-tempest-dsvm-networking-ovn{branch-designator}':
+      - '{pipeline}-tempest-dsvm-networking-ovn{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -2910,53 +2910,53 @@
       - gate-rally-dsvm-neutron-{name}
       - translation-jobs
       - translation-jobs-liberty
-      - '{pipeline}-neutron-dsvm-functional{python}{branch-designator}':
+      - '{pipeline}-neutron-dsvm-functional{python}{job-suffix}':
           pipeline: gate
           python: ''
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-dsvm-functional{python}{branch-designator}':
+      - '{pipeline}-neutron-dsvm-functional{python}{job-suffix}':
           pipeline: gate
           python: '-py34'
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-dsvm-functional{python}{branch-designator}':
+      - '{pipeline}-neutron-dsvm-functional{python}{job-suffix}':
           pipeline: gate
           python: ''
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-neutron-dsvm-fullstack{branch-designator}':
+      - '{pipeline}-neutron-dsvm-fullstack{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-dsvm-api{branch-designator}':
+      - '{pipeline}-neutron-dsvm-api{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-neutron-linuxbridge{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron-linuxbridge{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-neutron{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-neutron-ipv6only{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron-ipv6only{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-neutron-serviceipv6{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron-serviceipv6{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -2970,15 +2970,15 @@
       - python-kilo-bitrot-jobs
       - python-liberty-bitrot-jobs
       - openstack-publish-jobs
-      - '{pipeline}-neutron-fwaas-dsvm-api{branch-designator}':
+      - '{pipeline}-neutron-fwaas-dsvm-api{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-fwaas-dsvm-functional{branch-designator}':
+      - '{pipeline}-neutron-fwaas-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -2992,66 +2992,66 @@
       - python-kilo-bitrot-jobs
       - python-liberty-bitrot-jobs
       - openstack-publish-jobs
-      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}':
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           lbaasversion: lbaasv2
           lbaastest: scenario
-      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}':
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           lbaasversion: lbaasv2
           lbaastest: minimal
-      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}':
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           lbaasversion: lbaasv1
           lbaastest: api
-      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}':
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           lbaasversion: lbaasv2-octavia
           lbaastest: api
-      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}':
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           lbaasversion: lbaasv2
           lbaastest: healthmonitor
-      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}':
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           lbaasversion: lbaasv2
           lbaastest: listener
-      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}':
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           lbaasversion: lbaasv2
           lbaastest: loadbalancer
-      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}':
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           lbaasversion: lbaasv2
           lbaastest: member
-      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}':
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           lbaasversion: lbaasv2
           lbaastest: pool
@@ -3084,33 +3084,33 @@
       - python-kilo-bitrot-jobs
       - python-liberty-bitrot-jobs
       - openstack-publish-jobs
-      - '{pipeline}-neutron-vpnaas-dsvm-functional{branch-designator}':
+      - '{pipeline}-neutron-vpnaas-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-vpnaas-dsvm-functional-sswan{branch-designator}':
+      - '{pipeline}-neutron-vpnaas-dsvm-functional-sswan{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{branch-designator}':
+      - '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           vpnaastest: functional
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{branch-designator}':
+      - '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           vpnaastest: functional-sswan
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{branch-designator}':
+      - '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           vpnaastest: api
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -3124,15 +3124,15 @@
       - python-jobs
       - pypi-jobs
       - infra-publish-jobs
-      - '{pipeline}-dsvm-nodepool{branch-designator}':
+      - '{pipeline}-dsvm-nodepool{job-suffix}':
           pipeline: gate
           node: devstack-trusty
-          branch-designator: ''
+          job-suffix: ''
           branch-override: 'default'
-      - '{pipeline}-dsvm-nodepool-src-shade{branch-designator}':
+      - '{pipeline}-dsvm-nodepool-src-shade{job-suffix}':
           pipeline: gate
           node: devstack-trusty
-          branch-designator: ''
+          job-suffix: ''
           branch-override: 'default'
 
 - project:
@@ -3247,9 +3247,9 @@
       # This check uses the newer 'ubuntu-trusty' image which
       # is consistent between cloud providers. It is in the
       # final stage of testing.
-      - 'gate-{name}-commit{branch-designator}':
+      - 'gate-{name}-commit{job-suffix}':
           node: 'ubuntu-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
       # This check uses the 'devstack-trusty' image which is
       # inconsistent between cloud providers. This will be
       # removed once gate-openstack-ansible-commit is converted
@@ -3353,10 +3353,10 @@
 
     jobs:
       - gate-openstackid-unittests
-      - 'openstackid-release-{branch-designator}':
-          branch-designator: 'master'
-      - 'openstackid-release-{branch-designator}':
-          branch-designator: 'branch'
+      - 'openstackid-release-{job-suffix}':
+          job-suffix: 'master'
+      - 'openstackid-release-{job-suffix}':
+          job-suffix: 'branch'
       - infra-publish-jobs
       - 'gate-{name}-docs'
 
@@ -3388,15 +3388,15 @@
       - pypi-jobs
       - python-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-tempest-dsvm-full-ceph-src-{name}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-ceph-src-{name}{job-suffix}':
           node: 'devstack-precise || devstack-trusty'
           pipeline: gate
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-full-lio-src-{name}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-lio-src-{name}{job-suffix}':
           node: 'devstack-precise || devstack-trusty'
           pipeline: gate
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -3570,10 +3570,10 @@
       - translation-jobs
       - 'gate-{name}-tox-{envlist}'
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-tempest-dsvm-largeops-src-{name}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -3601,10 +3601,10 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-tempest-dsvm-largeops-src-{name}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -3619,65 +3619,65 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-tempest-dsvm-largeops-src-{name}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}':
           driver: rabbit
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           ostype: ''
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}':
           driver: qpid
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           ostype: ''
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}':
           driver: zeromq
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           ostype: ''
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}':
           driver: pika
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           ostype: ''
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}':
           driver: amqp1
           pipeline: gate
           node: 'devstack-f21'
           ostype: '-f21'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{branch-designator}':
+      - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{job-suffix}':
           pipeline: gate
           plugin: zmq
           ostype: ''
           plugin-repo: openstack/devstack-plugin-zmq
-          branch-designator: ''
-      - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{branch-designator}':
+          job-suffix: ''
+      - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{job-suffix}':
           pipeline: gate
           plugin: amqp1
           node: 'devstack-f21'
           ostype: '-f21'
           plugin-repo: openstack/devstack-plugin-amqp1
-          branch-designator: ''
-      - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{branch-designator}':
+          job-suffix: ''
+      - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{job-suffix}':
           pipeline: gate
           plugin: pika
           ostype: ''
           plugin-repo: openstack/devstack-plugin-pika
-          branch-designator: ''
+          job-suffix: ''
 
 - project:
     name: oslo.middleware
@@ -3739,10 +3739,10 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-tempest-dsvm-largeops-src-{name}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -3939,7 +3939,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -3950,7 +3950,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -3962,7 +3962,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -3973,7 +3973,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -3984,7 +3984,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -3995,7 +3995,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4006,7 +4006,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4025,7 +4025,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4037,7 +4037,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4048,7 +4048,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4059,7 +4059,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4071,7 +4071,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4083,7 +4083,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4094,7 +4094,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4106,7 +4106,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4117,7 +4117,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4129,7 +4129,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4140,7 +4140,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4151,7 +4151,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4162,7 +4162,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4173,7 +4173,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4184,7 +4184,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4195,7 +4195,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4206,7 +4206,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4217,7 +4217,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4228,7 +4228,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4240,7 +4240,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4252,7 +4252,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4263,7 +4263,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4274,7 +4274,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4285,7 +4285,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4297,7 +4297,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4309,7 +4309,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4320,7 +4320,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4332,7 +4332,7 @@
       - puppet-check-jobs
       - '{name}-forge-upload'
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4343,7 +4343,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4354,7 +4354,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4366,7 +4366,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4377,7 +4377,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4388,7 +4388,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4399,7 +4399,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4411,7 +4411,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4422,7 +4422,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4433,7 +4433,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4444,7 +4444,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4455,7 +4455,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4466,7 +4466,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4477,7 +4477,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4489,7 +4489,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4500,7 +4500,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4511,7 +4511,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4541,7 +4541,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4552,7 +4552,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4573,7 +4573,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4584,7 +4584,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4596,7 +4596,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4607,7 +4607,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4618,7 +4618,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4630,7 +4630,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4641,7 +4641,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4652,9 +4652,9 @@
     jobs:
       - puppet-check-jobs
       - puppet-openstack-integration-jobs
-      - 'gate-puppet-openstack-integration-dsvm-multinode{branch-designator}':
+      - 'gate-puppet-openstack-integration-dsvm-multinode{job-suffix}':
           node: devstack-trusty-2-node
-          branch-designator: '-nv'
+          job-suffix: '-nv'
 
 - project:
     name: puppet-openstack-specs
@@ -4671,7 +4671,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - 'gate-openstackci-beaker-{ostype}-dsvm':
           ostype: centos7
@@ -4686,7 +4686,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4698,7 +4698,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4709,7 +4709,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4720,7 +4720,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4731,7 +4731,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4742,7 +4742,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4753,7 +4753,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4764,7 +4764,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4775,7 +4775,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4786,7 +4786,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4797,7 +4797,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4808,7 +4808,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4819,7 +4819,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4830,7 +4830,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4842,7 +4842,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4861,7 +4861,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4872,7 +4872,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4883,7 +4883,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4894,7 +4894,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4905,7 +4905,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4916,7 +4916,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4928,7 +4928,7 @@
       - puppet-check-jobs
       - '{name}-forge-upload'
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4939,7 +4939,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4950,7 +4950,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -4962,7 +4962,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4974,7 +4974,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -4985,7 +4985,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -5006,7 +5006,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5026,7 +5026,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -5037,7 +5037,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -5048,7 +5048,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -5059,7 +5059,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -5070,7 +5070,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -5082,7 +5082,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5093,7 +5093,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -5104,7 +5104,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -5116,7 +5116,7 @@
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs:
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5127,7 +5127,7 @@
     jobs:
       - puppet-check-jobs
       - puppet-beaker-jobs:
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 
 - project:
@@ -5202,16 +5202,16 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - '{pipeline}-tempest-dsvm-neutron-src-{name}{branch-designator}-plugin':
+      - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}-plugin':
           project-repo: ceilometer
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-ceilometerclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-ceilometerclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5233,10 +5233,10 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-cinderclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-cinderclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5324,10 +5324,10 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-glanceclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-glanceclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5374,10 +5374,10 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-heatclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-heatclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5390,10 +5390,10 @@
       - pypi-jobs
       - gate-{name}-tox-{envlist}:
           envlist: func
-      - '{pipeline}-python-ironic-inspector-client-dsvm{branch-designator}':
+      - '{pipeline}-python-ironic-inspector-client-dsvm{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5407,15 +5407,15 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-ironicclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-ironicclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-python-ironicclient-src{branch-designator}':
+      - '{pipeline}-tempest-dsvm-python-ironicclient-src{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5440,10 +5440,10 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-keystoneclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-keystoneclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - 'gate-{name}-tox-{envlist}':
           envlist: bandit
@@ -5519,10 +5519,10 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - '{pipeline}-muranoclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-muranoclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5545,17 +5545,17 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-neutronclient-test-dsvm-{which-test}{branch-designator}':
+      - '{pipeline}-neutronclient-test-dsvm-{which-test}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           which-test: functional
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutronclient-test-dsvm-{which-test}{branch-designator}':
+      - '{pipeline}-neutronclient-test-dsvm-{which-test}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           which-test: functional-adv-svcs
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5570,10 +5570,10 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-novaclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-novaclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5593,10 +5593,10 @@
     jobs:
       - python-jobs
       - translation-jobs
-      - '{pipeline}-osc-dsvm-functional{branch-designator}':
+      - '{pipeline}-osc-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - openstack-publish-jobs
       - pypi-jobs
@@ -5609,10 +5609,10 @@
 
     jobs:
       - python-jobs
-      - '{pipeline}-sdk-dsvm-functional{branch-designator}':
+      - '{pipeline}-sdk-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - pypi-jobs
 
@@ -5642,15 +5642,15 @@
       - python-jobs
       - pypi-jobs
       - openstack-publish-jobs
-      - '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-saharaclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-saharaclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5716,10 +5716,10 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - '{pipeline}-swiftclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-swiftclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - 'lib-forward-testing-{name}'
 
@@ -5749,10 +5749,10 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -5782,10 +5782,10 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - '{pipeline}-zaqarclient-dsvm-functional{branch-designator}':
+      - '{pipeline}-zaqarclient-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - 'lib-forward-testing-{name}'
 
@@ -5917,11 +5917,11 @@
       - gate-{name}-python27
       - gate-{name}-pypy
       - openstack-publish-jobs
-      - propose-requirements-constraints{branch-designator}:
-          branch-designator: '-master'
+      - propose-requirements-constraints{job-suffix}:
+          job-suffix: '-master'
           branch-override: master
-      - propose-requirements-constraints{branch-designator}:
-          branch-designator: '-liberty'
+      - propose-requirements-constraints{job-suffix}:
+          job-suffix: '-liberty'
           branch-override: stable/liberty
       - 'gate-{name}-tox-{envlist}':
           envlist: validate
@@ -5989,36 +5989,36 @@
           envlist: "py27-scenario-unit"
       - gate-{name}-tox-{envlist}:
           envlist: bandit
-      - '{pipeline}-tempest-dsvm-sahara{branch-designator}':
+      - '{pipeline}-tempest-dsvm-sahara{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}':
+      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           network: neutron
           engine: heat
-      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}':
+      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           network: nova
           engine: heat
-      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}':
+      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           network: neutron
           engine: direct
-      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}':
+      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           network: nova
           engine: direct
@@ -6089,10 +6089,10 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - '{pipeline}-scalpels-dsvm-neutron{branch-designator}':
+      - '{pipeline}-scalpels-dsvm-neutron{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -6127,10 +6127,10 @@
     tarball-site: tarballs.openstack.org
     jobs:
       - python-jobs
-      - '{pipeline}-senlin-dsvm-functional{branch-designator}':
+      - '{pipeline}-senlin-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - pypi-jobs
 
@@ -6154,20 +6154,20 @@
       - python-jobs
       - pypi-jobs
       - infra-publish-jobs
-      - '{pipeline}-shade-dsvm-functional-keystone2{branch-designator}':
+      - '{pipeline}-shade-dsvm-functional-keystone2{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-shade-dsvm-functional-neutron{branch-designator}':
+      - '{pipeline}-shade-dsvm-functional-neutron{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-shade-dsvm-functional-nova{branch-designator}':
+      - '{pipeline}-shade-dsvm-functional-nova{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -6243,10 +6243,10 @@
           node: bare-centos6
       - gate-{name}-tox-{envlist}:
           envlist: py27sa07
-      - '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}':
+      - '{pipeline}-sqlalchemy-migrate-devstack-dsvm{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
       - hook-{name}-rtfd
       - pypi-jobs
@@ -6425,10 +6425,10 @@
       - 'gate-{name}-npm-run-{command}':
           command: 'test-integration'
       - gate-{name}-js-draft
-      - '{name}-js-release-{branch-designator}':
-          branch-designator: 'master'
-      - '{name}-js-release-{branch-designator}':
-          branch-designator: 'branch'
+      - '{name}-js-release-{job-suffix}':
+          job-suffix: 'master'
+      - '{name}-js-release-{job-suffix}':
+          job-suffix: 'branch'
       - gate-storyboard-js-integration
 
 - project:
@@ -6464,15 +6464,15 @@
       - translation-jobs
       - 'gate-{name}-tox-{envlist}':
           envlist: func
-      - '{pipeline}-swift-dsvm-functional{branch-designator}':
+      - '{pipeline}-swift-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - '{pipeline}-swift-dsvm-functional{branch-designator}':
+      - '{pipeline}-swift-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: '-nv'
+          job-suffix: '-nv'
           branch-override: default
 # No one is interested in stable/ branches on swift, so don't run bitrot jobs
 
@@ -6516,10 +6516,10 @@
           envlist: keystone
       - gate-{name}-tox-{envlist}:
           envlist: s3acl
-      - '{pipeline}-tempest-dsvm-swift3{branch-designator}':
+      - '{pipeline}-tempest-dsvm-swift3{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -6572,10 +6572,10 @@
     jobs:
       - python-jobs
       - hook-{name}-rtfd
-      - '{pipeline}-tacker-dsvm-functional{branch-designator}':
+      - '{pipeline}-tacker-dsvm-functional{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
 
 - project:
@@ -6782,25 +6782,25 @@
       - openstack-publish-jobs
       - translation-jobs
       - openstack-doc-jobs
-      - 'gate-trove-functional-dsvm-{datastore}{branch-designator}':
+      - 'gate-trove-functional-dsvm-{datastore}{job-suffix}':
           datastore: 'mysql'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - 'gate-trove-functional-dsvm-{datastore}{branch-designator}':
+      - 'gate-trove-functional-dsvm-{datastore}{job-suffix}':
           datastore: 'percona'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - 'gate-trove-functional-dsvm-{datastore}{branch-designator}':
+      - 'gate-trove-functional-dsvm-{datastore}{job-suffix}':
           datastore: 'mongodb'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
-      - 'gate-trove-functional-dsvm-{datastore}{branch-designator}':
+      - 'gate-trove-functional-dsvm-{datastore}{job-suffix}':
           datastore: 'mysql'
-          branch-designator: '-kilo'
+          job-suffix: '-kilo'
           branch-override: stable/kilo
-      - 'gate-trove-functional-dsvm-{datastore}{branch-designator}':
+      - 'gate-trove-functional-dsvm-{datastore}{job-suffix}':
           datastore: 'mysql'
-          branch-designator: '-juno'
+          job-suffix: '-juno'
           branch-override: stable/juno
       - 'gate-trove-buildimage-{datastore}':
           datastore: 'mysql'
@@ -6867,10 +6867,10 @@
 
     jobs:
       - gate-{name}-js-draft
-      - '{name}-js-release-{branch-designator}':
-          branch-designator: 'master'
-      - '{name}-js-release-{branch-designator}':
-          branch-designator: 'branch'
+      - '{name}-js-release-{job-suffix}':
+          job-suffix: 'master'
+      - '{name}-js-release-{job-suffix}':
+          job-suffix: 'branch'
 
 - project:
     name: vitrage
@@ -7198,16 +7198,16 @@
       - 'gate-{name}-tox-{envlist}':
           envlist: integration
       - gate-rally-dsvm-zaqar-{name}
-      - '{pipeline}-tempest-dsvm-{backend}-zaqar{branch-designator}':
+      - '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           backend: mongodb
-      - '{pipeline}-tempest-dsvm-{backend}-zaqar{branch-designator}':
+      - '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}':
           pipeline: gate
           node: 'devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
           backend: redis
 
diff --git a/jenkins/jobs/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml
index 3ed4d48e45..f309644911 100644
--- a/jenkins/jobs/puppet-module-jobs.yaml
+++ b/jenkins/jobs/puppet-module-jobs.yaml
@@ -65,7 +65,7 @@
 
 
 - job-template:
-    name: 'gate-{name}-puppet-beaker-rspec-dsvm-{ostype}{branch-designator}'
+    name: 'gate-{name}-puppet-beaker-rspec-dsvm-{ostype}{job-suffix}'
     node: 'devstack-{ostype}'
 
     builders:
@@ -164,7 +164,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-puppet-openstack-integration-dsvm-multinode{branch-designator}'
+    name: 'gate-puppet-openstack-integration-dsvm-multinode{job-suffix}'
     node: '{node}'
 
     builders:
@@ -246,7 +246,7 @@
       - trusty
       - centos7
     jobs:
-      - 'gate-{name}-puppet-beaker-rspec-dsvm-{ostype}{branch-designator}'
+      - 'gate-{name}-puppet-beaker-rspec-dsvm-{ostype}{job-suffix}'
 
 - job-group:
     name: 'puppet-openstack-integration-jobs'
diff --git a/jenkins/jobs/requirements.yaml b/jenkins/jobs/requirements.yaml
index 0391b34c95..4ac996e597 100644
--- a/jenkins/jobs/requirements.yaml
+++ b/jenkins/jobs/requirements.yaml
@@ -266,7 +266,7 @@
       - console-log
 
 - job-template:
-    name: propose-requirements-constraints{branch-designator}
+    name: propose-requirements-constraints{job-suffix}
     node: proposal
 
     builders:
diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index be22548c21..f97af96d36 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/jenkins/jobs/sahara.yaml
@@ -83,7 +83,7 @@
 
 
 - job-template:
-    name: '{pipeline}-saharaclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-saharaclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -121,7 +121,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-sahara{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-sahara{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -153,7 +153,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-sahara{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-sahara{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -189,7 +189,7 @@
 
 
 - job-template:
-    name: '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}'
+    name: '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -242,7 +242,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/scalpels.yaml b/jenkins/jobs/scalpels.yaml
index a415181039..9062ec25c3 100644
--- a/jenkins/jobs/scalpels.yaml
+++ b/jenkins/jobs/scalpels.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-scalpels-dsvm-neutron{branch-designator}'
+    name: '{pipeline}-scalpels-dsvm-neutron{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/sdk.yaml b/jenkins/jobs/sdk.yaml
index 7a0998de19..189b9853ed 100644
--- a/jenkins/jobs/sdk.yaml
+++ b/jenkins/jobs/sdk.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-sdk-dsvm-functional{branch-designator}'
+    name: '{pipeline}-sdk-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/senlin.yaml b/jenkins/jobs/senlin.yaml
index 97fff08b5a..22a989aec6 100644
--- a/jenkins/jobs/senlin.yaml
+++ b/jenkins/jobs/senlin.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-senlin-dsvm-functional{branch-designator}'
+    name: '{pipeline}-senlin-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/shade.yaml b/jenkins/jobs/shade.yaml
index 96ae55d02d..ef5e5f6026 100644
--- a/jenkins/jobs/shade.yaml
+++ b/jenkins/jobs/shade.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional-keystone2{branch-designator}'
+    name: '{pipeline}-shade-dsvm-functional-keystone2{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -35,7 +35,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional-neutron{branch-designator}'
+    name: '{pipeline}-shade-dsvm-functional-neutron{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -71,7 +71,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional-nova{branch-designator}'
+    name: '{pipeline}-shade-dsvm-functional-nova{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/sqlalchemy-migrate.yaml b/jenkins/jobs/sqlalchemy-migrate.yaml
index b10fc9eb0b..8cae73b491 100644
--- a/jenkins/jobs/sqlalchemy-migrate.yaml
+++ b/jenkins/jobs/sqlalchemy-migrate.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}'
+    name: '{pipeline}-sqlalchemy-migrate-devstack-dsvm{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/swift.yaml b/jenkins/jobs/swift.yaml
index 83c985c15e..fe129000ca 100644
--- a/jenkins/jobs/swift.yaml
+++ b/jenkins/jobs/swift.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-swift-dsvm-functional{branch-designator}'
+    name: '{pipeline}-swift-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -40,7 +40,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-swiftclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-swiftclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/swift3.yaml b/jenkins/jobs/swift3.yaml
index 58992b054a..7e916fbad6 100644
--- a/jenkins/jobs/swift3.yaml
+++ b/jenkins/jobs/swift3.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-swift3{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-swift3{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/tacker.yaml b/jenkins/jobs/tacker.yaml
index 5adf30f028..05056d5a55 100644
--- a/jenkins/jobs/tacker.yaml
+++ b/jenkins/jobs/tacker.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tacker-dsvm-functional{branch-designator}'
+    name: '{pipeline}-tacker-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/tempest-jobs.yaml b/jenkins/jobs/tempest-jobs.yaml
index ea07556f03..af7a565a4c 100644
--- a/jenkins/jobs/tempest-jobs.yaml
+++ b/jenkins/jobs/tempest-jobs.yaml
@@ -1,8 +1,8 @@
 - job-group:
     name: 'lib-forward-testing-{name}'
     jobs:
-      - '{pipeline}-tempest-dsvm-neutron-src-{name}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default
diff --git a/jenkins/jobs/trove.yaml b/jenkins/jobs/trove.yaml
index fbbe4622b5..6ba96ae482 100644
--- a/jenkins/jobs/trove.yaml
+++ b/jenkins/jobs/trove.yaml
@@ -28,7 +28,7 @@
 
 
 - job-template:
-    name: 'gate-trove-functional-dsvm-{datastore}{branch-designator}'
+    name: 'gate-trove-functional-dsvm-{datastore}{job-suffix}'
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:
@@ -71,7 +71,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/zaqar.yaml b/jenkins/jobs/zaqar.yaml
index 4858076e6c..36ff060215 100644
--- a/jenkins/jobs/zaqar.yaml
+++ b/jenkins/jobs/zaqar.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-zaqarclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-zaqarclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -46,7 +46,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-{backend}-zaqar{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}'
     node: '{node}'
 
     wrappers: