diff --git a/roles/1-prep/tasks/computed_vars.yml b/roles/1-prep/tasks/computed_vars.yml
index 964f0b723..ae53e7970 100644
--- a/roles/1-prep/tasks/computed_vars.yml
+++ b/roles/1-prep/tasks/computed_vars.yml
@@ -9,7 +9,7 @@
      xo_model: '{{ ansible_local["local_facts"]["xo_model"] }}'
      phplib_dir: '{{ ansible_local["local_facts"]["phplib_dir"] }}'
 
-- name: Set exFAT enabled for XOs
+- name: Set exFAT enabled for XO laptops
   set_fact:
      exFAT_enabled: True
   when: xo_model != "none"
@@ -88,7 +88,7 @@
     gui_port: 443
   when: adm_cons_force_ssl
 
-- name: Turn on mysql if elgg or rachel enabled
+- name: Require MySQL to be on
   set_fact:
     mysql_install: True
     mysql_enabled: True
@@ -104,13 +104,13 @@
 #   when: sugarizer_enabled
 
 # There might be other db's
-- name: Turn on postgresql if moodle or pathagar enabled
+- name: Turn on PostgreSQL if Moodle or Pathagar enabled
   set_fact:
     postgresql_install: True
     postgresql_enabled: True
   when: moodle_enabled or pathagar_enabled
 
-- name: Turn on docker if schooltool is to be installed
+- name: Turn on Docker if SchoolTool is to be installed
   set_fact:
     docker_install: True
     docker_enabled: True
@@ -130,18 +130,18 @@
 # but 'mariadb', which is its real name can
 # on fedora 18 we need to use 'mysqld'
 
-- name: Set mysqld service name to mariadb by default
+- name: Set mysqld_service to mariadb by default
   set_fact:
     mysql_service: mariadb
 
-- name: Set mysqld service name to mysqld for fedora 18
+- name: Set mysqld_service to mysqld for Fedora 18
   set_fact:
     mysql_service: mysqld
     no_NM_reload: True
     is_F18: True
   when: ansible_distribution_release == "based on Fedora 18" or ansible_distribution_version == "18"
 
-- name: Set mysql service name to mysql for debian
+- name: Set mysql_service to mysql for Debian
   set_fact:
     mysql_service: mysql
   when: is_debuntu