diff --git a/defaults/main.yml b/defaults/main.yml
index 2832c0c..bf257f1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
-# defaults file for opdk-setup-status
+# defaults file for apigee-opdk-setup-status
 all_status: "{{ apigee_installation_home }}/bin/all-status.sh"
diff --git a/handlers/main.yml b/handlers/main.yml
index b019850..2b95a23 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
 ---
-# handlers file for opdk-setup-status
+# handlers file for apigee-opdk-setup-status
diff --git a/meta/main.yml b/meta/main.yml
index 1fbc8a3..e9668c2 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -13,4 +13,4 @@
   - 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 011ac8a..36bbd05 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# tasks file for opdk-setup-status
+# tasks file for apigee-opdk-setup-status
 
 - name: Collect All Status
   shell: "{{ all_status }}"
diff --git a/tests/test.yml b/tests/test.yml
index cac7b60..b01f65b 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - opdk-setup-status
\ No newline at end of file
+    - apigee-opdk-setup-status
\ No newline at end of file
diff --git a/vars/main.yml b/vars/main.yml
index 8862e2d..a1cb8e0 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for opdk-setup-status
+# vars file for apigee-opdk-setup-status