diff --git a/jenkins/jobs/devstack.yaml b/jenkins/jobs/devstack.yaml
index 9bf3e92dfb..90ee63d45a 100644
--- a/jenkins/jobs/devstack.yaml
+++ b/jenkins/jobs/devstack.yaml
@@ -13,7 +13,7 @@
 
     publishers:
       - console-log
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
 
 # Devstack does not support "python setup.py publish_sphinx", thus
 # we cannot use the normal docs jobs.
@@ -35,7 +35,7 @@
           remove-prefix: 'doc/build/html'
           excludes: ''
       - console-log
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
 
 - job:
     name: gate-devstack-publish-docs
@@ -50,5 +50,5 @@
     publishers:
       - console-log
       - upload-sphinx-draft
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
       # TODO(jhesketh): Add job for uploading built docs
diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml
index fc19c90848..a19ca886a1 100644
--- a/jenkins/jobs/infra.yaml
+++ b/jenkins/jobs/infra.yaml
@@ -8,7 +8,7 @@
       - shell: ./tools/run-compare-xml.sh
 
     publishers:
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
 
 - job:
     name: gate-project-config-irc-access
@@ -21,7 +21,7 @@
           envlist: 'irc'
 
     publishers:
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
 
 - job:
     name: gate-project-config-layout
@@ -34,7 +34,7 @@
           envlist: 'zuul'
 
     publishers:
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
 
 - job:
     name: gate-project-config-jenkins-project
@@ -47,7 +47,7 @@
           envlist: 'jenkins-project'
 
     publishers:
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
 
 # This is a non-standard docs job because it uses SCP instead of FTP
 - job-template:
@@ -66,7 +66,7 @@
             - target: '{target}'
               source: 'doc/build/html/**/*'
               keep-hierarchy: true
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
       # TODO(jhesketh): Add job for uploading built docs
 
 - job:
@@ -80,7 +80,7 @@
 
     publishers:
       - upload-sphinx-draft
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
       # TODO(jhesketh): Add job for uploading built docs
 
 
@@ -95,7 +95,7 @@
           envlist: projects
 
     publishers:
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
 
 - job-template:
     name: 'gate-infra-puppet-apply-{ostype}'
@@ -109,4 +109,4 @@
           ./tools/apply-test.sh
 
     publishers:
-      - zuul_swift_upload_console_log
+      - zuul-swift-upload-console-log
diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml
index e47c2cb0e6..a0a794436c 100644
--- a/jenkins/jobs/macros.yaml
+++ b/jenkins/jobs/macros.yaml
@@ -404,32 +404,32 @@
 
 
 - builder:
-    name: zuul_swift_upload
+    name: zuul-swift-upload
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/zuul_swift_upload.py --name {zuul_log_instruction_set} {upload_source}"
 
 
 - builder:
-    name: zuul_swift_upload_logs
+    name: zuul-swift-upload-logs
     builders:
-      - zuul_swift_upload:
+      - zuul-swift-upload:
          zuul_log_instruction_set: logs
          upload_source: '{upload_source}'
 
 
 - builder:
-    name: zuul_swift_upload_console_log
+    name: zuul-swift-upload-console-log
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/grab_console_log.sh"
-      - zuul_swift_upload_logs:
+      - zuul-swift-upload-logs:
          upload_source: '/tmp/console.html'
 
 
 - builder:
-    name: zuul_swift_upload_logs_with_console
+    name: zuul-swift-upload-logs-with-console
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/grab_console_log.sh"
-      - zuul_swift_upload_logs:
+      - zuul-swift-upload-logs:
          upload_source: '{upload_source} /tmp/console.html'
 
 
@@ -594,11 +594,11 @@
               copy-after-failure: true
 
 - publisher:
-    name: zuul_swift_upload
+    name: zuul-swift-upload
     publishers:
       - postbuildscript:
           builders:
-            - zuul_swift_upload:
+            - zuul-swift-upload:
                 zuul_log_instruction_set: '{zuul_log_instruction_set}'
                 upload_source: '{upload_source}'
           # These flags really mean only if on * when
@@ -608,11 +608,11 @@
           onsuccess: False
 
 - publisher:
-    name: zuul_swift_upload_logs
+    name: zuul-swift-upload-logs
     publishers:
       - postbuildscript:
           builders:
-            - zuul_swift_upload_logs:
+            - zuul-swift-upload-logs:
                 upload_source: '{upload_source}'
           # These flags really mean only if on * when
           # checked. When both set to false the post script
@@ -621,11 +621,11 @@
           onsuccess: False
 
 - publisher:
-    name: zuul_swift_upload_console_log
+    name: zuul-swift-upload-console-log
     publishers:
       - postbuildscript:
           builders:
-            - zuul_swift_upload_console_log
+            - zuul-swift-upload-console-log
           # These flags really mean only if on * when
           # checked. When both set to false the post script
           # should run on every job regardless of status.
@@ -634,11 +634,11 @@
 
 
 - publisher:
-    name: zuul_swift_upload_logs_with_console
+    name: zuul-swift-upload-logs-with-console
     publishers:
       - postbuildscript:
           builders:
-            - zuul_swift_upload_logs_with_console:
+            - zuul-swift-upload-logs-with-console:
                 upload_source: '{upload_source}'
           # These flags really mean only if on * when
           # checked. When both set to false the post script
diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml
index 21166245f9..06160a7efc 100644
--- a/jenkins/jobs/python-jobs.yaml
+++ b/jenkins/jobs/python-jobs.yaml
@@ -42,7 +42,7 @@
       - shell: purposefully_fail_me
 
     publishers:
-      - zuul_swift_upload_logs_with_console:
+      - zuul-swift-upload-logs-with-console:
           upload_source: '.tox/pep8/log'
 
 - job-template: