diff --git a/edge-1601-dc1/inventory b/edge-1601-dc1/inventory
index 0dbc58d..9f00bfe 100644
--- a/edge-1601-dc1/inventory
+++ b/edge-1601-dc1/inventory
@@ -103,8 +103,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-pgmaster
-pgstandby
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster
diff --git a/edge-1601-dc2/inventory b/edge-1601-dc2/inventory
index 56cbbd8..4e3a09e 100644
--- a/edge-1601-dc2/inventory
+++ b/edge-1601-dc2/inventory
@@ -103,8 +103,8 @@
 dc-2-pg
 
 [dc-2-pg:children]
-pgmaster
-pgstandby
+dc-2-pgmaster
+dc-2-pgstandby
 
 [pgmaster:children]
 dc-2-pgmaster
diff --git a/edge-1601-dc3/inventory b/edge-1601-dc3/inventory
index d15284b..3987019 100644
--- a/edge-1601-dc3/inventory
+++ b/edge-1601-dc3/inventory
@@ -58,8 +58,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_dc3_n4
-tag_Name_dc3_n5
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster
diff --git a/edge-1601-dc4/inventory b/edge-1601-dc4/inventory
index afd0b68..65d4a47 100644
--- a/edge-1601-dc4/inventory
+++ b/edge-1601-dc4/inventory
@@ -59,8 +59,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_dc4_n4
-tag_Name_dc4_n5
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster
diff --git a/edge-1601-dc5/inventory b/edge-1601-dc5/inventory
index 3bb0935..6b47a08 100644
--- a/edge-1601-dc5/inventory
+++ b/edge-1601-dc5/inventory
@@ -90,8 +90,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_dc5_n13
-tag_Name_dc5_n14
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster
diff --git a/edge-1601-dc6/inventory b/edge-1601-dc6/inventory
index bececa0..658166b 100644
--- a/edge-1601-dc6/inventory
+++ b/edge-1601-dc6/inventory
@@ -90,8 +90,8 @@
 dc-2-pg
 
 [dc-2-pg:children]
-tag_Name_dc6_n13
-tag_Name_dc6_n14
+dc-2-pgmaster
+dc-2-pgstandby
 
 [pgmaster:children]
 dc-2-pgmaster
diff --git a/edge-1605-dc3/inventory b/edge-1605-dc3/inventory
index 2f34166..63fe321 100644
--- a/edge-1605-dc3/inventory
+++ b/edge-1605-dc3/inventory
@@ -59,8 +59,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_dc3_n4
-tag_Name_dc3_n5
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster
diff --git a/edge-1609-dc2/inventory b/edge-1609-dc2/inventory
index 18f04d5..436da8b 100644
--- a/edge-1609-dc2/inventory
+++ b/edge-1609-dc2/inventory
@@ -58,8 +58,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_dc2_n4
-tag_Name_dc2_n5
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster
diff --git a/edge-1609-dc3-dc4/inventory-dc3 b/edge-1609-dc3-dc4/inventory-dc3
index ba5c7d1..27e2114 100644
--- a/edge-1609-dc3-dc4/inventory-dc3
+++ b/edge-1609-dc3-dc4/inventory-dc3
@@ -70,8 +70,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_dc3_n9
-tag_Name_dc3_n10
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster
diff --git a/edge-1609-dc3-dc4/inventory-dc4 b/edge-1609-dc3-dc4/inventory-dc4
index f97de72..1fa13b5 100644
--- a/edge-1609-dc3-dc4/inventory-dc4
+++ b/edge-1609-dc3-dc4/inventory-dc4
@@ -70,8 +70,8 @@
 dc-2-pg
 
 [dc-2-pg:children]
-tag_Name_dc4_n9
-tag_Name_dc4_n10
+dc-2-pgmaster
+dc-2-pgstandby
 
 [pgmaster:children]
 dc-2-pgmaster
diff --git a/edge-1609-dc3/inventory b/edge-1609-dc3/inventory
index ba5c7d1..27e2114 100644
--- a/edge-1609-dc3/inventory
+++ b/edge-1609-dc3/inventory
@@ -70,8 +70,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_dc3_n9
-tag_Name_dc3_n10
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster
diff --git a/edge-1609-dc4/inventory b/edge-1609-dc4/inventory
index be671c2..47150f9 100644
--- a/edge-1609-dc4/inventory
+++ b/edge-1609-dc4/inventory
@@ -70,8 +70,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_dc4_n9
-tag_Name_dc4_n10
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster
diff --git a/edge-1701-dc2/inventory b/edge-1701-dc2/inventory
index 18f04d5..436da8b 100644
--- a/edge-1701-dc2/inventory
+++ b/edge-1701-dc2/inventory
@@ -58,8 +58,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_dc2_n4
-tag_Name_dc2_n5
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster
diff --git a/edgemicro-1601-dc1/inventory-dc2 b/edgemicro-1601-dc1/inventory-dc2
index f81017b..96e9880 100644
--- a/edgemicro-1601-dc1/inventory-dc2
+++ b/edgemicro-1601-dc1/inventory-dc2
@@ -61,8 +61,8 @@
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_dc2_n4
-tag_Name_dc2_n5
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
 dc-1-pgmaster