diff --git a/upgrade-edge-rollback.yml b/upgrade-edge-rollback.yml
index e0662aa..4a8f44f 100644
--- a/upgrade-edge-rollback.yml
+++ b/upgrade-edge-rollback.yml
@@ -14,8 +14,8 @@
   - { role: apigee-opdk-setup-bootstrap-rollback, tags: ['rollback'], remove_apigee: true }
   - { role: apigee-server-restart, tags: ['restart-server'] }
   - { role: apigee-opdk-setup-java-home, tags: ['apigee-pre-req', 'java_home'] }
-  - { role: apigee-opdk-setup-silent-installation-config, tags: ['apigee-silent-config'], opdk_ldap_type: '2', when: "{{ groups['dc-2'] is defined }}" }
-  - { role: apigee-opdk-setup-silent-installation-config, tags: ['apigee-silent-config'], opdk_ldap_type: '1', when: "{{ groups['dc-2'] is not defined }}" }
+  - { role: apigee-opdk-setup-silent-installation-config, tags: ['apigee-silent-config'], opdk_ldap_type: '2', when: "{{ groups['dc2'] is defined }}" }
+  - { role: apigee-opdk-setup-silent-installation-config, tags: ['apigee-silent-config'], opdk_ldap_type: '1', when: "{{ groups['dc2'] is not defined }}" }
   - { role: apigee-opdk-setup-bootstrap, tags: ['apigee-pre-req', 'apigee-bootstrap'], upgrade_edge: true }
   - { role: apigee-opdk-setup-component-installer, tags: ['apigee-component'] }
   - { role: apigee-opdk-setup-component, profile: '{{ component }}',tags: ['apigee-component'] }
diff --git a/upgrade-edge.yml b/upgrade-edge.yml
index 222929d..0cfaa55 100644
--- a/upgrade-edge.yml
+++ b/upgrade-edge.yml
@@ -128,67 +128,67 @@
   roles:
   - { role: apigee-opdk-update-component,  apigee_component: '{{ upgrade_component }}' }
 
-- name: Upgrade PG in DC-1
+- name: Upgrade PG in dc1
   include: upgrade-postgres.yml
   tags: ['pg']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-1-ds
+    hosts: dc1-ds
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-2-ds
+    hosts: dc2-ds
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-1-ms
+    hosts: dc1-ms
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-2-ms
+    hosts: dc2-ms
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-1-rmp
+    hosts: dc1-rmp
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-2-rmp
+    hosts: dc2-rmp
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-1-qpid
+    hosts: dc1-qpid
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-2-qpid
+    hosts: dc2-qpid
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-1-pgmaster
+    hosts: dc1-pgmaster
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-2-pgmaster
+    hosts: dc2-pgmaster
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-1-pgstandby
+    hosts: dc1-pgstandby
   tags: ['logs']
 
 - include: opdk-setup-log-files.yml
   vars:
-    hosts: dc-2-pgstandby
+    hosts: dc2-pgstandby
   tags: ['logs']
 
diff --git a/upgrade-postgres.yml b/upgrade-postgres.yml
index 0a6f676..fbd7e49 100644
--- a/upgrade-postgres.yml
+++ b/upgrade-postgres.yml
@@ -62,7 +62,7 @@
   roles:
   - { role: apigee-opdk-setup-postgres-=db-upgrade }
 
-- name: Upgrade Postgres standby in DC-1
+- name: Upgrade Postgres standby in dc1
   hosts: pgstandby
   serial: 1
   gather_facts: no