diff --git a/jenkins/jobs/golang-jobs.yaml b/jenkins/jobs/golang-jobs.yaml
index 2e06ab6d33..bdd0c87b70 100644
--- a/jenkins/jobs/golang-jobs.yaml
+++ b/jenkins/jobs/golang-jobs.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-{name}-fmt-{node}'
+    name: 'gate-{name}-golang-fmt-{node}'
     node: '{node}'
 
     builders:
@@ -18,7 +18,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-{name}-unit-{node}'
+    name: 'gate-{name}-golang-unit-{node}'
     node: '{node}'
 
     builders:
@@ -115,5 +115,5 @@
     name: golang-jobs
     node: ubuntu-xenial
     jobs:
-      - 'gate-{name}-fmt-{node}'
-      - 'gate-{name}-unit-{node}'
+      - 'gate-{name}-golang-fmt-{node}'
+      - 'gate-{name}-golang-unit-{node}'
diff --git a/jenkins/jobs/loci-jobs.yaml b/jenkins/jobs/loci-jobs.yaml
index 4aa25eebf3..bd700004c7 100644
--- a/jenkins/jobs/loci-jobs.yaml
+++ b/jenkins/jobs/loci-jobs.yaml
@@ -7,7 +7,7 @@
               git://git.openstack.org openstack/loci
 
 - job-template:
-    name: 'gate-loci-{shortname}-{node}'
+    name: 'gate-{name}-loci-{node}'
     node: '{node}'
 
     wrappers:
@@ -57,4 +57,4 @@
     name: loci-jobs
     node: ubuntu-xenial
     jobs:
-      - 'gate-loci-{shortname}-{node}'
+      - 'gate-{name}-loci-{node}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 247c880389..a3bd3a81a7 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -351,17 +351,17 @@ project-templates:
 
   - name: golang-jobs
     check:
-      - 'gate-{name}-fmt-ubuntu-xenial'
-      - 'gate-{name}-unit-ubuntu-xenial'
+      - 'gate-{name}-golang-fmt-ubuntu-xenial'
+      - 'gate-{name}-golang-unit-ubuntu-xenial'
     gate:
-      - 'gate-{name}-fmt-ubuntu-xenial'
-      - 'gate-{name}-unit-ubuntu-xenial'
+      - 'gate-{name}-golang-fmt-ubuntu-xenial'
+      - 'gate-{name}-golang-unit-ubuntu-xenial'
 
   - name: loci-jobs
     check:
-      - 'gate-{name}-ubuntu-xenial'
+      - 'gate-{name}-loci-ubuntu-xenial'
     gate:
-      - 'gate-{name}-ubuntu-xenial'
+      - 'gate-{name}-loci-ubuntu-xenial'
 
   - name: python-jobs
     check: