diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index 4b88c13..8914df9 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -29,14 +29,14 @@
 
 topology_template:
   node_templates:
-    switch#leaf_1:
+    switch#agg_sw:
       type: tosca.nodes.Switch
       properties:
         driver: ofdpa3
         ipv4Loopback: 192.168.0.201
         ipv4NodeSid: 17
         isEdgeRouter: True
-        name: leaf_1
+        name: AGG SWITCH
         ofId: of:0000000000000001
         routerMac: 00:00:02:01:06:01
 
@@ -48,7 +48,7 @@
         host_learning: false
       requirements:
         - switch:
-            node: switch#leaf_1
+            node: switch#agg_sw
             relationship: tosca.relationships.BelongsToOne
 
     # Setup the Adtran OLT switch port
@@ -59,7 +59,7 @@
         host_learning: false
       requirements:
         - switch:
-            node: switch#leaf_1
+            node: switch#agg_sw
             relationship: tosca.relationships.BelongsToOne
 
     # Setup the CIG OLT switch port
@@ -70,7 +70,7 @@
         host_learning: false
       requirements:
         - switch:
-            node: switch#leaf_1
+            node: switch#agg_sw
             relationship: tosca.relationships.BelongsToOne
 
     # # Setup the Iskratel XGS-PON OLT switch port
@@ -81,7 +81,7 @@
     #     host_learning: false
     #   requirements:
     #     - switch:
-    #         node: switch#leaf_1
+    #         node: switch#agg_sw
     #         relationship: tosca.relationships.BelongsToOne
 
     # Setup the Iskratel GPON OLT switch port
@@ -92,7 +92,7 @@
         host_learning: false
       requirements:
         - switch:
-            node: switch#leaf_1
+            node: switch#agg_sw
             relationship: tosca.relationships.BelongsToOne
 
     # Port connected to the BNG
@@ -102,7 +102,7 @@
         portId: 48
       requirements:
         - switch:
-            node: switch#leaf_1
+            node: switch#agg_sw
             relationship: tosca.relationships.BelongsToOne
 
     # Setup the fabric switch port where the external