diff --git a/defaults/main.yml b/defaults/main.yml
index 24a2672..16c8913 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
-# defaults file for opdk-baas-onboarding
+# defaults file for apigee-opdk-baas-onboarding
 endpoint: http://127.0.0.1:8080
diff --git a/handlers/main.yml b/handlers/main.yml
index 08ef17c..61b3a35 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
 ---
-# handlers file for opdk-baas-onboarding
+# handlers file for apigee-opdk-baas-onboarding
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 7b0eec5..6a58815 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# tasks file for opdk-baas-onboarding
+# tasks file for apigee-opdk-baas-onboarding
 #- name: Create Baas org and user
 #  expect:
 #    command: 'python {{ apigee_installation_home }}/baas-usergrid/bin/create_org_and_user.py -o {{ org_name }} -a {{ baas_admin_name }} -p {{ baas_admin_pass }}'
diff --git a/tests/test.yml b/tests/test.yml
index 2fbea06..00ac992 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - opdk-baas-onboarding
\ No newline at end of file
+    - apigee-opdk-baas-onboarding
\ No newline at end of file
diff --git a/vars/main.yml b/vars/main.yml
index fe2a7cc..da5a996 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for opdk-baas-onboarding
+# vars file for apigee-opdk-baas-onboarding