diff --git a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
index d6d5298..76aadbf 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
@@ -76,10 +76,10 @@
         name: att-workflow-driver
         must-exist: true
 
-    ALPHE3D1CEA3:
+    ALPHe3d1cea3:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ALPHE3D1CEA3
+        serial_number: ALPHe3d1cea3
         pon_port_id: 536870912
         device_id: of:00000000c0a863b6
       requirements:
@@ -87,10 +87,10 @@
             node: service#att
             relationship: tosca.relationships.BelongsToOne
 
-    ALPHE3D1CEE9:
+    ALPHe3d1cee9:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ALPHE3D1CEE9
+        serial_number: ALPHe3d1cee9
         pon_port_id: 536870912
         device_id: of:00000000c0a863b6
       requirements:
@@ -98,10 +98,10 @@
             node: service#att
             relationship: tosca.relationships.BelongsToOne
 
-    ISKT71E810C0:
+    ISKT71e810C0:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ISKT71E810C0
+        serial_number: ISKT71e810C0
         pon_port_id: 536870912
         device_id: of:00000000c0a863b6
       requirements:
@@ -109,10 +109,10 @@
             node: service#att
             relationship: tosca.relationships.BelongsToOne
 
-    ISKT71E81130:
+    ISKT71e81130:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ISKT71E81130
+        serial_number: ISKT71e81130
         pon_port_id: 536870913
         device_id: of:00000000c0a863b6
       requirements:
@@ -120,10 +120,10 @@
             node: service#att
             relationship: tosca.relationships.BelongsToOne
 
-    ISKT71E81050:
+    ISKT71e81050:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ISKT71E81050
+        serial_number: ISKT71e81050
         pon_port_id: 536870913
         device_id: of:00000000c0a863b6
       requirements:
diff --git a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
index d558a37..4381e56 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
@@ -23,62 +23,62 @@
 topology_template:
   node_templates:
 
-    ISKT71E81130:
+    ISKT71e81130:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: ISKT71E81130
+        name: ISKT71e81130
         status: pre-provisioned
         s_tag: 111
         c_tag: 11
-        onu_device: ISKT71E81130
-        nas_port_id : "nas-port-id-ISKT71E81130"
-        circuit_id: "circuit-id-ISKT71E81130"
-        remote_id: "remote-id-ISKT71E81130"
+        onu_device: ISKT71e81130
+        nas_port_id : "nas-port-id-ISKT71e81130"
+        circuit_id: "circuit-id-ISKT71e81130"
+        remote_id: "remote-id-ISKT71e81130"
 
-    ISKT71E81050:
+    ISKT71e81050:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: ISKT71E81050
+        name: ISKT71e81050
         status: pre-provisioned
         s_tag: 111
         c_tag: 22
-        onu_device: ISKT71E81050
-        nas_port_id : "nas-port-id-ISKT71E81050"
-        circuit_id: "circuit-id-ISKT71E81050"
-        remote_id: "remote-id-ISKT71E81050"
+        onu_device: ISKT71e81050
+        nas_port_id : "nas-port-id-ISKT71e81050"
+        circuit_id: "circuit-id-ISKT71e81050"
+        remote_id: "remote-id-ISKT71e81050"
 
-    ISKT71E810C0:
+    ISKT71e810C0:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: ISKT71E810C0
+        name: ISKT71e810C0
         status: pre-provisioned
         s_tag: 111
         c_tag: 33
-        onu_device: ISKT71E810C0
-        nas_port_id : "nas-port-id-ISKT71E810C0"
-        circuit_id: "circuit-id-ISKT71E810C0"
-        remote_id: "remote-id-ISKT71E810C0"
+        onu_device: ISKT71e810C0
+        nas_port_id : "nas-port-id-ISKT71e810C0"
+        circuit_id: "circuit-id-ISKT71e810C0"
+        remote_id: "remote-id-ISKT71e810C0"
 
-    ALPHE3D1CEA3:
+    ALPHe3d1cea3:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: ALPHE3D1CEA3
+        name: ALPHe3d1cea3
         status: pre-provisioned
         s_tag: 111
         c_tag: 44
-        onu_device: ALPHE3D1CEA3
-        nas_port_id : "nas-port-id-ALPHE3D1CEA3"
-        circuit_id: "circuit-id-ALPHE3D1CEA3"
-        remote_id: "remote-id-ALPHE3D1CEA3"
+        onu_device: ALPHe3d1cea3
+        nas_port_id : "nas-port-id-ALPHe3d1cea3"
+        circuit_id: "circuit-id-ALPHe3d1cea3"
+        remote_id: "remote-id-ALPHe3d1cea3"
 
-    ALPHE3D1CEE9:
+    ALPHe3d1cee9:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: ALPHE3D1CEE9
+        name: ALPHe3d1cee9
         status: pre-provisioned
         s_tag: 111
         c_tag: 55
-        onu_device: ALPHE3D1CEE9
-        nas_port_id : "nas-port-id-ALPHE3D1CEE9"
-        circuit_id: "circuit-id-ALPHE3D1CEE9"
-        remote_id: "remote-id-ALPHE3D1CEE9"
+        onu_device: ALPHe3d1cee9
+        nas_port_id : "nas-port-id-ALPHe3d1cee9"
+        circuit_id: "circuit-id-ALPHe3d1cee9"
+        remote_id: "remote-id-ALPHe3d1cee9"