diff --git a/README.md b/README.md
index 5987c83..3a8ff8a 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 
 Role Variables
 --------------
-Default values for these variables are provided by the role opdk-setup-default-settings.
+Default values for these variables are provided by the role apigee-opdk-setup-default-settings.
 
 URL from which to download the bootstrap scripts
 
@@ -45,14 +45,14 @@
 Dependencies
 ------------
 
-role: opdk-setup-default-settings
+role: apigee-opdk-setup-default-settings
 
 Example Playbook
 ----------------
 
     - hosts: servers
       roles:
-         - { role: opdk-setup-bootstrap }
+         - { role: apigee-opdk-setup-bootstrap }
 
 License
 -------
diff --git a/defaults/main.yml b/defaults/main.yml
index 9629636..02fa9b7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
-# defaults file for opdk-setup-bootstrap
+# defaults file for apigee-opdk-setup-bootstrap
 apigee_repo_url: 'https://{{ apigee_repo_uri }}'
diff --git a/handlers/main.yml b/handlers/main.yml
index 91bb49a..f694863 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
 ---
-# handlers file for opdk-setup-bootstrap
+# handlers file for apigee-opdk-setup-bootstrap
diff --git a/meta/main.yml b/meta/main.yml
index ce28059..1a5c922 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -13,4 +13,4 @@
   - apigee
   - opdk
 dependencies:
-- { role: opdk-setup-default-settings }
\ No newline at end of file
+- { role: apigee-opdk-setup-default-settings }
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index d22ba04..14c32ad 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# tasks file for opdk-setup-bootstrap
+# tasks file for apigee-opdk-setup-bootstrap
 - name: Download bootstrap
   bootstrap:
     dest_dir: '{{ opdk_installer_path }}'
diff --git a/tests/test.yml b/tests/test.yml
index 682056c..dfcd194 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -2,7 +2,7 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - opdk-setup-bootstrap
+    - apigee-opdk-setup-bootstrap
 
 - hosts: '{{ hosts }}'
   vars:
diff --git a/vars/main.yml b/vars/main.yml
index ecf10cd..7fc03b0 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for opdk-setup-bootstrap
+# vars file for apigee-opdk-setup-bootstrap