diff --git a/defaults/main.yml b/defaults/main.yml
index 0ade808..0a0f222 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-# defaults file for opdk-setup-bootstrap-archive-installer
+# defaults file for apigee-opdk-setup-bootstrap-archive-installer
 apigee_installation_path_prefix: /opt
 apigee_data_path_prefix: '{{ apigee_installation_path_prefix }}'
 apigee_installation_dir: apigee
diff --git a/handlers/main.yml b/handlers/main.yml
index d83129c..586ae68 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
 ---
-# handlers file for opdk-setup-bootstrap-archive-installer
+# handlers file for apigee-opdk-setup-bootstrap-archive-installer
diff --git a/meta/main.yml b/meta/main.yml
index cafea5c..56e9fc6 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -13,6 +13,6 @@
   - apigee
   - opdk
 dependencies:
-- { role: opdk-setup-default-settings }
-- { role: opdk-setup-bootstrap-rollback, remove_data: false }
+- { role: apigee-opdk-setup-default-settings }
+- { role: apigee-opdk-setup-bootstrap-rollback, remove_apigee: false }
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 07ddf5a..7cf7fa8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# tasks file for opdk-setup-bootstrap-archive-installer
+# tasks file for apigee-opdk-setup-bootstrap-archive-installer
 - name: Configure local repository
   shell: "bash {{ archive_folder }}/repos/{{ bootstrap_filename }} apigeeprotocol='file://' apigeerepobasepath={{ archive_folder }}/repos JAVA_FIX=C"
 
diff --git a/tests/test.yml b/tests/test.yml
index 1054bc8..e375a14 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - opdk-setup-bootstrap-archive-installer
\ No newline at end of file
+    - apigee-opdk-setup-bootstrap-archive-installer
\ No newline at end of file
diff --git a/vars/main.yml b/vars/main.yml
index f99c908..8352ceb 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for opdk-setup-bootstrap-archive-installer
+# vars file for apigee-opdk-setup-bootstrap-archive-installer