diff --git a/playbooks/python/tarball-post.yaml b/playbooks/python/tarball-post.yaml
index 8efcc6c6f..3e234f750 100644
--- a/playbooks/python/tarball-post.yaml
+++ b/playbooks/python/tarball-post.yaml
@@ -33,7 +33,7 @@
         data:
           zuul:
             artifacts:
-              - name: "python_sdist"
+              - name: "Python sdist"
                 url: "artifacts/{{ item.path | basename }}"
                 metadata:
                   type: python_sdist
@@ -45,7 +45,7 @@
         data:
           zuul:
             artifacts:
-              - name: "python_wheel"
+              - name: "Python wheel"
                 url: "artifacts/{{ item.path | basename }}"
                 metadata:
                   type: python_wheel
diff --git a/roles/fetch-javascript-content-tarball/tasks/main.yaml b/roles/fetch-javascript-content-tarball/tasks/main.yaml
index 31d84a33a..83f0e395d 100644
--- a/roles/fetch-javascript-content-tarball/tasks/main.yaml
+++ b/roles/fetch-javascript-content-tarball/tasks/main.yaml
@@ -50,7 +50,7 @@
     data:
       zuul:
         artifacts:
-          - name: javascript_content
+          - name: Javascript content archive
             url: "artifacts/{{ item.path | basename }}"
             metadata:
               type: javascript_content
diff --git a/roles/fetch-javascript-output/tasks/main.yaml b/roles/fetch-javascript-output/tasks/main.yaml
index fdab0a692..793f0b10c 100644
--- a/roles/fetch-javascript-output/tasks/main.yaml
+++ b/roles/fetch-javascript-output/tasks/main.yaml
@@ -146,5 +146,5 @@
     data:
       zuul:
         artifacts:
-          - name: "site"
+          - name: "Site preview"
             url: "npm/html/"
diff --git a/roles/fetch-sphinx-tarball/tasks/html.yaml b/roles/fetch-sphinx-tarball/tasks/html.yaml
index 2900bd401..73c2a2759 100644
--- a/roles/fetch-sphinx-tarball/tasks/html.yaml
+++ b/roles/fetch-sphinx-tarball/tasks/html.yaml
@@ -33,11 +33,11 @@
     data:
       zuul:
         artifacts:
-          - name: "docs_archive"
+          - name: "Docs archive"
             url: "docs-html.tar.bz2"
             metadata:
               type: docs_archive
-          - name: "docs_site"
+          - name: "Docs preview site"
             url: "docs/"
             metadata:
               type: docs_site
diff --git a/roles/generate-zuul-manifest/tasks/main.yaml b/roles/generate-zuul-manifest/tasks/main.yaml
index aa440f495..eedcda450 100644
--- a/roles/generate-zuul-manifest/tasks/main.yaml
+++ b/roles/generate-zuul-manifest/tasks/main.yaml
@@ -8,7 +8,7 @@
     data:
       zuul:
         artifacts:
-          - name: Manifest
+          - name: Zuul Manifest
             url: "{{ generate_zuul_manifest_filename }}"
             metadata:
               type: "{{ generate_zuul_manifest_type }}"
diff --git a/roles/push-to-intermediate-registry/tasks/push-image.yaml b/roles/push-to-intermediate-registry/tasks/push-image.yaml
index 33c92d61f..44f76a5ed 100644
--- a/roles/push-to-intermediate-registry/tasks/push-image.yaml
+++ b/roles/push-to-intermediate-registry/tasks/push-image.yaml
@@ -15,7 +15,7 @@
     data:
       zuul:
         artifacts:
-          - name: "image_{{ image.repository }}:{{ image_tag }}"
+          - name: "{{ image.repository }}:{{ image_tag }}"
             url: "docker://{{ intermediate_registry.host | ipwrap }}:{{ intermediate_registry.port }}/{{ image.repository }}:{{ zuul.build }}_{{ image_tag }}"
             metadata:
               type: container_image