diff --git a/roles/xovis/tasks/main.yml b/roles/xovis/tasks/main.yml
index e200239c0..c7b0bcf14 100644
--- a/roles/xovis/tasks/main.yml
+++ b/roles/xovis/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Install Couchdb and other necessary packages
+- name: Install CouchDB and other necessary packages
   package: name={{ item }}
            state=present
   with_items:
@@ -45,13 +45,13 @@
 - name: Allow access to Couchdb from other hosts
   command: sed -i 's/^\(bind_address\s*=\s*\).*$/\10\.0\.0\.0/' /etc/couchdb/default.ini
 
-- name: Enable Couchdb service
+- name: Enable CouchDB service
   service: name=couchdb
            enabled=yes
            state=started
   when: xovis_enabled
 
-- name: Wait for couchdb to become ready
+- name: Wait for CouchDB to become ready
   wait_for: port=5984
             delay=1
             timeout=5
@@ -66,7 +66,7 @@
   register: found_db
   ignore_errors: yes
 
-- name: Create Couchdb database if does not already exist
+- name: Create CouchDB database if does not already exist
   command: kanso createdb {{ xovis_db_url }}
   when: xovis_enabled and found_db.stdout != xovis_db_name
 
@@ -81,7 +81,7 @@
   --server http://{{ xovis_db_login }}@{{ xovis_target_host }}"
   when: xovis_enabled
 
-- name: Add xovis to service list
+- name: Add 'xovis' variable values to {{ iiab_ini_file }}
   ini_file: dest='{{ iiab_ini_file }}'
             section=xovis
             option='{{ item.option }}'