diff --git a/README.md b/README.md
index a91304c..0cc532b 100644
--- a/README.md
+++ b/README.md
@@ -13,21 +13,21 @@
 Role Variables
 --------------
 
-Default values for variables are provided by the role opdk-setup-default-settings.
+Default values for variables are provided by the role apigee-opdk-setup-default-settings.
 
 Dependencies
 ------------
 
 This role depends on the following roles:
 
-* opdk-setup-default-settings
+* apigee-opdk-setup-default-settings
 
 Example Playbook
 ----------------
 
     - hosts: servers
       roles:
-         - { role: opdk-setup-validate-cleanup }
+         - { role: apigee-opdk-setup-validate-cleanup }
 
 License
 -------
diff --git a/defaults/main.yml b/defaults/main.yml
index db2b9fb..c987ffa 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-# defaults file for opdk-setup-validate
+# defaults file for apigee-opdk-setup-validate
diff --git a/handlers/main.yml b/handlers/main.yml
index 8d08386..2d68d42 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
 ---
-# handlers file for opdk-setup-validate-cleanup
+# handlers file for apigee-opdk-setup-validate-cleanup
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 48c6132..fa8388a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# tasks file for opdk-setup-validate-cleanup
+# tasks file for apigee-opdk-setup-validate-cleanup
 
 - name: Validate OPDK Installation for version {{ opdk_version }}
   ignore_errors: yes
diff --git a/tests/test.yml b/tests/test.yml
index 0873c01..c92831a 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - opdk-setup-validate-cleanup
\ No newline at end of file
+    - apigee-opdk-setup-validate-cleanup
\ No newline at end of file
diff --git a/vars/main.yml b/vars/main.yml
index 944bba4..016be1e 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for opdk-setup-validate-cleanup
+# vars file for apigee-opdk-setup-validate-cleanup