diff --git a/README.md b/README.md
index bf5afcf..f27a96f 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,10 @@
 Role Variables
 --------------
 
-The `remove_components` collection is used to list those components that should be
+The `remove_qpid_upgrade_components` collection is used to list those components that should be
 removed prior to updating the system packages. The default list includes: 
 
-    remove_components:
+    remove_qpid_upgrade_components:
     - qpid-cpp-server
     - qpid-cpp-server-linearstore
     - qpid-tools
@@ -23,10 +23,10 @@
     - qpid-cpp-client
     - qpid-proton-c
 
-The `install_components` collection is used to list those component that should be
+The `install_qpid_upgrade_components` collection is used to list those component that should be
 updated at the system. The default list includes: 
 
-    install_components:
+    install_qpid_upgrade_components:
     - yum-plugin-priorities
     - apigee-qpidd
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 4bc2332..ec7826a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # defaults file for apigee-opdk-update-component-qpidd
-remove_components:
+remove_qpid_upgrade_components:
 - qpid-cpp-server
 - qpid-cpp-server-linearstore
 - qpid-tools
@@ -9,6 +9,6 @@
 - qpid-cpp-client
 - qpid-proton-c
 
-install_components:
+install_qpid_upgrade_components:
 - yum-plugin-priorities
 - apigee-qpidd
diff --git a/tasks/main.yml b/tasks/main.yml
index fa84eca..a5b0ba8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,11 +6,11 @@
   yum:
     name: "{{ item }}"
     state: absent
-  with_items: "{{ remove_components }}"
+  with_items: "{{ remove_qpid_upgrade_components }}"
 
 - name: Work around install for Qpid upgrade
   become: true
   yum:
     name: "{{ item }}"
     state: present
-  with_items: "{{ install_components }}"
+  with_items: "{{ install_qpid_upgrade_components }}"