diff --git a/apigee_mirror/components/opdk-create-download-apigee-mirror.yml b/apigee_mirror/components/opdk-create-download-apigee-mirror.yml
index 7c3f3f0..0844a2d 100644
--- a/apigee_mirror/components/opdk-create-download-apigee-mirror.yml
+++ b/apigee_mirror/components/opdk-create-download-apigee-mirror.yml
@@ -3,7 +3,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-apigee-user
+  - apigee-opdk-setup-apigee-user
   tags:
   - user
 
@@ -11,13 +11,13 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-os-limits
+  - apigee-opdk-setup-os-limits
   tags:
   - os
 
 - hosts: '{{ hosts }}'
   roles:
-  - opdk-setup-openjdk
+  - apigee-opdk-setup-openjdk
   tags:
   - openjdk
 
@@ -25,7 +25,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-bootstrap
+  - apigee-opdk-setup-bootstrap
   tags:
   - bootstrap
 
@@ -33,8 +33,8 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-silent-installation-config
-  - opdk-setup-component-installer
+  - apigee-opdk-setup-silent-installation-config
+  - apigee-opdk-setup-component-installer
   tags:
   - installer
 
@@ -42,7 +42,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-bootstrap-create-archive
+  - apigee-opdk-setup-bootstrap-create-archive
   tags:
   - create
 
@@ -50,7 +50,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-bootstrap-download-archive
+  - apigee-opdk-setup-bootstrap-download-archive
   tags:
   - download
 
diff --git a/apigee_mirror/components/opdk-upload-install-apigee-mirror.yml b/apigee_mirror/components/opdk-upload-install-apigee-mirror.yml
index a177fd1..8f94c4f 100644
--- a/apigee_mirror/components/opdk-upload-install-apigee-mirror.yml
+++ b/apigee_mirror/components/opdk-upload-install-apigee-mirror.yml
@@ -4,7 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-bootstrap-upload-archive
+  - apigee-opdk-setup-bootstrap-upload-archive
   tags:
   - upload
 
@@ -12,6 +12,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-bootstrap-archive-installer
+  - apigee-opdk-setup-bootstrap-archive-installer
   tags:
   - install
diff --git a/apigee_mirror/configuration/opdk-setup-os.yml b/apigee_mirror/configuration/opdk-setup-os.yml
index 5b148a7..093b6e5 100644
--- a/apigee_mirror/configuration/opdk-setup-os.yml
+++ b/apigee_mirror/configuration/opdk-setup-os.yml
@@ -7,9 +7,9 @@
   - name: Load credentials from encrypted file
     include_vars: '~/.apigee/credentials.yml'
   roles:
-  - opdk-setup-os-minimum
-  - opdk-setup-selinux-disable
-  - opdk-shutdown-iptables
-  - opdk-time-sync
-  - opdk-setup-os-common
+  - apigee-opdk-setup-os-minimum
+  - apigee-opdk-setup-selinux-disable
+  - apigee-opdk-shutdown-iptables
+  - apigee-opdk-time-sync
+  - apigee-opdk-setup-os-common
 
diff --git a/apigee_mirror/requirements.yml b/apigee_mirror/requirements.yml
index 945f343..6d819cf 100644
--- a/apigee_mirror/requirements.yml
+++ b/apigee_mirror/requirements.yml
@@ -1,60 +1,60 @@
 ---
 - src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: opdk-setup-default-settings
+  name: apigee-opdk-setup-default-settings
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-create-archive
-  name: opdk-setup-bootstrap-create-archive
+  name: apigee-opdk-setup-bootstrap-create-archive
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
-  name: opdk-setup-os-minimum
+  name: apigee-opdk-setup-os-minimum
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: opdk-setup-default-settings
+  name: apigee-opdk-setup-default-settings
 
 - src: https://github.com/carlosfrias/apigee-opdk-time-sync
-  name: opdk-time-sync
+  name: apigee-opdk-time-sync
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
-  name: opdk-setup-os-common
+  name: apigee-opdk-setup-os-common
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
-  name: opdk-setup-apigee-user
+  name: apigee-opdk-setup-apigee-user
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
-  name: opdk-setup-os-limits
+  name: apigee-opdk-setup-os-limits
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
-  name: opdk-setup-selinux-disable
+  name: apigee-opdk-setup-selinux-disable
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
-  name: opdk-setup-openjdk
+  name: apigee-opdk-setup-openjdk
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
-  name: opdk-setup-bootstrap
+  name: apigee-opdk-setup-bootstrap
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
-  name: opdk-setup-bootstrap-rollback
+  name: apigee-opdk-setup-bootstrap-rollback
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-upload-archive
-  name: opdk-setup-bootstrap-upload-archive
+  name: apigee-opdk-setup-bootstrap-upload-archive
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-archive-installer
-  name: opdk-setup-bootstrap-archive-installer
+  name: apigee-opdk-setup-bootstrap-archive-installer
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-upload-archive
-  name: opdk-setup-bootstrap-archive-installer
+  name: apigee-opdk-setup-bootstrap-archive-installer
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-archive-installer
-  name: opdk-setup-bootstrap-archive-installer
+  name: apigee-opdk-setup-bootstrap-archive-installer
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
-  name: opdk-setup-silent-installation-config
+  name: apigee-opdk-setup-silent-installation-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
-  name: opdk-setup-component-installer
+  name: apigee-opdk-setup-component-installer
 
 - src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
-  name: opdk-shutdown-iptables
+  name: apigee-opdk-shutdown-iptables
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-download-archive
-  name: opdk-setup-bootstrap-download-archive
+  name: apigee-opdk-setup-bootstrap-download-archive
diff --git a/backups/components/opdk-backup.yml b/backups/components/opdk-backup.yml
index 512d7e9..fd4fd07 100644
--- a/backups/components/opdk-backup.yml
+++ b/backups/components/opdk-backup.yml
@@ -2,7 +2,7 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-default-settings
-  - { role: opdk-backup, component_profile: '{{ profile }}' }
+  - apigee-opdk-setup-default-settings
+  - { role: apigee-opdk-backup, component_profile: '{{ profile }}' }
 
 
diff --git a/backups/requirements.yml b/backups/requirements.yml
index 1d90759..e5c628a 100644
--- a/backups/requirements.yml
+++ b/backups/requirements.yml
@@ -1,6 +1,6 @@
 ---
 - src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: opdk-setup-default-settings
+  name: apigee-opdk-setup-default-settings
 
 - src: https://github.com/carlosfrias/apigee-opdk-backup
-  name: opdk-backup
+  name: apigee-opdk-backup
diff --git a/environments/aws/aws_create.yml b/environments/aws/aws_create.yml
index b4b5f5a..42dbb89 100644
--- a/environments/aws/aws_create.yml
+++ b/environments/aws/aws_create.yml
@@ -17,4 +17,4 @@
     include_vars: "profiles/{{ provision_profile }}.yml"
 
   roles:
-  - aws-create
+  - apigee-opdk-aws-create
diff --git a/environments/aws/aws_terminate.yml b/environments/aws/aws_terminate.yml
index 54167e2..9f3d7dc 100644
--- a/environments/aws/aws_terminate.yml
+++ b/environments/aws/aws_terminate.yml
@@ -16,6 +16,6 @@
   - ec2_facts:
 
   roles:
-  - aws-terminate
+  - apigee-opdk-aws-terminate
 
 
diff --git a/environments/aws/requirements.yml b/environments/aws/requirements.yml
index 5f7e116..e8c44e8 100644
--- a/environments/aws/requirements.yml
+++ b/environments/aws/requirements.yml
@@ -1,7 +1,5 @@
 ---
 - src: https://github.com/carlosfrias/apigee-opdk-aws-create
-  name: aws-create
 
 - src: https://github.com/carlosfrias/apigee-opdk-aws-terminate
-  name: aws-terminate
 
diff --git a/installations/aio/components/opdk-install-component.yml b/installations/aio/components/opdk-install-component.yml
index 84087b3..6dbd1ec 100644
--- a/installations/aio/components/opdk-install-component.yml
+++ b/installations/aio/components/opdk-install-component.yml
@@ -4,7 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-apigee-user
+  - apigee-opdk-setup-apigee-user
   tags:
   - user
 
@@ -13,14 +13,14 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-os-limits
+  - apigee-opdk-setup-os-limits
   tags:
   - os
 
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-openjdk
+  - apigee-opdk-setup-openjdk
   tags:
   - openjdk
 
@@ -29,7 +29,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-bootstrap
+  - apigee-opdk-setup-bootstrap
   tags:
   - bootstrap
 
@@ -38,15 +38,15 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-silent-installation-config
-  - opdk-setup-component-installer
+  - apigee-opdk-setup-silent-installation-config
+  - apigee-opdk-setup-component-installer
   tags:
   - installer
 
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - { role: opdk-setup-component, profile: '{{ component_profile }}' }
+  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   tags:
   - component
 
diff --git a/installations/aio/configuration/opdk-setup-org-config.yml b/installations/aio/configuration/opdk-setup-org-config.yml
index 709cf2d..d24ed2e 100644
--- a/installations/aio/configuration/opdk-setup-org-config.yml
+++ b/installations/aio/configuration/opdk-setup-org-config.yml
@@ -2,5 +2,5 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-org-config
+  - apigee-opdk-setup-org-config
 
diff --git a/installations/aio/configuration/opdk-setup-org.yml b/installations/aio/configuration/opdk-setup-org.yml
index 90453ac..e3911bf 100644
--- a/installations/aio/configuration/opdk-setup-org.yml
+++ b/installations/aio/configuration/opdk-setup-org.yml
@@ -2,4 +2,4 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-org
+  - apigee-opdk-setup-org
diff --git a/installations/aio/configuration/opdk-setup-os.yml b/installations/aio/configuration/opdk-setup-os.yml
index 2160cc6..4706ab1 100644
--- a/installations/aio/configuration/opdk-setup-os.yml
+++ b/installations/aio/configuration/opdk-setup-os.yml
@@ -7,10 +7,10 @@
   - name: Load credentials from encrypted file
     include_vars: '~/.apigee/credentials.yml'
   roles:
-  - opdk-setup-os-minimum
-  - opdk-enable-swap
-  - opdk-setup-selinux-disable
-  - opdk-shutdown-iptables
-  - opdk-time-sync
-  - opdk-setup-os-common
+  - apigee-opdk-setup-os-minimum
+  - apigee-opdk-enable-swap
+  - apigee-opdk-setup-selinux-disable
+  - apigee-opdk-shutdown-iptables
+  - apigee-opdk-time-sync
+  - apigee-opdk-setup-os-common
 
diff --git a/installations/aio/installation-rollback.yml b/installations/aio/installation-rollback.yml
index 7e29dc9..e367310 100644
--- a/installations/aio/installation-rollback.yml
+++ b/installations/aio/installation-rollback.yml
@@ -1,4 +1,4 @@
 ---
 - hosts: planet
   roles:
-  - { role: opdk-setup-bootstrap-rollback, remove_data: true }
+  - { role: apigee-opdk-setup-bootstrap-rollback, remove_apigee: true }
diff --git a/installations/aio/requirements.yml b/installations/aio/requirements.yml
index 16566dc..f4a48d3 100644
--- a/installations/aio/requirements.yml
+++ b/installations/aio/requirements.yml
@@ -1,81 +1,81 @@
 ---
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
-  name: opdk-setup-apigee-user
+  name: apigee-opdk-setup-apigee-user
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
-  name: opdk-setup-os-common
+  name: apigee-opdk-setup-os-common
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-ds
-  name: opdk-setup-os-ds
+  name: apigee-opdk-setup-os-ds
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
-  name: opdk-setup-os-minimum
+  name: apigee-opdk-setup-os-minimum
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: opdk-setup-default-settings
+  name: apigee-opdk-setup-default-settings
 
 - src: https://github.com/carlosfrias/apigee-opdk-time-sync
-  name: opdk-time-sync
+  name: apigee-opdk-time-sync
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
-  name: opdk-setup-openjdk
+  name: apigee-opdk-setup-openjdk
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
-  name: opdk-setup-os-limits
+  name: apigee-opdk-setup-os-limits
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
-  name: opdk-setup-bootstrap
+  name: apigee-opdk-setup-bootstrap
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
-  name: opdk-setup-silent-installation-config
+  name: apigee-opdk-setup-silent-installation-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component
-  name: opdk-setup-component
+  name: apigee-opdk-setup-component
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
-  name: opdk-setup-component-installer
+  name: apigee-opdk-setup-component-installer
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
-  name: opdk-setup-selinux-disable
+  name: apigee-opdk-setup-selinux-disable
 
 - src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
-  name: opdk-shutdown-iptables
+  name: apigee-opdk-shutdown-iptables
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-org-config
-  name: opdk-setup-org-config
+  name: apigee-opdk-setup-org-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-org
-  name: opdk-setup-org
+  name: apigee-opdk-setup-org
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-validate
-  name: opdk-setup-validate
+  name: apigee-opdk-setup-validate
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup
-  name: opdk-setup-validate-cleanup
+  name: apigee-opdk-setup-validate-cleanup
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files
-  name: opdk-setup-apigee-log-files
+  name: apigee-opdk-setup-apigee-log-files
 
 - src: https://github.com/carlosfrias/apigee-fetch-files
   name: fetch-files
 
 - src: https://github.com/carlosfrias/apigee-opdk-enable-swap
-  name: opdk-enable-swap
+  name: apigee-opdk-enable-swap
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
-  name: opdk-setup-postgres-config
+  name: apigee-opdk-setup-postgres-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-master
-  name: opdk-setup-postgres-master
+  name: apigee-opdk-setup-postgres-master
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-standby
-  name: opdk-setup-postgres-standby
+  name: apigee-opdk-setup-postgres-standby
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-postgres
-  name: opdk-setup-os-postgres
+  name: apigee-opdk-setup-os-postgres
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-status
-  name: opdk-setup-status
+  name: apigee-opdk-setup-status
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
-  name: opdk-setup-bootstrap-rollback
+  name: apigee-opdk-setup-bootstrap-rollback
diff --git a/installations/aio/validations/opdk-server-self.yml b/installations/aio/validations/opdk-server-self.yml
index 76670ed..c95adcf 100644
--- a/installations/aio/validations/opdk-server-self.yml
+++ b/installations/aio/validations/opdk-server-self.yml
@@ -2,7 +2,7 @@
 - hosts: rmp
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain router server self report
     ignore_errors: yes
@@ -25,7 +25,7 @@
 - hosts: pg
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain postgres server self report
     ignore_errors: yes
@@ -40,7 +40,7 @@
 - hosts: qpid
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain qpid server self report
     ignore_errors: yes
@@ -55,7 +55,7 @@
 - hosts: ms
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain management server self report
     ignore_errors: yes
diff --git a/installations/aio/validations/opdk-setup-log-files.yml b/installations/aio/validations/opdk-setup-log-files.yml
index d5d8a6c..9b6d002 100644
--- a/installations/aio/validations/opdk-setup-log-files.yml
+++ b/installations/aio/validations/opdk-setup-log-files.yml
@@ -2,7 +2,7 @@
 - hosts: planet
   strategy: free
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   - { role: fetch-files, fetch_files: '{{ apigee_log_files }}' }
   tags:
   - logs
@@ -12,7 +12,7 @@
   become: true
   strategy: free
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   - { role: fetch-files, fetch_files: '{{ system_config_files }}' }
   tags:
   - logs
@@ -21,7 +21,7 @@
 - hosts: planet
   strategy: free
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   - { role: fetch-files, fetch_files: '{{ apigee_config_files }}' }
   tags:
   - logs
diff --git a/installations/aio/validations/opdk-setup-status.yml b/installations/aio/validations/opdk-setup-status.yml
index 7d2745d..a5dff3e 100644
--- a/installations/aio/validations/opdk-setup-status.yml
+++ b/installations/aio/validations/opdk-setup-status.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
   roles:
-  - opdk-setup-status
+  - apigee-opdk-setup-status
   tags:
   - status
diff --git a/installations/aio/validations/opdk-setup-validate.yml b/installations/aio/validations/opdk-setup-validate.yml
index e5c8d59..eb94d55 100644
--- a/installations/aio/validations/opdk-setup-validate.yml
+++ b/installations/aio/validations/opdk-setup-validate.yml
@@ -2,15 +2,15 @@
 - hosts: rmp
   serial: 1
   roles:
-  - opdk-setup-default-settings
-  - opdk-setup-validate
+  - apigee-opdk-setup-default-settings
+  - apigee-opdk-setup-validate
   tags:
   - validate
 
 - hosts: rmp
   serial: 1
   roles:
-  - opdk-setup-validate-cleanup
+  - apigee-opdk-setup-validate-cleanup
   tags:
   - validate
   - validate-cleanup
diff --git a/installations/baas/components/opdk-install-component.yml b/installations/baas/components/opdk-install-component.yml
index 6e9a51a..a8c0889 100644
--- a/installations/baas/components/opdk-install-component.yml
+++ b/installations/baas/components/opdk-install-component.yml
@@ -4,7 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-apigee-user
+  - apigee-opdk-setup-apigee-user
   tags:
   - user
 
@@ -13,14 +13,14 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-os-limits
+  - apigee-opdk-setup-os-limits
   tags:
   - os
 
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-openjdk
+  - apigee-opdk-setup-openjdk
   tags:
   - openjdk
 
@@ -29,7 +29,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-bootstrap
+  - apigee-opdk-setup-bootstrap
   tags:
   - bootstrap
 
@@ -38,14 +38,14 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-silent-installation-config
-  - opdk-setup-component-installer
+  - apigee-opdk-setup-silent-installation-config
+  - apigee-opdk-setup-component-installer
   tags:
   - installer
 
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - { role: opdk-setup-component, profile: '{{ component_profile }}' }
+  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   tags:
   - component
diff --git a/installations/baas/configuration/opdk-baas-create-org-user.yml b/installations/baas/configuration/opdk-baas-create-org-user.yml
index 54a6602..ff847b7 100644
--- a/installations/baas/configuration/opdk-baas-create-org-user.yml
+++ b/installations/baas/configuration/opdk-baas-create-org-user.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
   roles:
-  - opdk-baas-create-org-and-user
+  - apigee-opdk-baas-create-org-and-user
   tags:
   - org
\ No newline at end of file
diff --git a/installations/baas/configuration/opdk-setup-os.yml b/installations/baas/configuration/opdk-setup-os.yml
index 5b148a7..093b6e5 100644
--- a/installations/baas/configuration/opdk-setup-os.yml
+++ b/installations/baas/configuration/opdk-setup-os.yml
@@ -7,9 +7,9 @@
   - name: Load credentials from encrypted file
     include_vars: '~/.apigee/credentials.yml'
   roles:
-  - opdk-setup-os-minimum
-  - opdk-setup-selinux-disable
-  - opdk-shutdown-iptables
-  - opdk-time-sync
-  - opdk-setup-os-common
+  - apigee-opdk-setup-os-minimum
+  - apigee-opdk-setup-selinux-disable
+  - apigee-opdk-shutdown-iptables
+  - apigee-opdk-time-sync
+  - apigee-opdk-setup-os-common
 
diff --git a/installations/baas/installation-rollback.yml b/installations/baas/installation-rollback.yml
index 4fe5413..ba8e4d8 100644
--- a/installations/baas/installation-rollback.yml
+++ b/installations/baas/installation-rollback.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
   vars:
-    remove_data_on_rollback: true
+    remove_apigee: true
   roles:
-  - opdk-setup-bootstrap-rollback
+  - apigee-opdk-setup-bootstrap-rollback
diff --git a/installations/baas/requirements.yml b/installations/baas/requirements.yml
index 70b394d..0c22fbb 100644
--- a/installations/baas/requirements.yml
+++ b/installations/baas/requirements.yml
@@ -1,78 +1,78 @@
 ---
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
-  name: opdk-setup-apigee-user
+  name: apigee-opdk-setup-apigee-user
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
-  name: opdk-setup-os-common
+  name: apigee-opdk-setup-os-common
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
-  name: opdk-setup-os-limits
+  name: apigee-opdk-setup-os-limits
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
-  name: opdk-setup-os-minimum
+  name: apigee-opdk-setup-os-minimum
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: opdk-setup-default-settings
+  name: apigee-opdk-setup-default-settings
 
 - src: https://github.com/carlosfrias/apigee-opdk-time-sync
-  name: opdk-time-sync
+  name: apigee-opdk-time-sync
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
-  name: opdk-setup-openjdk
+  name: apigee-opdk-setup-openjdk
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
-  name: opdk-setup-bootstrap
+  name: apigee-opdk-setup-bootstrap
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
-  name: opdk-setup-silent-installation-config
+  name: apigee-opdk-setup-silent-installation-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component
-  name: opdk-setup-component
+  name: apigee-opdk-setup-component
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
-  name: opdk-setup-component-installer
+  name: apigee-opdk-setup-component-installer
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
-  name: opdk-setup-selinux-disable
+  name: apigee-opdk-setup-selinux-disable
 
 - src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
-  name: opdk-shutdown-iptables
+  name: apigee-opdk-shutdown-iptables
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-org-config
-  name: opdk-setup-org-config
+  name: apigee-opdk-setup-org-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-org
-  name: opdk-setup-org
+  name: apigee-opdk-setup-org
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-validate
-  name: opdk-setup-validate
+  name: apigee-opdk-setup-validate
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup
-  name: opdk-setup-validate-cleanup
+  name: apigee-opdk-setup-validate-cleanup
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files
-  name: opdk-setup-apigee-log-files
+  name: apigee-opdk-setup-apigee-log-files
 
 - src: https://github.com/carlosfrias/apigee-fetch-files
   name: fetch-files
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
-  name: opdk-setup-postgres-config
+  name: apigee-opdk-setup-postgres-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-master
-  name: opdk-setup-postgres-master
+  name: apigee-opdk-setup-postgres-master
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-standby
-  name: opdk-setup-postgres-standby
+  name: apigee-opdk-setup-postgres-standby
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-postgres
-  name: opdk-setup-os-postgres
+  name: apigee-opdk-setup-os-postgres
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-status
-  name: opdk-setup-status
+  name: apigee-opdk-setup-status
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
-  name: opdk-setup-bootstrap-rollback
+  name: apigee-opdk-setup-bootstrap-rollback
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-mp
   name: internal-port-connectivity-validator-mp
@@ -102,4 +102,4 @@
   name: internal-port-connectivity-validator-ui
 
 - src: https://github.com/carlosfrias/apigee-opdk-baas-create-org-and-user
-  name: opdk-baas-create-org-and-user
+  name: apigee-opdk-baas-create-org-and-user
diff --git a/installations/dc1/components/opdk-install-component.yml b/installations/dc1/components/opdk-install-component.yml
index 97eed97..8f9e197 100644
--- a/installations/dc1/components/opdk-install-component.yml
+++ b/installations/dc1/components/opdk-install-component.yml
@@ -4,7 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-apigee-user
+  - apigee-opdk-setup-apigee-user
   tags:
   - user
 
@@ -13,14 +13,14 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-os-limits
+  - apigee-opdk-setup-os-limits
   tags:
   - os
 
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-openjdk
+  - apigee-opdk-setup-openjdk
   tags:
   - openjdk
 
@@ -29,7 +29,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-bootstrap
+  - apigee-opdk-setup-bootstrap
   tags:
   - bootstrap
 
@@ -38,8 +38,8 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-silent-installation-config
-  - opdk-setup-component-installer
+  - apigee-opdk-setup-silent-installation-config
+  - apigee-opdk-setup-component-installer
   tags:
   - installer
 
@@ -47,6 +47,6 @@
   serial: 1
 
   roles:
-  - { role: opdk-setup-component, profile: '{{ component_profile }}' }
+  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   tags:
   - component
diff --git a/installations/dc1/components/opdk-setup-postgres-common.yml b/installations/dc1/components/opdk-setup-postgres-common.yml
index c93b45f..2c6e586 100644
--- a/installations/dc1/components/opdk-setup-postgres-common.yml
+++ b/installations/dc1/components/opdk-setup-postgres-common.yml
@@ -2,10 +2,10 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-enable-swap
-  - opdk-setup-apigee-user
-  - opdk-setup-os-postgres
-  - opdk-setup-postgres-config
+  - apigee-opdk-enable-swap
+  - apigee-opdk-setup-apigee-user
+  - apigee-opdk-setup-os-postgres
+  - apigee-opdk-setup-postgres-config
 
 - include: opdk-install-component.yml
   vars:
@@ -18,7 +18,7 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain server self report
     opdk_server_self:
diff --git a/installations/dc1/components/opdk-setup-postgres-master.yml b/installations/dc1/components/opdk-setup-postgres-master.yml
index 199ec68..1fa4f95 100644
--- a/installations/dc1/components/opdk-setup-postgres-master.yml
+++ b/installations/dc1/components/opdk-setup-postgres-master.yml
@@ -2,6 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-postgres-master
+  - apigee-opdk-setup-postgres-master
   tags:
   - pgmaster
diff --git a/installations/dc1/components/opdk-setup-postgres-standby.yml b/installations/dc1/components/opdk-setup-postgres-standby.yml
index 81e9fdb..a8dbba2 100644
--- a/installations/dc1/components/opdk-setup-postgres-standby.yml
+++ b/installations/dc1/components/opdk-setup-postgres-standby.yml
@@ -2,6 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-postgres-standby
+  - apigee-opdk-setup-postgres-standby
   tags:
   - pgstandby
diff --git a/installations/dc1/configuration/opdk-set-reachable.yml b/installations/dc1/configuration/opdk-set-reachable.yml
index f86fc25..7de99ce 100644
--- a/installations/dc1/configuration/opdk-set-reachable.yml
+++ b/installations/dc1/configuration/opdk-set-reachable.yml
@@ -4,7 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - { role: opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
-  - { role: opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
+  - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
+  - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
   tags:
   - user
\ No newline at end of file
diff --git a/installations/dc1/configuration/opdk-setup-org-config.yml b/installations/dc1/configuration/opdk-setup-org-config.yml
index 709cf2d..d24ed2e 100644
--- a/installations/dc1/configuration/opdk-setup-org-config.yml
+++ b/installations/dc1/configuration/opdk-setup-org-config.yml
@@ -2,5 +2,5 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-org-config
+  - apigee-opdk-setup-org-config
 
diff --git a/installations/dc1/configuration/opdk-setup-org.yml b/installations/dc1/configuration/opdk-setup-org.yml
index 90453ac..e3911bf 100644
--- a/installations/dc1/configuration/opdk-setup-org.yml
+++ b/installations/dc1/configuration/opdk-setup-org.yml
@@ -2,4 +2,4 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-org
+  - apigee-opdk-setup-org
diff --git a/installations/dc1/configuration/opdk-setup-os.yml b/installations/dc1/configuration/opdk-setup-os.yml
index 5b148a7..093b6e5 100644
--- a/installations/dc1/configuration/opdk-setup-os.yml
+++ b/installations/dc1/configuration/opdk-setup-os.yml
@@ -7,9 +7,9 @@
   - name: Load credentials from encrypted file
     include_vars: '~/.apigee/credentials.yml'
   roles:
-  - opdk-setup-os-minimum
-  - opdk-setup-selinux-disable
-  - opdk-shutdown-iptables
-  - opdk-time-sync
-  - opdk-setup-os-common
+  - apigee-opdk-setup-os-minimum
+  - apigee-opdk-setup-selinux-disable
+  - apigee-opdk-shutdown-iptables
+  - apigee-opdk-time-sync
+  - apigee-opdk-setup-os-common
 
diff --git a/installations/dc1/installation-rollback.yml b/installations/dc1/installation-rollback.yml
index e10255a..02dbed1 100644
--- a/installations/dc1/installation-rollback.yml
+++ b/installations/dc1/installation-rollback.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
   vars:
-    remove_data: false
+    remove_apigee: false
   roles:
-  - opdk-setup-bootstrap-rollback
+  - apigee-opdk-setup-bootstrap-rollback
diff --git a/installations/dc1/requirements.yml b/installations/dc1/requirements.yml
index 0ac6e8d..371139b 100644
--- a/installations/dc1/requirements.yml
+++ b/installations/dc1/requirements.yml
@@ -1,108 +1,72 @@
 ---
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
-  name: opdk-setup-apigee-user
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
-  name: opdk-setup-os-common
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
-  name: opdk-setup-os-limits
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
-  name: opdk-setup-os-minimum
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: opdk-setup-default-settings
 
 - src: https://github.com/carlosfrias/apigee-opdk-time-sync
-  name: opdk-time-sync
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
-  name: opdk-setup-openjdk
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
-  name: opdk-setup-bootstrap
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
-  name: opdk-setup-silent-installation-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component
-  name: opdk-setup-component
 
 - src: https://github.com/carlosfrias/apigee-opdk-set-reachable
-  name: opdk-set-reachable
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
-  name: opdk-setup-component-installer
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
-  name: opdk-setup-selinux-disable
 
 - src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
-  name: opdk-shutdown-iptables
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-org-config
-  name: opdk-setup-org-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-org
-  name: opdk-setup-org
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-validate
-  name: opdk-setup-validate
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup
-  name: opdk-setup-validate-cleanup
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files
-  name: opdk-setup-apigee-log-files
 
 - src: https://github.com/carlosfrias/apigee-fetch-files
-  name: fetch-files
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
-  name: opdk-setup-postgres-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-master
-  name: opdk-setup-postgres-master
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-standby
-  name: opdk-setup-postgres-standby
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-postgres
-  name: opdk-setup-os-postgres
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-status
-  name: opdk-setup-status
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
-  name: opdk-setup-bootstrap-rollback
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-mp
-  name: internal-port-connectivity-validator-mp
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ldap
-  name: internal-port-connectivity-validator-ldap
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-cassandra
-  name: internal-port-connectivity-validator-cassandra
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-zookeeper
-  name: internal-port-connectivity-validator-zookeeper
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ms
-  name: internal-port-connectivity-validator-ms
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-postgres
-  name: internal-port-connectivity-validator-postgres
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-router
-  name: internal-port-connectivity-validator-router
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-qpid
-  name: internal-port-connectivity-validator-qpid
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ui
-  name: internal-port-connectivity-validator-ui
 
 - src: https://github.com/carlosfrias/apigee-opdk-enable-swap
-  name: opdk-enable-swap
diff --git a/installations/dc1/validations/opdk-internal-port-connectivity-validator.yml b/installations/dc1/validations/opdk-internal-port-connectivity-validator.yml
index e1abc3a..0e5d7bc 100644
--- a/installations/dc1/validations/opdk-internal-port-connectivity-validator.yml
+++ b/installations/dc1/validations/opdk-internal-port-connectivity-validator.yml
@@ -2,37 +2,37 @@
 
 - hosts: rmp
   roles:
-  - internal-port-connectivity-validator-mp
+  - apigee-internal-port-connectivity-validator-mp
 
 - hosts: ldap
   roles:
-  - internal-port-connectivity-validator-ldap
+  - apigee-internal-port-connectivity-validator-ldap
 
 - hosts: ds
   roles:
-  - internal-port-connectivity-validator-cassandra
+  - apigee-internal-port-connectivity-validator-cassandra
 
 - hosts: ds
   roles:
-  - internal-port-connectivity-validator-zookeeper
+  - apigee-internal-port-connectivity-validator-zookeeper
 
 - hosts: ms
   roles:
-  - internal-port-connectivity-validator-ms
+  - apigee-internal-port-connectivity-validator-ms
 
 - hosts: pg
   roles:
-  - internal-port-connectivity-validator-postgres
+  - apigee-internal-port-connectivity-validator-postgres
 
 - hosts: rmp
   roles:
-  - internal-port-connectivity-validator-router
+  - apigee-internal-port-connectivity-validator-router
 
 - hosts: qpid
   roles:
-  - internal-port-connectivity-validator-qpid
+  - apigee-internal-port-connectivity-validator-qpid
 
 - hosts: ui
   roles:
-  - internal-port-connectivity-validator-ui
+  - apigee-internal-port-connectivity-validator-ui
 
diff --git a/installations/dc1/validations/opdk-server-self.yml b/installations/dc1/validations/opdk-server-self.yml
index 4476a85..9d54e76 100644
--- a/installations/dc1/validations/opdk-server-self.yml
+++ b/installations/dc1/validations/opdk-server-self.yml
@@ -2,7 +2,7 @@
 - hosts: ms
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain management server self report
     ignore_errors: yes
@@ -19,7 +19,7 @@
 - hosts: rmp
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain router server self report
     ignore_errors: yes
@@ -48,7 +48,7 @@
 - hosts: qpid
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain qpid server self report
     ignore_errors: yes
@@ -65,7 +65,7 @@
 - hosts: pg
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain postgres server self report
     ignore_errors: yes
diff --git a/installations/dc1/validations/opdk-setup-log-files.yml b/installations/dc1/validations/opdk-setup-log-files.yml
index 21d31fa..1cbf194 100644
--- a/installations/dc1/validations/opdk-setup-log-files.yml
+++ b/installations/dc1/validations/opdk-setup-log-files.yml
@@ -1,8 +1,16 @@
 ---
 - hosts: planet
   strategy: free
+  vars:
+    apigee_log_files:
+    - { dir: '{{ opdk_installer_path }}/', name: '*.log' }
+    - { dir: '{{ opdk_installer_path }}/var/log/', name: '*.log' }
+    - { dir: '{{ opdk_installer_path }}/', name: '*.txt' }
+    - { dir: '{{ apigee_installation_home }}/var/log/', name: '*.log' }
+    - { dir: '{{ apigee_installation_home }}/', name: '*.out' }
+
   roles:
-  - { role: fetch-files, fetch_files: '{{ apigee_log_files }}' }
+  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}' }
   tags:
   - logs
   - apigee-logs
@@ -11,7 +19,7 @@
   become: true
   strategy: free
   roles:
-  - { role: fetch-files, fetch_files: '{{ system_config_files }}' }
+  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}' }
   tags:
   - logs
   - os-logs
@@ -19,7 +27,7 @@
 - hosts: planet
   strategy: free
   roles:
-  - { role: fetch-files, fetch_files: '{{ apigee_config_files }}' }
+  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}' }
   tags:
   - logs
   - config-logs
diff --git a/installations/dc1/validations/opdk-setup-status.yml b/installations/dc1/validations/opdk-setup-status.yml
index 466192e..1184364 100644
--- a/installations/dc1/validations/opdk-setup-status.yml
+++ b/installations/dc1/validations/opdk-setup-status.yml
@@ -1,7 +1,7 @@
 ---
 - hosts: '{{ hosts }}'
   roles:
-  - opdk-setup-status
+  - apigee-opdk-setup-status
   tags:
   - status
 
diff --git a/installations/dc1/validations/opdk-setup-validate.yml b/installations/dc1/validations/opdk-setup-validate.yml
index 22eadf6..df662f5 100644
--- a/installations/dc1/validations/opdk-setup-validate.yml
+++ b/installations/dc1/validations/opdk-setup-validate.yml
@@ -2,16 +2,16 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-default-settings
-  - opdk-setup-validate
+  - apigee-opdk-setup-default-settings
+  - apigee-opdk-setup-validate
   tags:
   - validate
 
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-default-settings
-  - opdk-setup-validate-cleanup
+  - apigee-opdk-setup-default-settings
+  - apigee-opdk-setup-validate-cleanup
   tags:
   - validate
   - validate-cleanup
diff --git a/installations/dc2/components/opdk-cassandra-client-update.yml b/installations/dc2/components/opdk-cassandra-client-update.yml
index 836b422..405a81a 100644
--- a/installations/dc2/components/opdk-cassandra-client-update.yml
+++ b/installations/dc2/components/opdk-cassandra-client-update.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
   roles:
-  - opdk-cassandra-client-update
+  - apigee-opdk-cassandra-client-update
   tags:
   - c-update
\ No newline at end of file
diff --git a/installations/dc2/components/opdk-cassandra-rebuild.yml b/installations/dc2/components/opdk-cassandra-rebuild.yml
index c3dfaf7..ac712e1 100644
--- a/installations/dc2/components/opdk-cassandra-rebuild.yml
+++ b/installations/dc2/components/opdk-cassandra-rebuild.yml
@@ -3,6 +3,6 @@
   vars:
     opdk_region: dc-1
   roles:
-  - opdk-cassandra-rebuild
+  - apigee-opdk-cassandra-rebuild
   tags:
   - c-rebuild
diff --git a/installations/dc2/components/opdk-install-component.yml b/installations/dc2/components/opdk-install-component.yml
index 6e9a51a..a8c0889 100644
--- a/installations/dc2/components/opdk-install-component.yml
+++ b/installations/dc2/components/opdk-install-component.yml
@@ -4,7 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-apigee-user
+  - apigee-opdk-setup-apigee-user
   tags:
   - user
 
@@ -13,14 +13,14 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-os-limits
+  - apigee-opdk-setup-os-limits
   tags:
   - os
 
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-openjdk
+  - apigee-opdk-setup-openjdk
   tags:
   - openjdk
 
@@ -29,7 +29,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-bootstrap
+  - apigee-opdk-setup-bootstrap
   tags:
   - bootstrap
 
@@ -38,14 +38,14 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-silent-installation-config
-  - opdk-setup-component-installer
+  - apigee-opdk-setup-silent-installation-config
+  - apigee-opdk-setup-component-installer
   tags:
   - installer
 
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - { role: opdk-setup-component, profile: '{{ component_profile }}' }
+  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   tags:
   - component
diff --git a/installations/dc2/components/opdk-setup-postgres-common.yml b/installations/dc2/components/opdk-setup-postgres-common.yml
index c93b45f..2c6e586 100644
--- a/installations/dc2/components/opdk-setup-postgres-common.yml
+++ b/installations/dc2/components/opdk-setup-postgres-common.yml
@@ -2,10 +2,10 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-enable-swap
-  - opdk-setup-apigee-user
-  - opdk-setup-os-postgres
-  - opdk-setup-postgres-config
+  - apigee-opdk-enable-swap
+  - apigee-opdk-setup-apigee-user
+  - apigee-opdk-setup-os-postgres
+  - apigee-opdk-setup-postgres-config
 
 - include: opdk-install-component.yml
   vars:
@@ -18,7 +18,7 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain server self report
     opdk_server_self:
diff --git a/installations/dc2/components/opdk-setup-postgres-master.yml b/installations/dc2/components/opdk-setup-postgres-master.yml
index 199ec68..1fa4f95 100644
--- a/installations/dc2/components/opdk-setup-postgres-master.yml
+++ b/installations/dc2/components/opdk-setup-postgres-master.yml
@@ -2,6 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-postgres-master
+  - apigee-opdk-setup-postgres-master
   tags:
   - pgmaster
diff --git a/installations/dc2/components/opdk-setup-postgres-standby.yml b/installations/dc2/components/opdk-setup-postgres-standby.yml
index 81e9fdb..a8dbba2 100644
--- a/installations/dc2/components/opdk-setup-postgres-standby.yml
+++ b/installations/dc2/components/opdk-setup-postgres-standby.yml
@@ -2,6 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-postgres-standby
+  - apigee-opdk-setup-postgres-standby
   tags:
   - pgstandby
diff --git a/installations/dc2/configuration/facts.yml b/installations/dc2/configuration/facts.yml
index 9a7e65e..eaf0d11 100644
--- a/installations/dc2/configuration/facts.yml
+++ b/installations/dc2/configuration/facts.yml
@@ -4,5 +4,5 @@
   - setup:
   - ec2_facts:
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
 
diff --git a/installations/dc2/configuration/opdk-set-reachable.yml b/installations/dc2/configuration/opdk-set-reachable.yml
index f86fc25..7de99ce 100644
--- a/installations/dc2/configuration/opdk-set-reachable.yml
+++ b/installations/dc2/configuration/opdk-set-reachable.yml
@@ -4,7 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - { role: opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
-  - { role: opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
+  - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
+  - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
   tags:
   - user
\ No newline at end of file
diff --git a/installations/dc2/configuration/opdk-setup-org-config.yml b/installations/dc2/configuration/opdk-setup-org-config.yml
index 709cf2d..d24ed2e 100644
--- a/installations/dc2/configuration/opdk-setup-org-config.yml
+++ b/installations/dc2/configuration/opdk-setup-org-config.yml
@@ -2,5 +2,5 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-org-config
+  - apigee-opdk-setup-org-config
 
diff --git a/installations/dc2/configuration/opdk-setup-org.yml b/installations/dc2/configuration/opdk-setup-org.yml
index 90453ac..e3911bf 100644
--- a/installations/dc2/configuration/opdk-setup-org.yml
+++ b/installations/dc2/configuration/opdk-setup-org.yml
@@ -2,4 +2,4 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-org
+  - apigee-opdk-setup-org
diff --git a/installations/dc2/configuration/opdk-setup-os.yml b/installations/dc2/configuration/opdk-setup-os.yml
index 5b148a7..093b6e5 100644
--- a/installations/dc2/configuration/opdk-setup-os.yml
+++ b/installations/dc2/configuration/opdk-setup-os.yml
@@ -7,9 +7,9 @@
   - name: Load credentials from encrypted file
     include_vars: '~/.apigee/credentials.yml'
   roles:
-  - opdk-setup-os-minimum
-  - opdk-setup-selinux-disable
-  - opdk-shutdown-iptables
-  - opdk-time-sync
-  - opdk-setup-os-common
+  - apigee-opdk-setup-os-minimum
+  - apigee-opdk-setup-selinux-disable
+  - apigee-opdk-shutdown-iptables
+  - apigee-opdk-time-sync
+  - apigee-opdk-setup-os-common
 
diff --git a/installations/dc2/installation-rollback.yml b/installations/dc2/installation-rollback.yml
index bc53acb..ba8e4d8 100644
--- a/installations/dc2/installation-rollback.yml
+++ b/installations/dc2/installation-rollback.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
   vars:
-    remove_data: true
+    remove_apigee: true
   roles:
-  - opdk-setup-bootstrap-rollback
+  - apigee-opdk-setup-bootstrap-rollback
diff --git a/installations/dc2/requirements.yml b/installations/dc2/requirements.yml
index 482da57..acfb10d 100644
--- a/installations/dc2/requirements.yml
+++ b/installations/dc2/requirements.yml
@@ -1,87 +1,77 @@
 ---
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
-  name: opdk-setup-apigee-user
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
-  name: opdk-setup-os-common
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
-  name: opdk-setup-os-limits
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
-  name: opdk-setup-os-minimum
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: opdk-setup-default-settings
 
 - src: https://github.com/carlosfrias/apigee-opdk-time-sync
-  name: opdk-time-sync
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
-  name: opdk-setup-openjdk
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
-  name: opdk-setup-bootstrap
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
-  name: opdk-setup-silent-installation-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component
-  name: opdk-setup-component
 
 - src: https://github.com/carlosfrias/apigee-opdk-set-reachable
-  name: opdk-set-reachable
+  name: apigee-opdk-set-reachable
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
-  name: opdk-setup-component-installer
+  name: apigee-opdk-setup-component-installer
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
-  name: opdk-setup-selinux-disable
+  name: apigee-opdk-setup-selinux-disable
 
 - src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
-  name: opdk-shutdown-iptables
+  name: apigee-opdk-shutdown-iptables
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-org-config
-  name: opdk-setup-org-config
+  name: apigee-opdk-setup-org-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-org
-  name: opdk-setup-org
+  name: apigee-opdk-setup-org
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-validate
-  name: opdk-setup-validate
+  name: apigee-opdk-setup-validate
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup
-  name: opdk-setup-validate-cleanup
+  name: apigee-opdk-setup-validate-cleanup
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files
-  name: opdk-setup-apigee-log-files
+  name: apigee-opdk-setup-apigee-log-files
 
 - src: https://github.com/carlosfrias/apigee-fetch-files
   name: fetch-files
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
-  name: opdk-setup-postgres-config
+  name: apigee-opdk-setup-postgres-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-master
-  name: opdk-setup-postgres-master
+  name: apigee-opdk-setup-postgres-master
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-standby
-  name: opdk-setup-postgres-standby
+  name: apigee-opdk-setup-postgres-standby
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-postgres
-  name: opdk-setup-os-postgres
+  name: apigee-opdk-setup-os-postgres
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-status
-  name: opdk-setup-status
+  name: apigee-opdk-setup-status
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
-  name: opdk-setup-bootstrap-rollback
+  name: apigee-opdk-setup-bootstrap-rollback
 
 - src: https://github.com/carlosfrias/apigee-opdk-cassandra-rebuild
-  name: opdk-cassandra-rebuild
+  name: apigee-opdk-cassandra-rebuild
 
 - src: https://github.com/carlosfrias/apigee-opdk-cassandra-client-update
-  name: opdk-cassandra-client-update
+  name: apigee-opdk-cassandra-client-update
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-mp
   name: internal-port-connectivity-validator-mp
diff --git a/installations/dc2/validations/opdk-server-self.yml b/installations/dc2/validations/opdk-server-self.yml
index 76670ed..c95adcf 100644
--- a/installations/dc2/validations/opdk-server-self.yml
+++ b/installations/dc2/validations/opdk-server-self.yml
@@ -2,7 +2,7 @@
 - hosts: rmp
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain router server self report
     ignore_errors: yes
@@ -25,7 +25,7 @@
 - hosts: pg
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain postgres server self report
     ignore_errors: yes
@@ -40,7 +40,7 @@
 - hosts: qpid
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain qpid server self report
     ignore_errors: yes
@@ -55,7 +55,7 @@
 - hosts: ms
   serial: 1
   roles:
-  - opdk-setup-default-settings
+  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain management server self report
     ignore_errors: yes
diff --git a/installations/dc2/validations/opdk-setup-status.yml b/installations/dc2/validations/opdk-setup-status.yml
index 7d2745d..a5dff3e 100644
--- a/installations/dc2/validations/opdk-setup-status.yml
+++ b/installations/dc2/validations/opdk-setup-status.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
   roles:
-  - opdk-setup-status
+  - apigee-opdk-setup-status
   tags:
   - status
diff --git a/installations/dc2/validations/opdk-setup-validate.yml b/installations/dc2/validations/opdk-setup-validate.yml
index ff52369..861f295 100644
--- a/installations/dc2/validations/opdk-setup-validate.yml
+++ b/installations/dc2/validations/opdk-setup-validate.yml
@@ -2,15 +2,15 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-default-settings
-  - opdk-setup-validate
+  - apigee-opdk-setup-default-settings
+  - apigee-opdk-setup-validate
   tags:
   - validate
 
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - opdk-setup-default-settings
-  - opdk-setup-validate-cleanup
+  - apigee-opdk-setup-default-settings
+  - apigee-opdk-setup-validate-cleanup
   tags:
   - validate-cleanup
diff --git a/installations/monetization/components/opdk-install-component.yml b/installations/monetization/components/opdk-install-component.yml
index 339ed85..1004218 100644
--- a/installations/monetization/components/opdk-install-component.yml
+++ b/installations/monetization/components/opdk-install-component.yml
@@ -4,7 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-apigee-user
+  - apigee-opdk-setup-apigee-user
   tags:
   - user
 
@@ -13,14 +13,14 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-os-limits
+  - apigee-opdk-setup-os-limits
   tags:
   - os
 
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - opdk-setup-openjdk
+  - apigee-opdk-setup-openjdk
   tags:
   - openjdk
 
@@ -29,7 +29,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-bootstrap
+  - apigee-opdk-setup-bootstrap
   tags:
   - bootstrap
 
@@ -38,16 +38,16 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - opdk-setup-silent-installation-config
-  - opdk-setup-component-installer
+  - apigee-opdk-setup-silent-installation-config
+  - apigee-opdk-setup-component-installer
   tags:
   - installer
 
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - { role: opdk-set-reachable, reachable: false }
-  - { role: opdk-setup-component, profile: '{{ component_profile }}' }
-  - { role: opdk-set-reachable, reachable: true }
+  - { role: apigee-opdk-set-reachable, reachable: false }
+  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
+  - { role: apigee-opdk-set-reachable, reachable: true }
   tags:
   - component
diff --git a/installations/monetization/components/opdk-provision-component.yml b/installations/monetization/components/opdk-provision-component.yml
index 945e2e6..31610f3 100644
--- a/installations/monetization/components/opdk-provision-component.yml
+++ b/installations/monetization/components/opdk-provision-component.yml
@@ -2,4 +2,4 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - { role: opdk-setup-provisioning, provisioning_action: 'enable-monetization', provisioning_config_file: '{{ opdk_installation_config_file }}'}
+  - { role: apigee-opdk-setup-provisioning, provisioning_action: 'enable-monetization', provisioning_config_file: '{{ opdk_installation_config_file }}'}
diff --git a/installations/monetization/configuration/opdk-set-reachable.yml b/installations/monetization/configuration/opdk-set-reachable.yml
index f86fc25..7de99ce 100644
--- a/installations/monetization/configuration/opdk-set-reachable.yml
+++ b/installations/monetization/configuration/opdk-set-reachable.yml
@@ -4,7 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - { role: opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
-  - { role: opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
+  - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
+  - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
   tags:
   - user
\ No newline at end of file
diff --git a/installations/monetization/configuration/opdk-setup-os.yml b/installations/monetization/configuration/opdk-setup-os.yml
index 3de9556..5cdf02f 100644
--- a/installations/monetization/configuration/opdk-setup-os.yml
+++ b/installations/monetization/configuration/opdk-setup-os.yml
@@ -4,9 +4,9 @@
   gather_facts: no
   strategy: free
   roles:
-  - opdk-setup-os-minimum
-  - opdk-setup-selinux-disable
-  - opdk-shutdown-iptables
-  - opdk-time-sync
-  - opdk-setup-os-common
+  - apigee-opdk-setup-os-minimum
+  - apigee-opdk-setup-selinux-disable
+  - apigee-opdk-shutdown-iptables
+  - apigee-opdk-time-sync
+  - apigee-opdk-setup-os-common
 
diff --git a/installations/monetization/requirements.yml b/installations/monetization/requirements.yml
index c261ece..737d44a 100644
--- a/installations/monetization/requirements.yml
+++ b/installations/monetization/requirements.yml
@@ -1,87 +1,87 @@
 ---
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
-  name: opdk-setup-apigee-user
+  name: apigee-opdk-setup-apigee-user
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
-  name: opdk-setup-os-common
+  name: apigee-opdk-setup-os-common
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
-  name: opdk-setup-os-limits
+  name: apigee-opdk-setup-os-limits
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
-  name: opdk-setup-os-minimum
+  name: apigee-opdk-setup-os-minimum
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: opdk-setup-default-settings
+  name: apigee-opdk-setup-default-settings
 
 - src: https://github.com/carlosfrias/apigee-opdk-time-sync
-  name: opdk-time-sync
+  name: apigee-opdk-time-sync
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
-  name: opdk-setup-openjdk
+  name: apigee-opdk-setup-openjdk
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
-  name: opdk-setup-bootstrap
+  name: apigee-opdk-setup-bootstrap
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
-  name: opdk-setup-silent-installation-config
+  name: apigee-opdk-setup-silent-installation-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component
-  name: opdk-setup-component
+  name: apigee-opdk-setup-component
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
-  name: opdk-setup-component-installer
+  name: apigee-opdk-setup-component-installer
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
-  name: opdk-setup-selinux-disable
+  name: apigee-opdk-setup-selinux-disable
 
 - src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
-  name: opdk-shutdown-iptables
+  name: apigee-opdk-shutdown-iptables
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-org-config
-  name: opdk-setup-org-config
+  name: apigee-opdk-setup-org-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-org
-  name: opdk-setup-org
+  name: apigee-opdk-setup-org
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-validate
-  name: opdk-setup-validate
+  name: apigee-opdk-setup-validate
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup
-  name: opdk-setup-validate-cleanup
+  name: apigee-opdk-setup-validate-cleanup
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files
-  name: opdk-setup-apigee-log-files
+  name: apigee-opdk-setup-apigee-log-files
 
 - src: https://github.com/carlosfrias/apigee-fetch-files
   name: fetch-files
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
-  name: opdk-setup-postgres-config
+  name: apigee-opdk-setup-postgres-config
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-master
-  name: opdk-setup-postgres-master
+  name: apigee-opdk-setup-postgres-master
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-standby
-  name: opdk-setup-postgres-standby
+  name: apigee-opdk-setup-postgres-standby
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-os-postgres
-  name: opdk-setup-os-postgres
+  name: apigee-opdk-setup-os-postgres
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-status
-  name: opdk-setup-status
+  name: apigee-opdk-setup-status
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
-  name: opdk-setup-bootstrap-rollback
+  name: apigee-opdk-setup-bootstrap-rollback
 
 - src: https://github.com/carlosfrias/apigee-opdk-cassandra-rebuild
-  name: opdk-cassandra-rebuild
+  name: apigee-opdk-cassandra-rebuild
 
 - src: https://github.com/carlosfrias/apigee-opdk-cassandra-client-update
-  name: opdk-cassandra-client-update
+  name: apigee-opdk-cassandra-client-update
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-provisioning
-  name: opdk-setup-provisioning
+  name: apigee-opdk-setup-provisioning
 
 - src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-mp
   name: internal-port-connectivity-validator-mp
diff --git a/installations/monetization/test.yml b/installations/monetization/test.yml
index 24261a9..04910d4 100644
--- a/installations/monetization/test.yml
+++ b/installations/monetization/test.yml
@@ -5,5 +5,5 @@
   vars:
     opdk_monetization: true
   roles:
-  - opdk-setup-silent-installation-config
+  - apigee-opdk-setup-silent-installation-config
 
diff --git a/installations/monetization/validations/opdk-setup-status.yml b/installations/monetization/validations/opdk-setup-status.yml
index 7d2745d..a5dff3e 100644
--- a/installations/monetization/validations/opdk-setup-status.yml
+++ b/installations/monetization/validations/opdk-setup-status.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
   roles:
-  - opdk-setup-status
+  - apigee-opdk-setup-status
   tags:
   - status