diff --git a/tasks/local_mgmt_ip.yml b/tasks/local_mgmt_ip.yml
index 7081a9d..8a56563 100644
--- a/tasks/local_mgmt_ip.yml
+++ b/tasks/local_mgmt_ip.yml
@@ -1,20 +1,20 @@
 ---
 - block:
-  - name: Normalized name for management server local ip if on dc1
+  - name: Normalized name for management server local ip if on dc-1
     cache:
       key: 'local_mgmt_ip'
-      value: "{{ hostvars[groups['dc1-ms'][0]][interface_name].ipv4.address }}"
-    when: groups['dc1'] is defined and groups['dc1-ms'] is defined and inventory_hostname in groups['dc1']
+      value: "{{ hostvars[groups['dc-1-ms'][0]][interface_name].ipv4.address }}"
+    when: groups['dc-1'] is defined and groups['dc-1-ms'] is defined and inventory_hostname in groups['dc-1']
 
-  - name: Normalized name for management server local ip if on dc2
+  - name: Normalized name for management server local ip if on dc-2
     cache:
       key: 'local_mgmt_ip'
-      value: "{{ hostvars[groups['dc2-ms'][0]][interface_name].ipv4.address }}"
-    when: groups['dc2'] is defined and groups['dc2-ms'] is defined and inventory_hostname in groups['dc2']
+      value: "{{ hostvars[groups['dc-2-ms'][0]][interface_name].ipv4.address }}"
+    when: groups['dc-2'] is defined and groups['dc-2-ms'] is defined and inventory_hostname in groups['dc-2']
 
-  - name: Normalized name for management server local ip to dc1 if current node is not on dc1 or dc2
+  - name: Normalized name for management server local ip to dc-1 if current node is not on dc-1 or dc-2
     cache:
       key: 'local_mgmt_ip'
-      value: "{{ hostvars[groups['dc1-ms'][0]][interface_name].ipv4.address }}"
-    when: not (inventory_hostname in groups['dc1']) and not (inventory_hostname in groups['dc2'])
-  when: groups['dc1'] is defined or groups['dc1-ms'] is defined
+      value: "{{ hostvars[groups['dc-1-ms'][0]][interface_name].ipv4.address }}"
+    when: not (inventory_hostname in groups['dc-1']) and not (inventory_hostname in groups['dc-2'])
+  when: groups['dc-1'] is defined or groups['dc-1-ms'] is defined
diff --git a/tasks/postgres.yml b/tasks/postgres.yml
index 13c9780..5f404ed 100644
--- a/tasks/postgres.yml
+++ b/tasks/postgres.yml
@@ -3,13 +3,13 @@
 
   - name: Obtain pgmaster IP for DC 2, if not provided
     set_fact:
-      pgmaster_ip: "{{ hostvars[groups['dc2-pgmaster'][0]][interface_name].ipv4.address }}"
-    when: pgmaster_ip is not defined and groups['dc2-pgmaster'] is defined
+      pgmaster_ip: "{{ hostvars[groups['dc-2-pgmaster'][0]][interface_name].ipv4.address }}"
+    when: pgmaster_ip is not defined and groups['dc-2-pgmaster'] is defined
 
   - name: Obtain pgstandby IP for DC 2, if not provided
     set_fact:
-      pgstandby_ip: "{{ hostvars[groups['dc2-pgstandby'][0]][interface_name].ipv4.address }}"
-    when: pgstandby_ip is not defined and groups['dc2-pgstandby'] is defined
+      pgstandby_ip: "{{ hostvars[groups['dc-2-pgstandby'][0]][interface_name].ipv4.address }}"
+    when: pgstandby_ip is not defined and groups['dc-2-pgstandby'] is defined
 
   - name: Set pgmaster_ip for DC 2, in cache, if defined
     cache:
@@ -23,18 +23,18 @@
       value: '{{ pgstandby_ip }}'
     when: pgstandby_ip is defined
 
-  when: (groups['dc2-pgmaster'] is defined or groups['dc2-pgstandby'] is defined) and inventory_hostname in groups['dc2']
+  when: (groups['dc-2-pgmaster'] is defined or groups['dc-2-pgstandby'] is defined) and inventory_hostname in groups['dc-2']
 
 - block:
   - name: Obtain pgmaster IP for DC 1, if not provided
     set_fact:
-      pgmaster_ip: "{{ hostvars[groups['dc1-pgmaster'][0]][interface_name].ipv4.address }}"
-    when: pgmaster_ip is not defined and groups['dc1-pgmaster'] is defined
+      pgmaster_ip: "{{ hostvars[groups['dc-1-pgmaster'][0]][interface_name].ipv4.address }}"
+    when: pgmaster_ip is not defined and groups['dc-1-pgmaster'] is defined
 
   - name: Obtain pgstandby IP for DC 1, if not provided
     set_fact:
-      pgstandby_ip: "{{ hostvars[groups['dc1-pgstandby'][0]][interface_name].ipv4.address }}"
-    when: pgstandby_ip is not defined and groups['dc1-pgstandby'] is defined
+      pgstandby_ip: "{{ hostvars[groups['dc-1-pgstandby'][0]][interface_name].ipv4.address }}"
+    when: pgstandby_ip is not defined and groups['dc-1-pgstandby'] is defined
 
   - name: Set pgmaster_ip for DC 1, in cache, if defined
     cache:
@@ -48,16 +48,16 @@
       value: '{{ pgstandby_ip }}'
     when: pgstandby_ip is defined
 
-  when: (groups['dc1-pgmaster'] is defined or groups['dc1-pgstandby'] is defined) and inventory_hostname in groups['dc1']
+  when: (groups['dc-1-pgmaster'] is defined or groups['dc-1-pgstandby'] is defined) and inventory_hostname in groups['dc-1']
 
 - block:
   - name: Obtain pgmaster IP for DC 1, if not provided
     set_fact:
-      pgmaster_ip: "{{ groups['dc1-pgmaster'][0] }}"
+      pgmaster_ip: "{{ groups['dc-1-pgmaster'][0] }}"
 
   - name: Obtain pgstandby IP for DC 1, if not provided
     set_fact:
-      pgstandby_ip: "{{ groups['dc2-pgstandby'][0] }}"
+      pgstandby_ip: "{{ groups['dc-2-pgstandby'][0] }}"
 
   - name: Set pgmaster_ip for DC 1, in cache, if defined
     cache:
@@ -69,4 +69,4 @@
       key: pgstandby_ip
       value: '{{ pgstandby_ip }}'
 
-  when: groups['dc1-pgmaster'] is defined and groups['dc2-pgstandby'] is defined
+  when: groups['dc-1-pgmaster'] is defined and groups['dc-2-pgstandby'] is defined
diff --git a/tasks/public_mgmt_ip.yml b/tasks/public_mgmt_ip.yml
index 9afc74e..433cabd 100644
--- a/tasks/public_mgmt_ip.yml
+++ b/tasks/public_mgmt_ip.yml
@@ -1,19 +1,19 @@
 ---
 - block:
-  - name: Normalized name for management server public ip on dc1
+  - name: Normalized name for management server public ip on dc-1
     cache:
       key: 'public_mgmt_ip'
-      value: "{{ groups['dc1-ms'][0] }}"
-    when: groups['dc1'] is defined and groups['dc1-ms'] is defined and inventory_hostname in groups['dc1']
+      value: "{{ groups['dc-1-ms'][0] }}"
+    when: groups['dc-1'] is defined and groups['dc-1-ms'] is defined and inventory_hostname in groups['dc-1']
 
-  - name: Normalized name for management server public ip  on dc2
+  - name: Normalized name for management server public ip  on dc-2
     cache:
       key: 'public_mgmt_ip'
-      value: "{{ groups['dc2-ms'][0] }}"
-    when: groups['dc2'] is defined and groups['dc2-ms'] is defined and inventory_hostname in groups['dc2']
+      value: "{{ groups['dc-2-ms'][0] }}"
+    when: groups['dc-2'] is defined and groups['dc-2-ms'] is defined and inventory_hostname in groups['dc-2']
 
-  - name: Normalized name for management server public ip to dc1 if current node is not in dc1 or dc2
+  - name: Normalized name for management server public ip to dc-1 if current node is not in dc-1 or dc-2
     cache:
       key: 'public_mgmt_ip'
-      value: "{{ groups['dc1-ms'][0] }}"
-    when: groups['dc1'] is defined and groups['dc1-ms'] is defined and inventory_hostname in groups['dc1']
+      value: "{{ groups['dc-1-ms'][0] }}"
+    when: groups['dc-1'] is defined and groups['dc-1-ms'] is defined and inventory_hostname in groups['dc-1']
diff --git a/tests/simplified_inventory.yml b/tests/simplified_inventory.yml
index 62fa3be..a3be898 100644
--- a/tests/simplified_inventory.yml
+++ b/tests/simplified_inventory.yml
@@ -1,20 +1,20 @@
 ---
 apigee_topology:
-  - dc1 dc1n1 ms
-  - dc1 dc1n2 ds
-  - dc1 dc1n3 ds
-  - dc1 dc1n4 ds
-  - dc1 dc1n5 rmp
-  - dc1 dc1n6 rmp
-  - dc1 dc1n7 qs
-  - dc1 dc1n8 qs
-  - dc1 dc1n9 ps
-  - dc2 dc2n1 ms
-  - dc2 dc2n2 ds
-  - dc2 dc2n3 ds
-  - dc2 dc1n4 ds
-  - dc2 dc2n5 rmp
-  - dc2 dc2n6 rmp
-  - dc2 dc2n7 qs
-  - dc2 dc2n8 qs
-  - dc2 dc2n9 ps
+  - dc-1 dc-1n1 ms
+  - dc-1 dc-1n2 ds
+  - dc-1 dc-1n3 ds
+  - dc-1 dc-1n4 ds
+  - dc-1 dc-1n5 rmp
+  - dc-1 dc-1n6 rmp
+  - dc-1 dc-1n7 qs
+  - dc-1 dc-1n8 qs
+  - dc-1 dc-1n9 ps
+  - dc-2 dc-2n1 ms
+  - dc-2 dc-2n2 ds
+  - dc-2 dc-2n3 ds
+  - dc-2 dc-1n4 ds
+  - dc-2 dc-2n5 rmp
+  - dc-2 dc-2n6 rmp
+  - dc-2 dc-2n7 qs
+  - dc-2 dc-2n8 qs
+  - dc-2 dc-2n9 ps
diff --git a/tests/test_apigee_facts.yml b/tests/test_apigee_facts.yml
index d074e41..3fd8105 100644
--- a/tests/test_apigee_facts.yml
+++ b/tests/test_apigee_facts.yml
@@ -6,4 +6,4 @@
 
   tasks:
   - name: Set Apigee facts
-    apigee_facts: topology='cassandra' my_hostname='dc1'
+    apigee_facts: topology='cassandra' my_hostname='dc-1'