diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/view.json
index d7a7940..6b69277 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/view.json	
@@ -40,7 +40,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-1"
+          "name": "NCP1_1"
         },
         "position": {
           "height": 20,
@@ -75,7 +75,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-2"
+          "name": "NCP1_2"
         },
         "position": {
           "height": 20,
@@ -110,7 +110,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3"
+          "name": "NCP1_3"
         },
         "position": {
           "height": 20,
@@ -145,7 +145,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-4"
+          "name": "NCP1_4"
         },
         "position": {
           "height": 20,
@@ -180,7 +180,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-5"
+          "name": "NCP1_5"
         },
         "position": {
           "height": 20,
@@ -212,7 +212,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-6"
+          "name": "NCP1_6"
         },
         "position": {
           "height": 20,
@@ -244,7 +244,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-7"
+          "name": "NCP1_7"
         },
         "position": {
           "height": 20,
@@ -276,7 +276,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-8"
+          "name": "NCP1_8"
         },
         "position": {
           "height": 20,
@@ -308,7 +308,7 @@
       },
       {
         "meta": {
-          "name": "UL1-19"
+          "name": "UL1_19"
         },
         "position": {
           "height": 20,
@@ -343,7 +343,7 @@
       },
       {
         "meta": {
-          "name": "UL1-20"
+          "name": "UL1_20"
         },
         "position": {
           "height": 20,
@@ -378,7 +378,7 @@
       },
       {
         "meta": {
-          "name": "UL1-18"
+          "name": "UL1_18"
         },
         "position": {
           "height": 20,
@@ -413,7 +413,7 @@
       },
       {
         "meta": {
-          "name": "UL1-17"
+          "name": "UL1_17"
         },
         "position": {
           "height": 20,
@@ -445,7 +445,7 @@
       },
       {
         "meta": {
-          "name": "UL1-16"
+          "name": "UL1_16"
         },
         "position": {
           "height": 20,
@@ -477,7 +477,7 @@
       },
       {
         "meta": {
-          "name": "UL1-15"
+          "name": "UL1_15"
         },
         "position": {
           "height": 20,
@@ -509,7 +509,7 @@
       },
       {
         "meta": {
-          "name": "UL1-14"
+          "name": "UL1_14"
         },
         "position": {
           "height": 20,
@@ -541,7 +541,7 @@
       },
       {
         "meta": {
-          "name": "UL4-19"
+          "name": "UL4_19"
         },
         "position": {
           "height": 20,
@@ -576,7 +576,7 @@
       },
       {
         "meta": {
-          "name": "UL4-20"
+          "name": "UL4_20"
         },
         "position": {
           "height": 20,
@@ -611,7 +611,7 @@
       },
       {
         "meta": {
-          "name": "UL4-18"
+          "name": "UL4_18"
         },
         "position": {
           "height": 20,
@@ -646,7 +646,7 @@
       },
       {
         "meta": {
-          "name": "UL4-17"
+          "name": "UL4_17"
         },
         "position": {
           "height": 20,
@@ -678,7 +678,7 @@
       },
       {
         "meta": {
-          "name": "UL4-16"
+          "name": "UL4_16"
         },
         "position": {
           "height": 20,
@@ -710,7 +710,7 @@
       },
       {
         "meta": {
-          "name": "UL4-15"
+          "name": "UL4_15"
         },
         "position": {
           "height": 20,
@@ -742,7 +742,7 @@
       },
       {
         "meta": {
-          "name": "UL4-14"
+          "name": "UL4_14"
         },
         "position": {
           "height": 20,
@@ -774,7 +774,7 @@
       },
       {
         "meta": {
-          "name": "UL7-19"
+          "name": "UL7_19"
         },
         "position": {
           "height": 20,
@@ -809,7 +809,7 @@
       },
       {
         "meta": {
-          "name": "UL7-20"
+          "name": "UL7_20"
         },
         "position": {
           "height": 20,
@@ -844,7 +844,7 @@
       },
       {
         "meta": {
-          "name": "UL7-18"
+          "name": "UL7_18"
         },
         "position": {
           "height": 20,
@@ -879,7 +879,7 @@
       },
       {
         "meta": {
-          "name": "UL7-17"
+          "name": "UL7_17"
         },
         "position": {
           "height": 20,
@@ -911,7 +911,7 @@
       },
       {
         "meta": {
-          "name": "UL7-16"
+          "name": "UL7_16"
         },
         "position": {
           "height": 20,
@@ -943,7 +943,7 @@
       },
       {
         "meta": {
-          "name": "UL7-15"
+          "name": "UL7_15"
         },
         "position": {
           "height": 20,
@@ -975,7 +975,7 @@
       },
       {
         "meta": {
-          "name": "UL7-14"
+          "name": "UL7_14"
         },
         "position": {
           "height": 20,
@@ -1007,7 +1007,7 @@
       },
       {
         "meta": {
-          "name": "UL11-19"
+          "name": "UL11_19"
         },
         "position": {
           "height": 20,
@@ -1042,7 +1042,7 @@
       },
       {
         "meta": {
-          "name": "UL11-20"
+          "name": "UL11_20"
         },
         "position": {
           "height": 20,
@@ -1077,7 +1077,7 @@
       },
       {
         "meta": {
-          "name": "UL11-18"
+          "name": "UL11_18"
         },
         "position": {
           "height": 20,
@@ -1112,7 +1112,7 @@
       },
       {
         "meta": {
-          "name": "UL11-17"
+          "name": "UL11_17"
         },
         "position": {
           "height": 20,
@@ -1144,7 +1144,7 @@
       },
       {
         "meta": {
-          "name": "UL11-16"
+          "name": "UL11_16"
         },
         "position": {
           "height": 20,
@@ -1176,7 +1176,7 @@
       },
       {
         "meta": {
-          "name": "UL11-15"
+          "name": "UL11_15"
         },
         "position": {
           "height": 20,
@@ -1208,7 +1208,7 @@
       },
       {
         "meta": {
-          "name": "UL11-14"
+          "name": "UL11_14"
         },
         "position": {
           "height": 20,
@@ -1240,7 +1240,7 @@
       },
       {
         "meta": {
-          "name": "UL13-18"
+          "name": "UL13_18"
         },
         "position": {
           "height": 20,
@@ -1275,7 +1275,7 @@
       },
       {
         "meta": {
-          "name": "UL13-19"
+          "name": "UL13_19"
         },
         "position": {
           "height": 20,
@@ -1310,7 +1310,7 @@
       },
       {
         "meta": {
-          "name": "UL13-17"
+          "name": "UL13_17"
         },
         "position": {
           "height": 20,
@@ -1345,7 +1345,7 @@
       },
       {
         "meta": {
-          "name": "UL13-16"
+          "name": "UL13_16"
         },
         "position": {
           "height": 20,
@@ -1377,7 +1377,7 @@
       },
       {
         "meta": {
-          "name": "UL13-15"
+          "name": "UL13_15"
         },
         "position": {
           "height": 20,
@@ -1409,7 +1409,7 @@
       },
       {
         "meta": {
-          "name": "UL13-14"
+          "name": "UL13_14"
         },
         "position": {
           "height": 20,
@@ -1441,7 +1441,7 @@
       },
       {
         "meta": {
-          "name": "UL13-13"
+          "name": "UL13_13"
         },
         "position": {
           "height": 20,
@@ -1473,7 +1473,7 @@
       },
       {
         "meta": {
-          "name": "UL18-22"
+          "name": "UL18_22"
         },
         "position": {
           "height": 20,
@@ -1508,7 +1508,7 @@
       },
       {
         "meta": {
-          "name": "UL18-23"
+          "name": "UL18_23"
         },
         "position": {
           "height": 20,
@@ -1543,7 +1543,7 @@
       },
       {
         "meta": {
-          "name": "UL18-21"
+          "name": "UL18_21"
         },
         "position": {
           "height": 20,
@@ -1578,7 +1578,7 @@
       },
       {
         "meta": {
-          "name": "UL18-20"
+          "name": "UL18_20"
         },
         "position": {
           "height": 20,
@@ -1610,7 +1610,7 @@
       },
       {
         "meta": {
-          "name": "UL18-19"
+          "name": "UL18_19"
         },
         "position": {
           "height": 20,
@@ -1642,7 +1642,7 @@
       },
       {
         "meta": {
-          "name": "UL18-18"
+          "name": "UL18_18"
         },
         "position": {
           "height": 20,
@@ -1674,7 +1674,7 @@
       },
       {
         "meta": {
-          "name": "UL18-17"
+          "name": "UL18_17"
         },
         "position": {
           "height": 20,
@@ -1706,7 +1706,7 @@
       },
       {
         "meta": {
-          "name": "UL21-23"
+          "name": "UL21_23"
         },
         "position": {
           "height": 20,
@@ -1741,7 +1741,7 @@
       },
       {
         "meta": {
-          "name": "UL21-24"
+          "name": "UL21_24"
         },
         "position": {
           "height": 20,
@@ -1776,7 +1776,7 @@
       },
       {
         "meta": {
-          "name": "UL21-22"
+          "name": "UL21_22"
         },
         "position": {
           "height": 20,
@@ -1811,7 +1811,7 @@
       },
       {
         "meta": {
-          "name": "UL21-21"
+          "name": "UL21_21"
         },
         "position": {
           "height": 20,
@@ -1843,7 +1843,7 @@
       },
       {
         "meta": {
-          "name": "UL21-20"
+          "name": "UL21_20"
         },
         "position": {
           "height": 20,
@@ -1875,7 +1875,7 @@
       },
       {
         "meta": {
-          "name": "UL21-19"
+          "name": "UL21_19"
         },
         "position": {
           "height": 20,
@@ -1907,7 +1907,7 @@
       },
       {
         "meta": {
-          "name": "UL21-18"
+          "name": "UL21_18"
         },
         "position": {
           "height": 20,
@@ -1939,7 +1939,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-1_EPC2_Line"
+          "name": "NCP1_1_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -1974,7 +1974,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-1_EPC2"
+          "name": "NCP1_1_EPC2"
         },
         "position": {
           "height": 32,
@@ -2009,7 +2009,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-1_EPC1_Line_2"
+          "name": "NCP1_1_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -2044,7 +2044,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-2_EPC2_Line"
+          "name": "NCP1_2_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -2079,7 +2079,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-2_EPC2_END"
+          "name": "NCP1_2_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -2114,7 +2114,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-2_EPC1_Line_2"
+          "name": "NCP1_2_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -2149,7 +2149,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-2_EPC2"
+          "name": "NCP1_2_EPC2"
         },
         "position": {
           "height": 32,
@@ -2184,7 +2184,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC2_Line_1"
+          "name": "NCP1_3_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -2219,7 +2219,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-8-EPC2_Line"
+          "name": "NCP1_8_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -2254,7 +2254,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-8-EPC1_Line"
+          "name": "NCP1_8_EPC1_Line"
         },
         "position": {
           "height": 6,
@@ -2289,7 +2289,7 @@
       },
       {
         "meta": {
-          "name": "UL1-14_EPC1_Line_1"
+          "name": "UL1_14_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -2324,7 +2324,7 @@
       },
       {
         "meta": {
-          "name": "UL1-14_EPC2_Line_1"
+          "name": "UL1_14_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -2359,7 +2359,7 @@
       },
       {
         "meta": {
-          "name": "UL1-14_EPC1_Line_2"
+          "name": "UL1_14_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -2394,7 +2394,7 @@
       },
       {
         "meta": {
-          "name": "UL1-14_EPC1_END"
+          "name": "UL1_14_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -2429,7 +2429,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-1_EPC1_Line_1"
+          "name": "NCP1_1_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -2464,7 +2464,7 @@
       },
       {
         "meta": {
-          "name": "UL1-14_EPC2_Line_2"
+          "name": "UL1_14_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -2499,7 +2499,7 @@
       },
       {
         "meta": {
-          "name": "UL1-14_EPC2_END"
+          "name": "UL1_14_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -2534,7 +2534,7 @@
       },
       {
         "meta": {
-          "name": "UL4-14_EPC2_Line_1"
+          "name": "UL4_14_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -2569,7 +2569,7 @@
       },
       {
         "meta": {
-          "name": "UL4-14_EPC2_Line_2"
+          "name": "UL4_14_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -2604,7 +2604,7 @@
       },
       {
         "meta": {
-          "name": "UL4-14_EPC1_Line_1"
+          "name": "UL4_14_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -2639,7 +2639,7 @@
       },
       {
         "meta": {
-          "name": "UL4-14_EPC1_Line_2"
+          "name": "UL4_14_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -2674,7 +2674,7 @@
       },
       {
         "meta": {
-          "name": "UL4-14_EPC1_END"
+          "name": "UL4_14_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -2709,7 +2709,7 @@
       },
       {
         "meta": {
-          "name": "UL7-14_EPC2_Line_1"
+          "name": "UL7_14_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -2744,7 +2744,7 @@
       },
       {
         "meta": {
-          "name": "UL7-14_EPC1_Line_1"
+          "name": "UL7_14_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -2779,7 +2779,7 @@
       },
       {
         "meta": {
-          "name": "UL11-14_EPC1_Line_2"
+          "name": "UL11_14_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -2814,7 +2814,7 @@
       },
       {
         "meta": {
-          "name": "UL7-14_EPC2_Line_2"
+          "name": "UL7_14_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -2849,7 +2849,7 @@
       },
       {
         "meta": {
-          "name": "UL7-14_EPC2_END"
+          "name": "UL7_14_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -2884,7 +2884,7 @@
       },
       {
         "meta": {
-          "name": "UL11-14_EPC2_Line_1"
+          "name": "UL11_14_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -2919,7 +2919,7 @@
       },
       {
         "meta": {
-          "name": "UL11-14_EPC1_Line_1"
+          "name": "UL11_14_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -2954,7 +2954,7 @@
       },
       {
         "meta": {
-          "name": "UL11-14_EPC2_Line_2"
+          "name": "UL11_14_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -2989,7 +2989,7 @@
       },
       {
         "meta": {
-          "name": "UL11-14_EPC2_END"
+          "name": "UL11_14_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -3024,7 +3024,7 @@
       },
       {
         "meta": {
-          "name": "UL11-14_EPC1_END"
+          "name": "UL11_14_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -3059,7 +3059,7 @@
       },
       {
         "meta": {
-          "name": "UL13-13_EPC2_Line_1"
+          "name": "UL13_13_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -3094,7 +3094,7 @@
       },
       {
         "meta": {
-          "name": "UL13-13_EPC1_Line_1"
+          "name": "UL13_13_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -3129,7 +3129,7 @@
       },
       {
         "meta": {
-          "name": "UL13-13_EPC2_Line_2"
+          "name": "UL13_13_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -3164,7 +3164,7 @@
       },
       {
         "meta": {
-          "name": "UL13-13_EPC1_Line_2"
+          "name": "UL13_13_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -3199,7 +3199,7 @@
       },
       {
         "meta": {
-          "name": "UL13-13_EPC2_END"
+          "name": "UL13_13_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -3234,7 +3234,7 @@
       },
       {
         "meta": {
-          "name": "UL13-13_EPC1_END"
+          "name": "UL13_13_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -3269,7 +3269,7 @@
       },
       {
         "meta": {
-          "name": "UL18-17_EPC1_Line_1"
+          "name": "UL18_17_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -3304,7 +3304,7 @@
       },
       {
         "meta": {
-          "name": "UL18-17_EPC2_Line_1"
+          "name": "UL18_17_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -3339,7 +3339,7 @@
       },
       {
         "meta": {
-          "name": "UL18-17_EPC2_Line_2"
+          "name": "UL18_17_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -3374,7 +3374,7 @@
       },
       {
         "meta": {
-          "name": "UL18-17_EPC2_END"
+          "name": "UL18_17_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -3409,7 +3409,7 @@
       },
       {
         "meta": {
-          "name": "UL18-17_EPC1_Line_2"
+          "name": "UL18_17_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -3444,7 +3444,7 @@
       },
       {
         "meta": {
-          "name": "UL21-18_EPC2_Line_1"
+          "name": "UL21_18_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -3479,7 +3479,7 @@
       },
       {
         "meta": {
-          "name": "UL21-18_EPC2_Line_2"
+          "name": "UL21_18_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -3514,7 +3514,7 @@
       },
       {
         "meta": {
-          "name": "UL21-18_EPC2_END"
+          "name": "UL21_18_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -3549,7 +3549,7 @@
       },
       {
         "meta": {
-          "name": "UL21-18_EPC1_Line_2"
+          "name": "UL21_18_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -3584,7 +3584,7 @@
       },
       {
         "meta": {
-          "name": "UL21-18_EPC1_Line_1"
+          "name": "UL21_18_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -3619,7 +3619,7 @@
       },
       {
         "meta": {
-          "name": "UL4-14_EPC2_END"
+          "name": "UL4_14_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -3654,7 +3654,7 @@
       },
       {
         "meta": {
-          "name": "UL7-14_EPC1_Line_2"
+          "name": "UL7_14_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -3689,7 +3689,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC1_Line_4"
+          "name": "NCP1_3_EPC1_Line_4"
         },
         "position": {
           "height": 6,
@@ -3724,7 +3724,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-8-EPC2_END"
+          "name": "NCP1_8_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -3759,7 +3759,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-8-EPC1_END"
+          "name": "NCP1_8_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -3794,7 +3794,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC1_Line_5"
+          "name": "NCP1_3_EPC1_Line_5"
         },
         "position": {
           "height": 6,
@@ -3829,7 +3829,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-2_EPC1_Line_1"
+          "name": "NCP1_2_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -3864,7 +3864,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-2_EPC1"
+          "name": "NCP1_2_EPC1"
         },
         "position": {
           "height": 32,
@@ -3899,7 +3899,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-2_EPC1_Line_3"
+          "name": "NCP1_2_EPC1_Line_3"
         },
         "position": {
           "height": 6,
@@ -3934,7 +3934,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-2_EPC1_END"
+          "name": "NCP1_2_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -3969,7 +3969,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-8-EPC2"
+          "name": "NCP1_8_EPC2"
         },
         "position": {
           "height": 32,
@@ -4004,7 +4004,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-8-EPC1"
+          "name": "NCP1_8_EPC1"
         },
         "position": {
           "height": 32,
@@ -4039,7 +4039,7 @@
       },
       {
         "meta": {
-          "name": "UL21-18_EPC1_END"
+          "name": "UL21_18_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -4074,7 +4074,7 @@
       },
       {
         "meta": {
-          "name": "UL1-14_EPC1"
+          "name": "UL1_14_EPC1"
         },
         "position": {
           "height": 32,
@@ -4109,7 +4109,7 @@
       },
       {
         "meta": {
-          "name": "UL1-14_EPC2"
+          "name": "UL1_14_EPC2"
         },
         "position": {
           "height": 32,
@@ -4144,7 +4144,7 @@
       },
       {
         "meta": {
-          "name": "UL4-14_EPC2"
+          "name": "UL4_14_EPC2"
         },
         "position": {
           "height": 32,
@@ -4179,7 +4179,7 @@
       },
       {
         "meta": {
-          "name": "UL4-14_EPC1"
+          "name": "UL4_14_EPC1"
         },
         "position": {
           "height": 32,
@@ -4214,7 +4214,7 @@
       },
       {
         "meta": {
-          "name": "UL7-14_EPC1"
+          "name": "UL7_14_EPC1"
         },
         "position": {
           "height": 32,
@@ -4249,7 +4249,7 @@
       },
       {
         "meta": {
-          "name": "UL7-14_EPC2"
+          "name": "UL7_14_EPC2"
         },
         "position": {
           "height": 32,
@@ -4284,7 +4284,7 @@
       },
       {
         "meta": {
-          "name": "UL11-14_EPC1"
+          "name": "UL11_14_EPC1"
         },
         "position": {
           "height": 32,
@@ -4354,7 +4354,7 @@
       },
       {
         "meta": {
-          "name": "UL13-13_EPC1"
+          "name": "UL13_13_EPC1"
         },
         "position": {
           "height": 32,
@@ -4389,7 +4389,7 @@
       },
       {
         "meta": {
-          "name": "UL13-13_EPC2"
+          "name": "UL13_13_EPC2"
         },
         "position": {
           "height": 32,
@@ -4424,7 +4424,7 @@
       },
       {
         "meta": {
-          "name": "UL18-17_EPC1"
+          "name": "UL18_17_EPC1"
         },
         "position": {
           "height": 32,
@@ -4459,7 +4459,7 @@
       },
       {
         "meta": {
-          "name": "UL18-17_EPC2"
+          "name": "UL18_17_EPC2"
         },
         "position": {
           "height": 32,
@@ -4494,7 +4494,7 @@
       },
       {
         "meta": {
-          "name": "UL21-18_EPC2"
+          "name": "UL21_18_EPC2"
         },
         "position": {
           "height": 32,
@@ -4529,7 +4529,7 @@
       },
       {
         "meta": {
-          "name": "UL21-18_EPC1"
+          "name": "UL21_18_EPC1"
         },
         "position": {
           "height": 32,
@@ -4564,7 +4564,7 @@
       },
       {
         "meta": {
-          "name": "UL7-14_EPC1_END"
+          "name": "UL7_14_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -4599,7 +4599,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC2"
+          "name": "NCP1_3_EPC2"
         },
         "position": {
           "height": 32,
@@ -4634,7 +4634,7 @@
       },
       {
         "meta": {
-          "name": "UL18-17_EPC1_END"
+          "name": "UL18_17_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -4669,7 +4669,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC1_Line_1"
+          "name": "NCP1_3_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -4704,7 +4704,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC1"
+          "name": "NCP1_3_EPC1"
         },
         "position": {
           "height": 32,
@@ -4739,7 +4739,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC1_Line_6"
+          "name": "NCP1_3_EPC1_Line_6"
         },
         "position": {
           "height": 6,
@@ -4774,7 +4774,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC1_END"
+          "name": "NCP1_3_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -4809,7 +4809,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC2_Line_2"
+          "name": "NCP1_3_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -4844,7 +4844,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC2_END"
+          "name": "NCP1_3_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -5039,7 +5039,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-1_EPC1"
+          "name": "NCP1_1_EPC1"
         },
         "position": {
           "height": 32,
@@ -5074,7 +5074,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-1_EPC2_END"
+          "name": "NCP1_1_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -5109,7 +5109,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-1_EPC1_Line_3"
+          "name": "NCP1_1_EPC1_Line_3"
         },
         "position": {
           "height": 6,
@@ -5144,7 +5144,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-1_EPC1_END"
+          "name": "NCP1_1_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -5179,7 +5179,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC1_Line_2"
+          "name": "NCP1_3_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -5214,7 +5214,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-3-EPC1_Line_3"
+          "name": "NCP1_3_EPC1_Line_3"
         },
         "position": {
           "height": 6,
@@ -6296,7 +6296,7 @@
       },
       {
         "meta": {
-          "name": "NCP1-8_MCM06_Button",
+          "name": "NCP1_8_MCM06_Button",
           "tooltip": {
             "text": "MCM06 Non Con"
           }
@@ -6343,7 +6343,7 @@
       },
       {
         "meta": {
-          "name": "UL13-13_MCM02_Button",
+          "name": "UL13_13_MCM02_Button",
           "tooltip": {
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }
@@ -6389,7 +6389,7 @@
       },
       {
         "meta": {
-          "name": "UL1-14_MCM01_Button",
+          "name": "UL1_14_MCM01_Button",
           "tooltip": {
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
@@ -6435,7 +6435,7 @@
       },
       {
         "meta": {
-          "name": "UL4-14_MCM01_Button",
+          "name": "UL4_14_MCM01_Button",
           "tooltip": {
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
@@ -6481,7 +6481,7 @@
       },
       {
         "meta": {
-          "name": "UL7-14_MCM01_Button",
+          "name": "UL7_14_MCM01_Button",
           "tooltip": {
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
@@ -6527,7 +6527,7 @@
       },
       {
         "meta": {
-          "name": "UL11-15_MCM01_Button",
+          "name": "UL11_15_MCM01_Button",
           "tooltip": {
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
@@ -6573,7 +6573,7 @@
       },
       {
         "meta": {
-          "name": "UL18-17_MCM02_Button",
+          "name": "UL18_17_MCM02_Button",
           "tooltip": {
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }
@@ -6619,7 +6619,7 @@
       },
       {
         "meta": {
-          "name": "UL21-18_MCM02_Button",
+          "name": "UL21_18_MCM02_Button",
           "tooltip": {
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }