diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index 147a252..2250538 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -190,10 +190,10 @@
             relationship: tosca.relationships.BelongsToOne
 
     # ONUs connected to CIG OLT
-    CIG:
+    CIGG18a00002:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: CIG
+        serial_number: CIGG18a00002
         pon_port_id: 536870913
         device_id: of:00000000C0A86471
       requirements:
diff --git a/tosca-configs/att-workflow/bbwf-subscriber.yaml b/tosca-configs/att-workflow/bbwf-subscriber.yaml
index fa32b21..2591811 100755
--- a/tosca-configs/att-workflow/bbwf-subscriber.yaml
+++ b/tosca-configs/att-workflow/bbwf-subscriber.yaml
@@ -77,11 +77,11 @@
     cig_subscriber_1:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: Sub_CIG
+        name: Sub_CIGG18a00002
         status: pre-provisioned
         c_tag: 11
         s_tag: 333
-        onu_device: CIG
+        onu_device: CIGG18a00002
         nas_port_id : "PON 1/1/05/1:1.1.1"
         circuit_id: cig_sub1_circuit
         remote_id: cig_sub1_remote