diff --git a/baas-1601-dc1/inventory b/baas-1601-dc1/inventory
index 3a5d0b0..71009f3 100644
--- a/baas-1601-dc1/inventory
+++ b/baas-1601-dc1/inventory
@@ -1,54 +1,54 @@
-[tag_Name_baas_1601_dc1_n0]
-[tag_Name_baas_1601_dc1_n1]
-[tag_Name_baas_1601_dc1_n2]
-[tag_Name_baas_1601_dc1_n3]
-[tag_Name_baas_1601_dc1_n4]
-[tag_Name_baas_1601_dc1_n5]
-[tag_Name_baas_1601_dc1_n6]
-[tag_Name_baas_1601_dc1_n7]
-[tag_Name_baas_1601_dc1_n8]
-[tag_Name_baas_1601_dc1_n9]
-[tag_Name_baas_1601_dc1_n10]
+[tag_Name_dc1_n0]
+[tag_Name_dc1_n1]
+[tag_Name_dc1_n2]
+[tag_Name_dc1_n3]
+[tag_Name_dc1_n4]
+[tag_Name_dc1_n5]
+[tag_Name_dc1_n6]
+[tag_Name_dc1_n7]
+[tag_Name_dc1_n8]
+[tag_Name_dc1_n9]
+[tag_Name_dc1_n10]
 
 [control:children]
-tag_Name_baas_1601_dc1_n0
+tag_Name_dc1_n0
 
 [planet:children]
 dc-1
 
 [dc-1:children]
-tag_Name_baas_1601_dc1_n1
-tag_Name_baas_1601_dc1_n2
-tag_Name_baas_1601_dc1_n3
-tag_Name_baas_1601_dc1_n4
-tag_Name_baas_1601_dc1_n5
-tag_Name_baas_1601_dc1_n6
-tag_Name_baas_1601_dc1_n7
-tag_Name_baas_1601_dc1_n8
-tag_Name_baas_1601_dc1_n9
-tag_Name_baas_1601_dc1_n10
+tag_Name_dc1_n1
+tag_Name_dc1_n2
+tag_Name_dc1_n3
+tag_Name_dc1_n4
+tag_Name_dc1_n5
+tag_Name_dc1_n6
+tag_Name_dc1_n7
+tag_Name_dc1_n8
+tag_Name_dc1_n9
+tag_Name_dc1_n10
 
 [elastic:children]
 dc-1-elastic
 
 [dc-1-elastic:children]
-tag_Name_baas_1601_dc1_n1
-tag_Name_baas_1601_dc1_n2
-tag_Name_baas_1601_dc1_n3
+tag_Name_dc1_n1
+tag_Name_dc1_n2
+tag_Name_dc1_n3
 
 [baas:children]
 dc-1-baas
 
 [dc-1-baas:children]
-tag_Name_baas_1601_dc1_n4
-tag_Name_baas_1601_dc1_n5
-tag_Name_baas_1601_dc1_n6
+tag_Name_dc1_n4
+tag_Name_dc1_n5
+tag_Name_dc1_n6
 
 [portal:children]
 dc-1-portal
 
 [dc-1-portal:children]
-tag_Name_baas_1601_dc1_n7
+tag_Name_dc1_n7
 
 [ds:children]
 dc-1-ds
@@ -60,9 +60,9 @@
 dc-1-cassandra
 
 [dc-1-cassandra:children]
-tag_Name_baas_1601_dc1_n8
-tag_Name_baas_1601_dc1_n9
-tag_Name_baas_1601_dc1_n10
+tag_Name_dc1_n8
+tag_Name_dc1_n9
+tag_Name_dc1_n10
 
 [dc-1-ms:children]
-tag_Name_baas_1601_dc1_n1
+tag_Name_dc1_n1
diff --git a/edge-1601-dc1/inventory b/edge-1601-dc1/inventory
index eae4a22..611fe2b 100644
--- a/edge-1601-dc1/inventory
+++ b/edge-1601-dc1/inventory
@@ -1,106 +1,106 @@
-[tag_Name_edge_1601_dc1_n1]
-[tag_Name_edge_1601_dc1_n2]
-[tag_Name_edge_1601_dc1_n3]
-[tag_Name_edge_1601_dc1_n4]
-[tag_Name_edge_1601_dc1_n5]
-[tag_Name_edge_1601_dc1_n6]
-[tag_Name_edge_1601_dc1_n7]
-[tag_Name_edge_1601_dc1_n8]
-[tag_Name_edge_1601_dc1_n9]
-[tag_Name_edge_1601_dc1_n10]
-[tag_Name_edge_1601_dc1_n11]
-[tag_Name_edge_1601_dc1_n12]
-[tag_Name_edge_1601_dc1_n13]
-[tag_Name_edge_1601_dc1_n14]
+[tag_Name_dc1_n1]
+[tag_Name_dc1_n2]
+[tag_Name_dc1_n3]
+[tag_Name_dc1_n4]
+[tag_Name_dc1_n5]
+[tag_Name_dc1_n6]
+[tag_Name_dc1_n7]
+[tag_Name_dc1_n8]
+[tag_Name_dc1_n9]
+[tag_Name_dc1_n10]
+[tag_Name_dc1_n11]
+[tag_Name_dc1_n12]
+[tag_Name_dc1_n13]
+[tag_Name_dc1_n14]
 
-[tag_Name_edge_1601_dc1_n3:vars]
+[tag_Name_dc1_n3:vars]
 zk_observer=true
 
-[tag_Name_edge_1601_dc1_n4:vars]
+[tag_Name_dc1_n4:vars]
 zk_observer=true
 
-[tag_Name_edge_1601_dc1_n5:vars]
+[tag_Name_dc1_n5:vars]
 zk_observer=true
 
 [planet:children]
 dc-1
 
 [dc-1:children]
-tag_Name_edge_1601_dc1_n1
-tag_Name_edge_1601_dc1_n2
-tag_Name_edge_1601_dc1_n3
-tag_Name_edge_1601_dc1_n4
-tag_Name_edge_1601_dc1_n5
-tag_Name_edge_1601_dc1_n6
-tag_Name_edge_1601_dc1_n7
-tag_Name_edge_1601_dc1_n8
-tag_Name_edge_1601_dc1_n9
-tag_Name_edge_1601_dc1_n10
-tag_Name_edge_1601_dc1_n11
-tag_Name_edge_1601_dc1_n12
-tag_Name_edge_1601_dc1_n13
-tag_Name_edge_1601_dc1_n14
+tag_Name_dc1_n1
+tag_Name_dc1_n2
+tag_Name_dc1_n3
+tag_Name_dc1_n4
+tag_Name_dc1_n5
+tag_Name_dc1_n6
+tag_Name_dc1_n7
+tag_Name_dc1_n8
+tag_Name_dc1_n9
+tag_Name_dc1_n10
+tag_Name_dc1_n11
+tag_Name_dc1_n12
+tag_Name_dc1_n13
+tag_Name_dc1_n14
 
 [ds:children]
 dc-1-ds
 
 [dc-1-ds:children]
-tag_Name_edge_1601_dc1_n1
-tag_Name_edge_1601_dc1_n2
-tag_Name_edge_1601_dc1_n3
-tag_Name_edge_1601_dc1_n4
-tag_Name_edge_1601_dc1_n5
-tag_Name_edge_1601_dc1_n6
-tag_Name_edge_1601_dc1_n7
-tag_Name_edge_1601_dc1_n8
+tag_Name_dc1_n1
+tag_Name_dc1_n2
+tag_Name_dc1_n3
+tag_Name_dc1_n4
+tag_Name_dc1_n5
+tag_Name_dc1_n6
+tag_Name_dc1_n7
+tag_Name_dc1_n8
 
 [ms:children]
 dc-1-ms
 
 [dc-1-ms:children]
-tag_Name_edge_1601_dc1_n1
+tag_Name_dc1_n1
 
 [ui:children]
 dc-1-ui
 
 [dc-1-ui:children]
-tag_Name_edge_1601_dc1_n1
+tag_Name_dc1_n1
 
 [ldap:children]
 dc-1-ldap
 
 [dc-1-ldap:children]
-tag_Name_edge_1601_dc1_n1
+tag_Name_dc1_n1
 
 [rmp:children]
 dc-1-rmp
 
 [dc-1-rmp:children]
-tag_Name_edge_1601_dc1_n9
-tag_Name_edge_1601_dc1_n10
+tag_Name_dc1_n9
+tag_Name_dc1_n10
 
 [qpid:children]
 dc-1-qpid
 
 [dc-1-qpid:children]
-tag_Name_edge_1601_dc1_n11
-tag_Name_edge_1601_dc1_n12
+tag_Name_dc1_n11
+tag_Name_dc1_n12
 
 [pg:children]
 dc-1-pg
 
 [dc-1-pg:children]
-tag_Name_edge_1601_dc1_n13
-tag_Name_edge_1601_dc1_n14
+tag_Name_dc1_n13
+tag_Name_dc1_n14
 
 [pgmaster:children]
 dc-1-pgmaster
 
 [dc-1-pgmaster:children]
-tag_Name_edge_1601_dc1_n13
+tag_Name_dc1_n13
 
 [pgstandby:children]
 dc-1-pgstandby
 
 [dc-1-pgstandby:children]
-tag_Name_edge_1601_dc1_n14
+tag_Name_dc1_n14