diff --git a/installations/dc2/validations/opdk-internal-port-connectivity-validator.yml b/installations/dc2/validations/opdk-internal-port-connectivity-validator.yml
index e1abc3a..0e5d7bc 100644
--- a/installations/dc2/validations/opdk-internal-port-connectivity-validator.yml
+++ b/installations/dc2/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/dc2/validations/opdk-setup-log-files.yml b/installations/dc2/validations/opdk-setup-log-files.yml
index 21d31fa..041c9f4 100644
--- a/installations/dc2/validations/opdk-setup-log-files.yml
+++ b/installations/dc2/validations/opdk-setup-log-files.yml
@@ -2,7 +2,7 @@
 - hosts: planet
   strategy: free
   roles:
-  - { role: fetch-files, fetch_files: '{{ apigee_log_files }}' }
+  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}' }
   tags:
   - logs
   - apigee-logs
@@ -11,7 +11,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 +19,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