diff --git a/defaults/main.yml b/defaults/main.yml
index 3ddb0c4..cc8aa78 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-# defaults file for opdk-setup-bootstrap-rollback
+# defaults file for apigee-opdk-setup-bootstrap-rollback
diff --git a/handlers/main.yml b/handlers/main.yml
index dd3dc7a..e6ac070 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
 ---
-# handlers file for opdk-setup-bootstrap-rollback
+# handlers file for apigee-opdk-setup-bootstrap-rollback
diff --git a/meta/main.yml b/meta/main.yml
index f27c50b..f840052 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -13,5 +13,5 @@
   - apigee
   - opdk
 dependencies:
-- { role: opdk-setup-default-settings }
+- { role: apigee-opdk-setup-default-settings }
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 07416b0..2112671 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# tasks file for opdk-setup-bootstrap-rollback
+# tasks file for apigee-opdk-setup-bootstrap-rollback
 - name: Gracefully Stop apigee components, if possible
   ignore_errors: yes
   shell: '{{ apigee_all }} stop'
@@ -44,16 +44,19 @@
   - '{{ bootstrap_script }}'
   - '{{ linked_apigee_installation_home }}'
   - /opt/nginx/conf.d
+  - '{{ opdk_installation_config_file }}'
+  - '{{ apigee_validate_config_file }}'
+  - '{{ onboarding_config_file_path }}'
 
-- name: Remove analytics data on rolback
+- name: Remove /opt/apigee on rolback
   ignore_errors: yes
   file:
     path: '{{ item }}'
     state: absent
     follow: yes
   with_items:
-  - '{{ apigee_installation_home }}/data'
-  when: remove_data is defined and remove_data
+  - '{{ apigee_installation_home }}'
+  when: remove_apigee is defined and remove_apigee
 
 - name: Determine current user
   shell: whoami
@@ -62,7 +65,7 @@
 - name: Determine if safe to kill user owned process
   set_fact:
     kill_user: '{{ whoami.stdout != opdk_user_name }}'
-  when: remove_data is defined and remove_data
+  when: remove_apigee is defined and remove_apigee
 
 - name: Release any apigee user owned processes
   become: yes
@@ -71,7 +74,7 @@
   when: kill_user
   async: 45
   poll: 0
-  when: remove_data is defined and remove_data
+  when: remove_apigee is defined and remove_apigee
 
 - name: Remove apigee user
   become: yes
@@ -82,7 +85,7 @@
     state: absent
   async: 45
   poll: 0
-  when: remove_data is defined and remove_data
+  when: remove_apigee is defined and remove_apigee
 
 - name: Remove the apigee group
   become: yes
@@ -92,4 +95,4 @@
     state: absent
   async: 45
   poll: 0
-  when: remove_data is defined and remove_data
+  when: remove_apigee is defined and remove_apigee
diff --git a/tests/test.yml b/tests/test.yml
index 386dbc5..08ccfb3 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - opdk-setup-bootstrap-rollback
\ No newline at end of file
+    - apigee-opdk-setup-bootstrap-rollback
\ No newline at end of file
diff --git a/vars/main.yml b/vars/main.yml
index 81e29b8..1c7b8fe 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for opdk-setup-bootstrap-rollback
+# vars file for apigee-opdk-setup-bootstrap-rollback