diff --git a/roles/enable-fips/tasks/main.yaml b/roles/enable-fips/tasks/main.yaml
index f430b0123..05525283b 100644
--- a/roles/enable-fips/tasks/main.yaml
+++ b/roles/enable-fips/tasks/main.yaml
@@ -17,7 +17,7 @@
   become: true
   command: fips-mode-setup --enable
 
-- name: check if GRUB_CMDLINE_LINUX_DEFAULT exists in /etc/default/grub
+- name: Check if GRUB_CMDLINE_LINUX_DEFAULT exists in /etc/default/grub
   become: true
   shell: |
     set -o pipefail
@@ -25,7 +25,7 @@
   register: test_grep
   failed_when: false
 
-- name: add GRUB_CMDLINE_LINUX_DEFAULT in /etc/default/grub
+- name: Add GRUB_CMDLINE_LINUX_DEFAULT in /etc/default/grub
   become: true
   lineinfile:
     path: /etc/default/grub
diff --git a/roles/ensure-virtualenv/tasks/Debian.yaml b/roles/ensure-virtualenv/tasks/Debian.yaml
index 95c728bf6..a3c2badea 100644
--- a/roles/ensure-virtualenv/tasks/Debian.yaml
+++ b/roles/ensure-virtualenv/tasks/Debian.yaml
@@ -4,7 +4,7 @@
 # creates, and thus the xenial packaged virtualenv can not create a
 # working environment.  We pre-run ensure-pip there to bring in our
 # backported pip9 and make this work.
-- name: ensure-pip for Xenial
+- name: Use ensure-pip for Xenial
   include_role:
     name: ensure-pip
   when: ansible_distribution_release == 'xenial'
diff --git a/roles/multi-node-known-hosts/tasks/main.yaml b/roles/multi-node-known-hosts/tasks/main.yaml
index 4f7b7cf8b..83f6dfafd 100644
--- a/roles/multi-node-known-hosts/tasks/main.yaml
+++ b/roles/multi-node-known-hosts/tasks/main.yaml
@@ -2,7 +2,7 @@
   generate_all_known_hosts:
     hostvars: "{{ hostvars }}"
 
-- name: add default known_host record for every user
+- name: Add default known_host record for every user
   become: true
   known_hosts:
     name: "{{ zj_known_host.name }}"
diff --git a/roles/post-reboot-tasks/tasks/main.yaml b/roles/post-reboot-tasks/tasks/main.yaml
index cd0868ef0..f15eb7863 100644
--- a/roles/post-reboot-tasks/tasks/main.yaml
+++ b/roles/post-reboot-tasks/tasks/main.yaml
@@ -1,10 +1,10 @@
 ---
-- name: check if node is available for ssh
+- name: Check if node is available for ssh
   wait_for_connection:
 
 - name: Run start-zuul-console role
   include_role:
     name: start-zuul-console
 
-- name: confirm that dns is up
+- name: Confirm that dns is up
   command: "nslookup -retry=60 {{ nslookup_target }}"
diff --git a/roles/upload-logs-s3/tasks/main.yaml b/roles/upload-logs-s3/tasks/main.yaml
index ee86c2dba..a6ed7dcb8 100644
--- a/roles/upload-logs-s3/tasks/main.yaml
+++ b/roles/upload-logs-s3/tasks/main.yaml
@@ -10,7 +10,7 @@
   block:
     # Use chmod instead of file because ansible 2.5 file with recurse and
     # follow can't really handle symlinks to .
-    - name: debug var
+    - name: Debug log_root
       debug:
         msg: "log_root {{ zuul.executor.log_root }}"
 
diff --git a/roles/upload-logs/tasks/main.yaml b/roles/upload-logs/tasks/main.yaml
index b54f23216..a652e5582 100644
--- a/roles/upload-logs/tasks/main.yaml
+++ b/roles/upload-logs/tasks/main.yaml
@@ -36,7 +36,7 @@
       no_log: "{{ not zuul_log_verbose }}"
 
     # After this point there are no more logs
-    - name: gzip console log and json output
+    - name: Compress console log and json output
       delegate_to: localhost
       archive:
         path: "{{ zuul.executor.log_root }}/{{ zj_log }}"
diff --git a/roles/validate-host/tasks/main.yaml b/roles/validate-host/tasks/main.yaml
index b56308264..f921ed28a 100644
--- a/roles/validate-host/tasks/main.yaml
+++ b/roles/validate-host/tasks/main.yaml
@@ -25,7 +25,7 @@
     src: templates/host-info.j2
     mode: 0644
 
-- name: zuul_debug_info block
+- name: Run zuul_debug_info and collect output
   block:
     - name: Collect information about zuul worker
       zuul_debug_info: