diff --git a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Bulk Inbound/view.json b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Bulk Inbound/view.json
index dafd4b2..bb57bbc 100644
--- a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Bulk Inbound/view.json	
+++ b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Bulk Inbound/view.json	
@@ -44,7 +44,7 @@
           "groupSuffix": "u",
           "id": "rect1-6-2-0-0-4-8-1-2-8-3-1-5-1-6",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC3-6",
+          "name": "ULC3_6",
           "originalName": "ULC3-6"
         },
         "position": {
@@ -68,7 +68,7 @@
           "groupSuffix": "u",
           "id": "rect1-6-2-0-0-6-8-2",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-9B",
+          "name": "ULC1_9B",
           "originalName": "ULC1-9"
         },
         "position": {
@@ -92,7 +92,7 @@
           "groupSuffix": "u",
           "id": "rect1-6-2-3-6-8-3-6-7",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-12",
+          "name": "ULC1_12",
           "originalName": "ULC1-12"
         },
         "position": {
@@ -116,7 +116,7 @@
           "groupSuffix": "u",
           "id": "rect1-6-2-3-6-8-3-6-2-7",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-11",
+          "name": "ULC1_11",
           "originalName": "ULC1-11"
         },
         "position": {
@@ -140,7 +140,7 @@
           "groupSuffix": "u",
           "id": "rect1-6-2-3-6-8-3-6-4-9",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-10",
+          "name": "ULC1_10",
           "originalName": "ULC1-10"
         },
         "position": {
@@ -164,7 +164,7 @@
           "groupSuffix": "u",
           "id": "rect1-6-2-0-0-6-8-3-3",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-8",
+          "name": "ULC1_8",
           "originalName": "ULC1-8"
         },
         "position": {
@@ -187,7 +187,7 @@
           "groupSuffix": "u",
           "id": "path4",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-2",
+          "name": "ULC1_2",
           "originalName": "ULC1-2"
         },
         "position": {
@@ -211,7 +211,7 @@
           "groupSuffix": "u",
           "id": "rect5",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-1",
+          "name": "ULC1_1",
           "originalName": "ULC1-1"
         },
         "position": {
@@ -235,7 +235,7 @@
           "groupSuffix": "u",
           "id": "rect11",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-12",
+          "name": "ULC2_12",
           "originalName": "ULC2-12"
         },
         "position": {
@@ -259,7 +259,7 @@
           "groupSuffix": "u",
           "id": "rect12",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-11",
+          "name": "ULC2_11",
           "originalName": "ULC2-11"
         },
         "position": {
@@ -283,7 +283,7 @@
           "groupSuffix": "u",
           "id": "rect13",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-10",
+          "name": "ULC2_10",
           "originalName": "ULC2-10"
         },
         "position": {
@@ -307,7 +307,7 @@
           "groupSuffix": "u",
           "id": "rect14",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-8",
+          "name": "ULC2_8",
           "originalName": "ULC2-8"
         },
         "position": {
@@ -330,7 +330,7 @@
           "groupSuffix": "u",
           "id": "path14",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-2",
+          "name": "ULC2_2",
           "originalName": "ULC2-2"
         },
         "position": {
@@ -354,7 +354,7 @@
           "groupSuffix": "u",
           "id": "rect15",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-1",
+          "name": "ULC2_1",
           "originalName": "ULC2-1"
         },
         "position": {
@@ -378,7 +378,7 @@
           "groupSuffix": "u",
           "id": "rect18",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC4-6",
+          "name": "ULC4_6",
           "originalName": "ULC4-6"
         },
         "position": {
@@ -402,7 +402,7 @@
           "groupSuffix": "l",
           "id": "rect1-6-2-0-0-4-8-1",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-6",
+          "name": "ULC1_6",
           "originalName": "ULC1-6"
         },
         "position": {
@@ -426,7 +426,7 @@
           "groupSuffix": "l",
           "id": "rect1-6-2-0-0-4-8-1-2",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-5",
+          "name": "ULC1_5",
           "originalName": "ULC1-5"
         },
         "position": {
@@ -450,7 +450,7 @@
           "groupSuffix": "l",
           "id": "rect1-6-2-0-0-4-8-1-2-8",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-4",
+          "name": "ULC1_4",
           "originalName": "ULC1-4"
         },
         "position": {
@@ -474,7 +474,7 @@
           "groupSuffix": "l",
           "id": "rect1-6-2-0-0-4-8-1-2-8-1",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-3",
+          "name": "ULC1_3",
           "originalName": "ULC1-3"
         },
         "position": {
@@ -497,7 +497,7 @@
           "groupSuffix": "l",
           "id": "path4-9-3",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-7",
+          "name": "ULC1_7",
           "originalName": "ULC1-7"
         },
         "position": {
@@ -521,7 +521,7 @@
           "groupSuffix": "l",
           "id": "rect1-6-2-0-0-4-8-1-2-2-0",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC3-4",
+          "name": "ULC3_4",
           "originalName": "ULC3-4"
         },
         "position": {
@@ -544,7 +544,7 @@
           "groupSuffix": "l",
           "id": "path10-8",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC3-5",
+          "name": "ULC3_5",
           "originalName": "ULC3-5"
         },
         "position": {
@@ -568,7 +568,7 @@
           "groupSuffix": "l",
           "id": "rect6",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-6",
+          "name": "ULC2_6",
           "originalName": "ULC2-6"
         },
         "position": {
@@ -592,7 +592,7 @@
           "groupSuffix": "l",
           "id": "rect7",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-5",
+          "name": "ULC2_5",
           "originalName": "ULC2-5"
         },
         "position": {
@@ -616,7 +616,7 @@
           "groupSuffix": "l",
           "id": "rect8",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-4",
+          "name": "ULC2_4",
           "originalName": "ULC2-4"
         },
         "position": {
@@ -640,7 +640,7 @@
           "groupSuffix": "l",
           "id": "rect9",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-3",
+          "name": "ULC2_3",
           "originalName": "ULC2-3"
         },
         "position": {
@@ -663,7 +663,7 @@
           "groupSuffix": "l",
           "id": "path9",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-7",
+          "name": "ULC2_7",
           "originalName": "ULC2-7"
         },
         "position": {
@@ -687,7 +687,7 @@
           "groupSuffix": "l",
           "id": "rect10",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-9B",
+          "name": "ULC2_9B",
           "originalName": "ULC2-9"
         },
         "position": {
@@ -711,7 +711,7 @@
           "groupSuffix": "l",
           "id": "rect16",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC3-3",
+          "name": "ULC3_3",
           "originalName": "ULC3-3"
         },
         "position": {
@@ -734,7 +734,7 @@
           "groupSuffix": "l",
           "id": "path16",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC3-1",
+          "name": "ULC3_1",
           "originalName": "ULC3-1"
         },
         "position": {
@@ -758,7 +758,7 @@
           "groupSuffix": "l",
           "id": "rect17",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC4-4",
+          "name": "ULC4_4",
           "originalName": "ULC4-4"
         },
         "position": {
@@ -781,7 +781,7 @@
           "groupSuffix": "l",
           "id": "path17",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC4-5",
+          "name": "ULC4_5",
           "originalName": "ULC4-5"
         },
         "position": {
@@ -805,7 +805,7 @@
           "groupSuffix": "l",
           "id": "rect19",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC4-3",
+          "name": "ULC4_3",
           "originalName": "ULC4-3"
         },
         "position": {
@@ -829,7 +829,7 @@
           "groupSuffix": "l",
           "id": "rect1",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC3-2",
+          "name": "ULC3_2",
           "originalName": "ULC3-2"
         },
         "position": {
@@ -852,7 +852,7 @@
           "groupSuffix": "l",
           "id": "path1",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC4-1",
+          "name": "ULC4_1",
           "originalName": "ULC4-1"
         },
         "position": {
@@ -876,7 +876,7 @@
           "groupSuffix": "l",
           "id": "rect2",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC4-2",
+          "name": "ULC4_2",
           "originalName": "ULC4-2"
         },
         "position": {
@@ -895,7 +895,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-3-EPC2_Line"
+          "name": "ULC4_3_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -930,7 +930,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-3-EPC2"
+          "name": "ULC4_3_EPC2"
         },
         "position": {
           "height": 31.97,
@@ -965,7 +965,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-S1"
+          "name": "ULC1_12_S1"
         },
         "position": {
           "height": 13,
@@ -997,7 +997,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-3-EPC2_END"
+          "name": "ULC4_3_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -1032,7 +1032,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-FIO1"
+          "name": "ULC3_6_FIO1"
         },
         "position": {
           "height": 20,
@@ -1064,7 +1064,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-3-EPC1_Line"
+          "name": "ULC4_3_EPC1_Line"
         },
         "position": {
           "height": 6,
@@ -1099,7 +1099,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-3-EPC1"
+          "name": "ULC4_3_EPC1"
         },
         "position": {
           "height": 31.97,
@@ -1134,7 +1134,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-3-EPC1_END"
+          "name": "ULC4_3_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -1169,7 +1169,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-3-EPC1_Line"
+          "name": "ULC3_3_EPC1_Line"
         },
         "position": {
           "height": 6,
@@ -1204,7 +1204,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-3-EPC1_END"
+          "name": "ULC3_3_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -1239,7 +1239,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-3-EPC2_Line"
+          "name": "ULC3_3_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -1274,7 +1274,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-3-EPC2"
+          "name": "ULC3_3_EPC2"
         },
         "position": {
           "height": 31.97,
@@ -1309,7 +1309,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-3-EPC2_END"
+          "name": "ULC3_3_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -1344,7 +1344,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-3-EPC1"
+          "name": "ULC3_3_EPC1"
         },
         "position": {
           "height": 31.97,
@@ -1379,7 +1379,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-3-EPC2_Line"
+          "name": "ULC2_3_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -1414,7 +1414,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-3-EPC2_END"
+          "name": "ULC2_3_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -1449,7 +1449,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-3-EPC2"
+          "name": "ULC2_3_EPC2"
         },
         "position": {
           "height": 31.97,
@@ -1484,7 +1484,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-3-EPC1_Line_2"
+          "name": "ULC2_3_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -1519,7 +1519,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-3-EPC1_END"
+          "name": "ULC2_3_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -1554,7 +1554,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-3-EPC1_Line_1"
+          "name": "ULC2_3_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -1589,7 +1589,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-3-EPC1"
+          "name": "ULC2_3_EPC1"
         },
         "position": {
           "height": 31.97,
@@ -1624,7 +1624,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-3-EPC2_Line"
+          "name": "ULC1_3_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -1659,7 +1659,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-3-EPC2_END_1"
+          "name": "ULC1_3_EPC2_END_1"
         },
         "position": {
           "height": 30,
@@ -1694,7 +1694,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-3-EPC2"
+          "name": "ULC1_3_EPC2"
         },
         "position": {
           "height": 31.97,
@@ -1869,7 +1869,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-EPC1_Line_1"
+          "name": "ULC1_12_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -1904,7 +1904,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-EPC1"
+          "name": "ULC1_12_EPC1"
         },
         "position": {
           "height": 31.97,
@@ -1939,7 +1939,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-EPC1_Line_2"
+          "name": "ULC1_12_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -1974,7 +1974,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-EPC1_Line_3"
+          "name": "ULC1_12_EPC1_Line_3"
         },
         "position": {
           "height": 6,
@@ -2009,7 +2009,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-EPC1_END"
+          "name": "ULC1_12_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -2044,7 +2044,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-EPC2_Line_3"
+          "name": "ULC1_12_EPC2_Line_3"
         },
         "position": {
           "height": 6,
@@ -2079,7 +2079,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-EPC2_Line_2"
+          "name": "ULC1_12_EPC2_Line_2"
         },
         "position": {
           "height": 5.74,
@@ -2114,7 +2114,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-EPC2_Line_1"
+          "name": "ULC1_12_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -2149,7 +2149,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-EPC2"
+          "name": "ULC1_12_EPC2"
         },
         "position": {
           "height": 31.97,
@@ -2184,7 +2184,7 @@
       },
       {
         "meta": {
-          "name": " LC1-12-EPC2_END"
+          "name": " LC1_12_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -2219,7 +2219,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-EPC2_Line_3"
+          "name": "ULC2_12_EPC2_Line_3"
         },
         "position": {
           "height": 6,
@@ -2254,7 +2254,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-EPC2_Line_2"
+          "name": "ULC2_12_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -2289,7 +2289,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-EPC2_Line_1"
+          "name": "ULC2_12_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -2324,7 +2324,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-EPC2"
+          "name": "ULC2_12_EPC2"
         },
         "position": {
           "height": 31.97,
@@ -2359,7 +2359,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-EPC2_END"
+          "name": "ULC2_12_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -2394,7 +2394,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-EPC1_Line_2"
+          "name": "ULC2_12_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -2429,7 +2429,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-EPC1_Line_3"
+          "name": "ULC2_12_EPC1_Line_3"
         },
         "position": {
           "height": 6,
@@ -2464,7 +2464,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-EPC1_END"
+          "name": "ULC2_12_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -2499,7 +2499,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-EPC1_Line_1"
+          "name": "ULC2_12_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -2534,7 +2534,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-EPC1"
+          "name": "ULC2_12_EPC1"
         },
         "position": {
           "height": 31.97,
@@ -2569,7 +2569,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-EPC2_Line_3"
+          "name": "ULC3_6_EPC2_Line_3"
         },
         "position": {
           "height": 6,
@@ -2604,7 +2604,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-EPC2_Line_2"
+          "name": "ULC3_6_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -2639,7 +2639,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-EPC2_Line_1"
+          "name": "ULC3_6_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -2674,7 +2674,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-EPC2"
+          "name": "ULC3_6_EPC2"
         },
         "position": {
           "height": 31.97,
@@ -2709,7 +2709,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-EPC1_Line_1"
+          "name": "ULC3_6_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -2744,7 +2744,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-EPC1_Line_2"
+          "name": "ULC3_6_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -2779,7 +2779,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-EPC1_Line_3"
+          "name": "ULC3_6_EPC1_Line_3"
         },
         "position": {
           "height": 6,
@@ -2814,7 +2814,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-EPC1_END"
+          "name": "ULC3_6_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -2849,7 +2849,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-EPC1"
+          "name": "ULC3_6_EPC1"
         },
         "position": {
           "height": 31.97,
@@ -2884,7 +2884,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-EPC2_END"
+          "name": "ULC3_6_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -2919,7 +2919,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-EPC2_Line_3"
+          "name": "ULC4_6_EPC2_Line_3"
         },
         "position": {
           "height": 6,
@@ -2954,7 +2954,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-EPC2_Line_2"
+          "name": "ULC4_6_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -2989,7 +2989,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-EPC2_Line_1"
+          "name": "ULC4_6_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -3024,7 +3024,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-EPC2"
+          "name": "ULC4_6_EPC2"
         },
         "position": {
           "height": 31.97,
@@ -3059,7 +3059,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-EPC2_END"
+          "name": "ULC4_6_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -3094,7 +3094,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-EPC1_Line_2"
+          "name": "ULC4_6_EPC1_Line_2"
         },
         "position": {
           "height": 6.85,
@@ -3129,7 +3129,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-EPC1_Line_3"
+          "name": "ULC4_6_EPC1_Line_3"
         },
         "position": {
           "height": 6,
@@ -3164,7 +3164,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-EPC1_Line_1"
+          "name": "ULC4_6_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -3199,7 +3199,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-EPC1"
+          "name": "ULC4_6_EPC1"
         },
         "position": {
           "height": 31.97,
@@ -3234,7 +3234,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-EPC1_END"
+          "name": "ULC4_6_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -3269,7 +3269,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-FIO1"
+          "name": "ULC4_6_FIO1"
         },
         "position": {
           "height": 20,
@@ -3301,7 +3301,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-4-FIO1"
+          "name": "ULC4_4_FIO1"
         },
         "position": {
           "height": 20,
@@ -3333,7 +3333,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-4-FIO1"
+          "name": "ULC3_4_FIO1"
         },
         "position": {
           "height": 20,
@@ -3365,7 +3365,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-4-FIO1"
+          "name": "ULC2_4_FIO1"
         },
         "position": {
           "height": 20,
@@ -3397,7 +3397,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-4-FIO1"
+          "name": "ULC1_4_FIO1"
         },
         "position": {
           "height": 20,
@@ -3569,7 +3569,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-12-S2"
+          "name": "ULC1_12_S2"
         },
         "position": {
           "height": 13,
@@ -3601,7 +3601,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-S2"
+          "name": "ULC2_12_S2"
         },
         "position": {
           "height": 13,
@@ -3633,7 +3633,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-12-S1"
+          "name": "ULC2_12_S1"
         },
         "position": {
           "height": 13,
@@ -3665,7 +3665,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-SS2"
+          "name": "ULC3_6_SS2"
         },
         "position": {
           "height": 13,
@@ -3697,7 +3697,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-SS1"
+          "name": "ULC3_6_SS1"
         },
         "position": {
           "height": 13,
@@ -3729,7 +3729,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-SS2"
+          "name": "ULC4_6_SS2"
         },
         "position": {
           "height": 13,
@@ -3761,7 +3761,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-6-SS1"
+          "name": "ULC4_6_SS1"
         },
         "position": {
           "height": 13,
@@ -3793,7 +3793,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-4-JR1"
+          "name": "ULC4_4_JR1"
         },
         "position": {
           "height": 13,
@@ -3825,7 +3825,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-4-JR2"
+          "name": "ULC4_4_JR2"
         },
         "position": {
           "height": 13,
@@ -3857,7 +3857,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-6-JR1"
+          "name": "ULC3_6_JR1"
         },
         "position": {
           "height": 13,
@@ -3985,7 +3985,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-7-JR2"
+          "name": "ULC1_7_JR2"
         },
         "position": {
           "height": 13,
@@ -4017,7 +4017,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-7-JR1"
+          "name": "ULC1_7_JR1"
         },
         "position": {
           "height": 13,
@@ -4049,7 +4049,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-3-SS2"
+          "name": "ULC4_3_SS2"
         },
         "position": {
           "height": 13,
@@ -4081,7 +4081,7 @@
       },
       {
         "meta": {
-          "name": "ULC4-3-SS1"
+          "name": "ULC4_3_SS1"
         },
         "position": {
           "height": 13,
@@ -4113,7 +4113,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-3-SS2"
+          "name": "ULC3_3_SS2"
         },
         "position": {
           "height": 13,
@@ -4145,7 +4145,7 @@
       },
       {
         "meta": {
-          "name": "ULC3-3-SS1"
+          "name": "ULC3_3_SS1"
         },
         "position": {
           "height": 13,
@@ -4177,7 +4177,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-3-SS2"
+          "name": "ULC2_3_SS2"
         },
         "position": {
           "height": 13,
@@ -4209,7 +4209,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-3-SS1"
+          "name": "ULC2_3_SS1"
         },
         "position": {
           "height": 13,
@@ -4241,7 +4241,7 @@
       },
       {
         "meta": {
-          "name": "ULC2-3-SS3"
+          "name": "ULC2_3_SS3"
         },
         "position": {
           "height": 13,
@@ -4273,7 +4273,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-3-SS1"
+          "name": "ULC1_3_SS1"
         },
         "position": {
           "height": 13,
@@ -4305,7 +4305,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-3-SS2"
+          "name": "ULC1_3_SS2"
         },
         "position": {
           "height": 13,
@@ -4342,7 +4342,7 @@
           "groupSuffix": "u",
           "id": "rect18",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC4-7",
+          "name": "ULC4_7",
           "originalName": "ULC4-6"
         },
         "position": {
@@ -4366,7 +4366,7 @@
           "groupSuffix": "u",
           "id": "rect18",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC3-7",
+          "name": "ULC3_7",
           "originalName": "ULC4-6"
         },
         "position": {
@@ -4390,7 +4390,7 @@
           "groupSuffix": "l",
           "id": "rect10",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC2-9A",
+          "name": "ULC2_9A",
           "originalName": "ULC2-9"
         },
         "position": {
@@ -4414,7 +4414,7 @@
           "groupSuffix": "u",
           "id": "rect1-6-2-0-0-6-8-2",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC1-9A",
+          "name": "ULC1_9A",
           "originalName": "ULC1-9"
         },
         "position": {
@@ -4433,7 +4433,7 @@
       },
       {
         "meta": {
-          "name": "MCM04-MCM05_Button"
+          "name": "MCM04_MCM05_Button"
         },
         "position": {
           "height": 46.01,
@@ -4443,9 +4443,9 @@
         },
         "props": {
           "params": {
-            "pageid": "DetailedView/MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass",
+            "pageid": "DetailedView/MCM04 & MCM05 Sorter Destination,chutes and bypass",
             "panel_id": "value",
-            "text": "MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass"
+            "text": "MCM04 & MCM05 Sorter Destination,chutes and bypass"
           },
           "path": "Custom-Views/Area_Nav_Button"
         },
diff --git a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound/view.json b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound/view.json
index cc249d2..9ff76f7 100644
--- a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound/view.json	
+++ b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound/view.json	
@@ -41,7 +41,7 @@
       },
       {
         "meta": {
-          "name": "UL5-5"
+          "name": "UL5_5"
         },
         "position": {
           "height": 20,
@@ -76,7 +76,7 @@
       },
       {
         "meta": {
-          "name": "UL5-6"
+          "name": "UL5_6"
         },
         "position": {
           "height": 20,
@@ -111,7 +111,7 @@
       },
       {
         "meta": {
-          "name": "UL5-7"
+          "name": "UL5_7"
         },
         "position": {
           "height": 20,
@@ -146,7 +146,7 @@
       },
       {
         "meta": {
-          "name": "UL5-9"
+          "name": "UL5_9"
         },
         "position": {
           "height": 20,
@@ -181,7 +181,7 @@
       },
       {
         "meta": {
-          "name": "UL5-8"
+          "name": "UL5_8"
         },
         "position": {
           "height": 20,
@@ -216,7 +216,7 @@
       },
       {
         "meta": {
-          "name": "UL4-8"
+          "name": "UL4_8"
         },
         "position": {
           "height": 20,
@@ -251,7 +251,7 @@
       },
       {
         "meta": {
-          "name": "UL4-6"
+          "name": "UL4_6"
         },
         "position": {
           "height": 20,
@@ -286,7 +286,7 @@
       },
       {
         "meta": {
-          "name": "UL4-7"
+          "name": "UL4_7"
         },
         "position": {
           "height": 20,
@@ -321,7 +321,7 @@
       },
       {
         "meta": {
-          "name": "UL4-5"
+          "name": "UL4_5"
         },
         "position": {
           "height": 20,
@@ -356,7 +356,7 @@
       },
       {
         "meta": {
-          "name": "UL3-9"
+          "name": "UL3_9"
         },
         "position": {
           "height": 20,
@@ -391,7 +391,7 @@
       },
       {
         "meta": {
-          "name": "UL3-7"
+          "name": "UL3_7"
         },
         "position": {
           "height": 20,
@@ -426,7 +426,7 @@
       },
       {
         "meta": {
-          "name": "UL3-8"
+          "name": "UL3_8"
         },
         "position": {
           "height": 20,
@@ -461,7 +461,7 @@
       },
       {
         "meta": {
-          "name": "UL3-6"
+          "name": "UL3_6"
         },
         "position": {
           "height": 20,
@@ -496,7 +496,7 @@
       },
       {
         "meta": {
-          "name": "UL3-5"
+          "name": "UL3_5"
         },
         "position": {
           "height": 20,
@@ -531,7 +531,7 @@
       },
       {
         "meta": {
-          "name": "UL2-5"
+          "name": "UL2_5"
         },
         "position": {
           "height": 20,
@@ -566,7 +566,7 @@
       },
       {
         "meta": {
-          "name": "UL2-6"
+          "name": "UL2_6"
         },
         "position": {
           "height": 20,
@@ -601,7 +601,7 @@
       },
       {
         "meta": {
-          "name": "UL2-7"
+          "name": "UL2_7"
         },
         "position": {
           "height": 20,
@@ -636,7 +636,7 @@
       },
       {
         "meta": {
-          "name": "UL2-8"
+          "name": "UL2_8"
         },
         "position": {
           "height": 20,
@@ -671,7 +671,7 @@
       },
       {
         "meta": {
-          "name": "UL2-9"
+          "name": "UL2_9"
         },
         "position": {
           "height": 20,
@@ -706,7 +706,7 @@
       },
       {
         "meta": {
-          "name": "UL1-4"
+          "name": "UL1_4"
         },
         "position": {
           "height": 20,
@@ -741,7 +741,7 @@
       },
       {
         "meta": {
-          "name": "UL1-5"
+          "name": "UL1_5"
         },
         "position": {
           "height": 20,
@@ -776,7 +776,7 @@
       },
       {
         "meta": {
-          "name": "UL1-6"
+          "name": "UL1_6"
         },
         "position": {
           "height": 20,
@@ -811,7 +811,7 @@
       },
       {
         "meta": {
-          "name": "UL1-7"
+          "name": "UL1_7"
         },
         "position": {
           "height": 20,
@@ -846,7 +846,7 @@
       },
       {
         "meta": {
-          "name": "UL1-3"
+          "name": "UL1_3"
         },
         "position": {
           "height": 20,
@@ -881,7 +881,7 @@
       },
       {
         "meta": {
-          "name": "UL2-4"
+          "name": "UL2_4"
         },
         "position": {
           "height": 20,
@@ -916,7 +916,7 @@
       },
       {
         "meta": {
-          "name": "UL3-4"
+          "name": "UL3_4"
         },
         "position": {
           "height": 20,
@@ -951,7 +951,7 @@
       },
       {
         "meta": {
-          "name": "UL4-4"
+          "name": "UL4_4"
         },
         "position": {
           "height": 20,
@@ -986,7 +986,7 @@
       },
       {
         "meta": {
-          "name": "UL5-4"
+          "name": "UL5_4"
         },
         "position": {
           "height": 20,
@@ -1021,7 +1021,7 @@
       },
       {
         "meta": {
-          "name": "UL1-2"
+          "name": "UL1_2"
         },
         "position": {
           "height": 20,
@@ -1056,7 +1056,7 @@
       },
       {
         "meta": {
-          "name": "UL1-1"
+          "name": "UL1_1"
         },
         "position": {
           "height": 20,
@@ -1091,7 +1091,7 @@
       },
       {
         "meta": {
-          "name": "UL2-2"
+          "name": "UL2_2"
         },
         "position": {
           "height": 20,
@@ -1126,7 +1126,7 @@
       },
       {
         "meta": {
-          "name": "UL2-3"
+          "name": "UL2_3"
         },
         "position": {
           "height": 20,
@@ -1161,7 +1161,7 @@
       },
       {
         "meta": {
-          "name": "UL3-2"
+          "name": "UL3_2"
         },
         "position": {
           "height": 20,
@@ -1196,7 +1196,7 @@
       },
       {
         "meta": {
-          "name": "UL3-3"
+          "name": "UL3_3"
         },
         "position": {
           "height": 20,
@@ -1231,7 +1231,7 @@
       },
       {
         "meta": {
-          "name": "UL5-2"
+          "name": "UL5_2"
         },
         "position": {
           "height": 20,
@@ -1266,7 +1266,7 @@
       },
       {
         "meta": {
-          "name": "UL5-3"
+          "name": "UL5_3"
         },
         "position": {
           "height": 20,
@@ -1301,7 +1301,7 @@
       },
       {
         "meta": {
-          "name": "UL4-2"
+          "name": "UL4_2"
         },
         "position": {
           "height": 20,
@@ -1336,7 +1336,7 @@
       },
       {
         "meta": {
-          "name": "UL4-3"
+          "name": "UL4_3"
         },
         "position": {
           "height": 20,
@@ -1371,7 +1371,7 @@
       },
       {
         "meta": {
-          "name": "UL6-2"
+          "name": "UL6_2"
         },
         "position": {
           "height": 20,
@@ -1406,7 +1406,7 @@
       },
       {
         "meta": {
-          "name": "UL6-1"
+          "name": "UL6_1"
         },
         "position": {
           "height": 20,
@@ -1441,7 +1441,7 @@
       },
       {
         "meta": {
-          "name": "UL6-3"
+          "name": "UL6_3"
         },
         "position": {
           "height": 20,
@@ -1476,7 +1476,7 @@
       },
       {
         "meta": {
-          "name": "UL6-4"
+          "name": "UL6_4"
         },
         "position": {
           "height": 20,
@@ -1511,7 +1511,7 @@
       },
       {
         "meta": {
-          "name": "UL6-5"
+          "name": "UL6_5"
         },
         "position": {
           "height": 20,
@@ -1546,7 +1546,7 @@
       },
       {
         "meta": {
-          "name": "UL6-6"
+          "name": "UL6_6"
         },
         "position": {
           "height": 20,
@@ -1581,7 +1581,7 @@
       },
       {
         "meta": {
-          "name": "UL6-7"
+          "name": "UL6_7"
         },
         "position": {
           "height": 20,
@@ -1616,7 +1616,7 @@
       },
       {
         "meta": {
-          "name": "UL6-8"
+          "name": "UL6_8"
         },
         "position": {
           "height": 20,
@@ -1651,7 +1651,7 @@
       },
       {
         "meta": {
-          "name": "PS1-6"
+          "name": "PS1_6"
         },
         "position": {
           "height": 20,
@@ -1686,7 +1686,7 @@
       },
       {
         "meta": {
-          "name": "PS1-5A"
+          "name": "PS1_5A"
         },
         "position": {
           "height": 20,
@@ -1721,7 +1721,7 @@
       },
       {
         "meta": {
-          "name": "PS1-4"
+          "name": "PS1_4"
         },
         "position": {
           "height": 20,
@@ -1756,7 +1756,7 @@
       },
       {
         "meta": {
-          "name": "PS1-3"
+          "name": "PS1_3"
         },
         "position": {
           "height": 20,
@@ -1791,7 +1791,7 @@
       },
       {
         "meta": {
-          "name": "PS1-1"
+          "name": "PS1_1"
         },
         "position": {
           "height": 20,
@@ -1826,7 +1826,7 @@
       },
       {
         "meta": {
-          "name": "PS1-2"
+          "name": "PS1_2"
         },
         "position": {
           "height": 20,
@@ -1861,7 +1861,7 @@
       },
       {
         "meta": {
-          "name": "PS2-1"
+          "name": "PS2_1"
         },
         "position": {
           "height": 20,
@@ -1896,7 +1896,7 @@
       },
       {
         "meta": {
-          "name": "PS1-7"
+          "name": "PS1_7"
         },
         "position": {
           "height": 20,
@@ -1931,7 +1931,7 @@
       },
       {
         "meta": {
-          "name": "PS1-8"
+          "name": "PS1_8"
         },
         "position": {
           "height": 20,
@@ -1966,7 +1966,7 @@
       },
       {
         "meta": {
-          "name": "PS1-8_S2"
+          "name": "PS1_8_S2"
         },
         "position": {
           "height": 13,
@@ -1998,7 +1998,7 @@
       },
       {
         "meta": {
-          "name": "PS5-12_FIO1"
+          "name": "PS5_12_FIO1"
         },
         "position": {
           "height": 20,
@@ -2033,7 +2033,7 @@
       },
       {
         "meta": {
-          "name": "PS1-8_EPC1"
+          "name": "PS1_8_EPC1"
         },
         "position": {
           "height": 32,
@@ -2068,7 +2068,7 @@
       },
       {
         "meta": {
-          "name": "PS1-8_EPC2"
+          "name": "PS1_8_EPC2"
         },
         "position": {
           "height": 32,
@@ -2103,7 +2103,7 @@
       },
       {
         "meta": {
-          "name": "PS1-8_EPC1_Line"
+          "name": "PS1_8_EPC1_Line"
         },
         "position": {
           "height": 6,
@@ -2138,7 +2138,7 @@
       },
       {
         "meta": {
-          "name": "PS1-8_EPC1_End"
+          "name": "PS1_8_EPC1_End"
         },
         "position": {
           "height": 30,
@@ -2173,7 +2173,7 @@
       },
       {
         "meta": {
-          "name": "PS1-8_EPC2_Line"
+          "name": "PS1_8_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -2208,7 +2208,7 @@
       },
       {
         "meta": {
-          "name": "PS1-8_EPC2_End"
+          "name": "PS1_8_EPC2_End"
         },
         "position": {
           "height": 30,
@@ -2243,7 +2243,7 @@
       },
       {
         "meta": {
-          "name": "PS1-1_JR2"
+          "name": "PS1_1_JR2"
         },
         "position": {
           "height": 13,
@@ -2275,7 +2275,7 @@
       },
       {
         "meta": {
-          "name": "PS1-1_JR1"
+          "name": "PS1_1_JR1"
         },
         "position": {
           "height": 13,
@@ -2307,7 +2307,7 @@
       },
       {
         "meta": {
-          "name": "UL1-2_JR1"
+          "name": "UL1_2_JR1"
         },
         "position": {
           "height": 13,
@@ -2339,7 +2339,7 @@
       },
       {
         "meta": {
-          "name": "UL1-1_SS1"
+          "name": "UL1_1_SS1"
         },
         "position": {
           "height": 13,
@@ -2371,7 +2371,7 @@
       },
       {
         "meta": {
-          "name": "UL6-1-SS1"
+          "name": "UL6_1_SS1"
         },
         "position": {
           "height": 13,
@@ -2403,7 +2403,7 @@
       },
       {
         "meta": {
-          "name": "UL1-1_EPC1_Line"
+          "name": "UL1_1_EPC1_Line"
         },
         "position": {
           "height": 6,
@@ -2438,7 +2438,7 @@
       },
       {
         "meta": {
-          "name": "UL1-1_EPC1_End"
+          "name": "UL1_1_EPC1_End"
         },
         "position": {
           "height": 30,
@@ -2473,7 +2473,7 @@
       },
       {
         "meta": {
-          "name": "UL1-1_EPC1"
+          "name": "UL1_1_EPC1"
         },
         "position": {
           "height": 32,
@@ -2508,7 +2508,7 @@
       },
       {
         "meta": {
-          "name": "UL1-1_EPC2_Line"
+          "name": "UL1_1_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -2543,7 +2543,7 @@
       },
       {
         "meta": {
-          "name": "UL1-1_EPC2"
+          "name": "UL1_1_EPC2"
         },
         "position": {
           "height": 32,
@@ -2578,7 +2578,7 @@
       },
       {
         "meta": {
-          "name": "UL1-1_EPC2_End"
+          "name": "UL1_1_EPC2_End"
         },
         "position": {
           "height": 30,
@@ -2613,7 +2613,7 @@
       },
       {
         "meta": {
-          "name": "UL2-3_JR1"
+          "name": "UL2_3_JR1"
         },
         "position": {
           "height": 13,
@@ -2645,7 +2645,7 @@
       },
       {
         "meta": {
-          "name": "UL3-3_JR1"
+          "name": "UL3_3_JR1"
         },
         "position": {
           "height": 13,
@@ -2677,7 +2677,7 @@
       },
       {
         "meta": {
-          "name": "UL4-3_JR1"
+          "name": "UL4_3_JR1"
         },
         "position": {
           "height": 13,
@@ -2709,7 +2709,7 @@
       },
       {
         "meta": {
-          "name": "UL5-3_JR1"
+          "name": "UL5_3_JR1"
         },
         "position": {
           "height": 13,
@@ -2741,7 +2741,7 @@
       },
       {
         "meta": {
-          "name": "UL6-3_JR1"
+          "name": "UL6_3_JR1"
         },
         "position": {
           "height": 13,
@@ -2805,7 +2805,7 @@
       },
       {
         "meta": {
-          "name": "UL6-1-EPC1_End"
+          "name": "UL6_1_EPC1_End"
         },
         "position": {
           "height": 30,
@@ -2840,7 +2840,7 @@
       },
       {
         "meta": {
-          "name": "UL6-1-EPC1_Line"
+          "name": "UL6_1_EPC1_Line"
         },
         "position": {
           "height": 6,
@@ -2875,7 +2875,7 @@
       },
       {
         "meta": {
-          "name": "UL6-1_EPC1"
+          "name": "UL6_1_EPC1"
         },
         "position": {
           "height": 32,
@@ -2910,7 +2910,7 @@
       },
       {
         "meta": {
-          "name": "UL6-1-EPC2"
+          "name": "UL6_1_EPC2"
         },
         "position": {
           "height": 32,
@@ -2945,7 +2945,7 @@
       },
       {
         "meta": {
-          "name": "UL6-1-EPC2_Line"
+          "name": "UL6_1_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -2980,7 +2980,7 @@
       },
       {
         "meta": {
-          "name": "UL6-1-EPC2_End"
+          "name": "UL6_1_EPC2_End"
         },
         "position": {
           "height": 30,
@@ -3015,7 +3015,7 @@
       },
       {
         "meta": {
-          "name": "UL1-2-FIO1"
+          "name": "UL1_2_FIO1"
         },
         "position": {
           "height": 20,
@@ -3050,7 +3050,7 @@
       },
       {
         "meta": {
-          "name": "UL2-3-FIO1"
+          "name": "UL2_3_FIO1"
         },
         "position": {
           "height": 20,
@@ -3085,7 +3085,7 @@
       },
       {
         "meta": {
-          "name": "UL3-3-FIO1"
+          "name": "UL3_3_FIO1"
         },
         "position": {
           "height": 20,
@@ -3120,7 +3120,7 @@
       },
       {
         "meta": {
-          "name": "UL4-3-FIO1"
+          "name": "UL4_3_FIO1"
         },
         "position": {
           "height": 20,
@@ -3155,7 +3155,7 @@
       },
       {
         "meta": {
-          "name": "UL5-3-FIO1"
+          "name": "UL5_3_FIO1"
         },
         "position": {
           "height": 20,
@@ -3190,7 +3190,7 @@
       },
       {
         "meta": {
-          "name": "UL6-2-FIO1"
+          "name": "UL6_2_FIO1"
         },
         "position": {
           "height": 20,
@@ -3225,7 +3225,7 @@
       },
       {
         "meta": {
-          "name": "PS1-5B"
+          "name": "PS1_5B"
         },
         "position": {
           "height": 20,
@@ -3260,7 +3260,7 @@
       },
       {
         "meta": {
-          "name": "MCM04-MCM5_Button"
+          "name": "MCM04_MCM5_Button"
         },
         "position": {
           "height": 46.01,
@@ -3270,9 +3270,9 @@
         },
         "props": {
           "params": {
-            "pageid": "DetailedView/MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass",
+            "pageid": "DetailedView/MCM04 & MCM05 Sorter Destination,chutes and bypass",
             "panel_id": "value",
-            "text": "MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass"
+            "text": "MCM04 & MCM05 Sorter Destination,chutes and bypass"
           },
           "path": "Custom-Views/Area_Nav_Button"
         },
@@ -3280,7 +3280,7 @@
       },
       {
         "meta": {
-          "name": "PS1-8_S1"
+          "name": "PS1_8_S1"
         },
         "position": {
           "height": 13,
@@ -3312,7 +3312,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7-EPC2_End"
+          "name": "PS2_7_EPC2_End"
         },
         "position": {
           "height": 30,
@@ -3347,7 +3347,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7-EPC1_End"
+          "name": "PS2_7_EPC1_End"
         },
         "position": {
           "height": 30,
@@ -3382,7 +3382,7 @@
       },
       {
         "meta": {
-          "name": "PS2-2"
+          "name": "PS2_2"
         },
         "position": {
           "height": 20,
@@ -3417,7 +3417,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7-EPC2_Line_3"
+          "name": "PS2_7_EPC2_Line_3"
         },
         "position": {
           "height": 6,
@@ -3452,7 +3452,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7-EPC2_Line_2"
+          "name": "PS2_7_EPC2_Line_2"
         },
         "position": {
           "height": 5.6,
@@ -3487,7 +3487,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7-EPC1_Line_2"
+          "name": "PS2_7_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -3522,7 +3522,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7-EPC1_Line_1"
+          "name": "PS2_7_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -3557,7 +3557,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7-EPC1"
+          "name": "PS2_7_EPC1"
         },
         "position": {
           "height": 32,
@@ -3592,7 +3592,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7_S1"
+          "name": "PS2_7_S1"
         },
         "position": {
           "height": 13,
@@ -3656,7 +3656,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7-EPC2_Line_1"
+          "name": "PS2_7_EPC2_Line_1"
         },
         "position": {
           "height": 7,
@@ -3691,7 +3691,7 @@
       },
       {
         "meta": {
-          "name": "PS2-3"
+          "name": "PS2_3"
         },
         "position": {
           "height": 20,
@@ -3726,7 +3726,7 @@
       },
       {
         "meta": {
-          "name": "PS2-4A"
+          "name": "PS2_4A"
         },
         "position": {
           "height": 20,
@@ -3761,7 +3761,7 @@
       },
       {
         "meta": {
-          "name": "PS2-4B"
+          "name": "PS2_4B"
         },
         "position": {
           "height": 20,
@@ -3796,7 +3796,7 @@
       },
       {
         "meta": {
-          "name": "PS2-5"
+          "name": "PS2_5"
         },
         "position": {
           "height": 20,
@@ -3831,7 +3831,7 @@
       },
       {
         "meta": {
-          "name": "PS2-6"
+          "name": "PS2_6"
         },
         "position": {
           "height": 20,
@@ -3866,7 +3866,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7"
+          "name": "PS2_7"
         },
         "position": {
           "height": 20,
@@ -3901,7 +3901,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7_S2"
+          "name": "PS2_7_S2"
         },
         "position": {
           "height": 13,
@@ -3933,7 +3933,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7-EPC2"
+          "name": "PS2_7_EPC2"
         },
         "position": {
           "height": 32,
@@ -3968,7 +3968,7 @@
       },
       {
         "meta": {
-          "name": "PS2-7-EPC1_Line_3"
+          "name": "PS2_7_EPC1_Line_3"
         },
         "position": {
           "height": 6,
diff --git a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Fluid Inbound/view.json b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Fluid Inbound/view.json
index afd4274..8ce2878 100644
--- a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Fluid Inbound/view.json	
+++ b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Fluid Inbound/view.json	
@@ -41,7 +41,7 @@
       },
       {
         "meta": {
-          "name": "UL7-3"
+          "name": "UL7_3"
         },
         "position": {
           "height": 20,
@@ -76,7 +76,7 @@
       },
       {
         "meta": {
-          "name": "UL8-4"
+          "name": "UL8_4"
         },
         "position": {
           "height": 20,
@@ -111,7 +111,7 @@
       },
       {
         "meta": {
-          "name": "UL9-4"
+          "name": "UL9_4"
         },
         "position": {
           "height": 20,
@@ -146,7 +146,7 @@
       },
       {
         "meta": {
-          "name": "UL9-5"
+          "name": "UL9_5"
         },
         "position": {
           "height": 20,
@@ -181,7 +181,7 @@
       },
       {
         "meta": {
-          "name": "UL8-5"
+          "name": "UL8_5"
         },
         "position": {
           "height": 20,
@@ -216,7 +216,7 @@
       },
       {
         "meta": {
-          "name": "UL8-6"
+          "name": "UL8_6"
         },
         "position": {
           "height": 20,
@@ -251,7 +251,7 @@
       },
       {
         "meta": {
-          "name": "UL8-7"
+          "name": "UL8_7"
         },
         "position": {
           "height": 20,
@@ -286,7 +286,7 @@
       },
       {
         "meta": {
-          "name": "UL8-9"
+          "name": "UL8_9"
         },
         "position": {
           "height": 20,
@@ -321,7 +321,7 @@
       },
       {
         "meta": {
-          "name": "UL8-8"
+          "name": "UL8_8"
         },
         "position": {
           "height": 20,
@@ -356,7 +356,7 @@
       },
       {
         "meta": {
-          "name": "UL7-4"
+          "name": "UL7_4"
         },
         "position": {
           "height": 20,
@@ -391,7 +391,7 @@
       },
       {
         "meta": {
-          "name": "UL7-5"
+          "name": "UL7_5"
         },
         "position": {
           "height": 20,
@@ -426,7 +426,7 @@
       },
       {
         "meta": {
-          "name": "UL7-6"
+          "name": "UL7_6"
         },
         "position": {
           "height": 20,
@@ -461,7 +461,7 @@
       },
       {
         "meta": {
-          "name": "UL7-7"
+          "name": "UL7_7"
         },
         "position": {
           "height": 20,
@@ -496,7 +496,7 @@
       },
       {
         "meta": {
-          "name": "UL9-6"
+          "name": "UL9_6"
         },
         "position": {
           "height": 20,
@@ -531,7 +531,7 @@
       },
       {
         "meta": {
-          "name": "UL9-7"
+          "name": "UL9_7"
         },
         "position": {
           "height": 20,
@@ -566,7 +566,7 @@
       },
       {
         "meta": {
-          "name": "UL9-8"
+          "name": "UL9_8"
         },
         "position": {
           "height": 20,
@@ -601,7 +601,7 @@
       },
       {
         "meta": {
-          "name": "UL9-9"
+          "name": "UL9_9"
         },
         "position": {
           "height": 20,
@@ -636,7 +636,7 @@
       },
       {
         "meta": {
-          "name": "UL10-4"
+          "name": "UL10_4"
         },
         "position": {
           "height": 20,
@@ -671,7 +671,7 @@
       },
       {
         "meta": {
-          "name": "UL12-3"
+          "name": "UL12_3"
         },
         "position": {
           "height": 20,
@@ -706,7 +706,7 @@
       },
       {
         "meta": {
-          "name": "UL10-5"
+          "name": "UL10_5"
         },
         "position": {
           "height": 20,
@@ -741,7 +741,7 @@
       },
       {
         "meta": {
-          "name": "UL10-6"
+          "name": "UL10_6"
         },
         "position": {
           "height": 20,
@@ -776,7 +776,7 @@
       },
       {
         "meta": {
-          "name": "UL10-7"
+          "name": "UL10_7"
         },
         "position": {
           "height": 20,
@@ -811,7 +811,7 @@
       },
       {
         "meta": {
-          "name": "UL10-8"
+          "name": "UL10_8"
         },
         "position": {
           "height": 20,
@@ -846,7 +846,7 @@
       },
       {
         "meta": {
-          "name": "UL11-5"
+          "name": "UL11_5"
         },
         "position": {
           "height": 20,
@@ -881,7 +881,7 @@
       },
       {
         "meta": {
-          "name": "UL11-6"
+          "name": "UL11_6"
         },
         "position": {
           "height": 20,
@@ -916,7 +916,7 @@
       },
       {
         "meta": {
-          "name": "UL11-7"
+          "name": "UL11_7"
         },
         "position": {
           "height": 20,
@@ -951,7 +951,7 @@
       },
       {
         "meta": {
-          "name": "UL11-4"
+          "name": "UL11_4"
         },
         "position": {
           "height": 20,
@@ -986,7 +986,7 @@
       },
       {
         "meta": {
-          "name": "UL11-9"
+          "name": "UL11_9"
         },
         "position": {
           "height": 20,
@@ -1021,7 +1021,7 @@
       },
       {
         "meta": {
-          "name": "UL11-8"
+          "name": "UL11_8"
         },
         "position": {
           "height": 20,
@@ -1056,7 +1056,7 @@
       },
       {
         "meta": {
-          "name": "UL12-4"
+          "name": "UL12_4"
         },
         "position": {
           "height": 20,
@@ -1091,7 +1091,7 @@
       },
       {
         "meta": {
-          "name": "UL12-5"
+          "name": "UL12_5"
         },
         "position": {
           "height": 20,
@@ -1126,7 +1126,7 @@
       },
       {
         "meta": {
-          "name": "UL12-6"
+          "name": "UL12_6"
         },
         "position": {
           "height": 20,
@@ -1161,7 +1161,7 @@
       },
       {
         "meta": {
-          "name": "PS4-4A"
+          "name": "PS4_4A"
         },
         "position": {
           "height": 20,
@@ -1196,7 +1196,7 @@
       },
       {
         "meta": {
-          "name": "PS4-7"
+          "name": "PS4_7"
         },
         "position": {
           "height": 20,
@@ -1231,7 +1231,7 @@
       },
       {
         "meta": {
-          "name": "PS4-6"
+          "name": "PS4_6"
         },
         "position": {
           "height": 20,
@@ -1266,7 +1266,7 @@
       },
       {
         "meta": {
-          "name": "PS4-5"
+          "name": "PS4_5"
         },
         "position": {
           "height": 20,
@@ -1301,7 +1301,7 @@
       },
       {
         "meta": {
-          "name": "PS3-4A"
+          "name": "PS3_4A"
         },
         "position": {
           "height": 20,
@@ -1336,7 +1336,7 @@
       },
       {
         "meta": {
-          "name": "PS3-7"
+          "name": "PS3_7"
         },
         "position": {
           "height": 20,
@@ -1371,7 +1371,7 @@
       },
       {
         "meta": {
-          "name": "PS3-6"
+          "name": "PS3_6"
         },
         "position": {
           "height": 20,
@@ -1406,7 +1406,7 @@
       },
       {
         "meta": {
-          "name": "PS3-5"
+          "name": "PS3_5"
         },
         "position": {
           "height": 20,
@@ -1441,7 +1441,7 @@
       },
       {
         "meta": {
-          "name": "PS4-3"
+          "name": "PS4_3"
         },
         "position": {
           "height": 20,
@@ -1476,7 +1476,7 @@
       },
       {
         "meta": {
-          "name": "PS3-3"
+          "name": "PS3_3"
         },
         "position": {
           "height": 20,
@@ -1511,7 +1511,7 @@
       },
       {
         "meta": {
-          "name": "PS4-2"
+          "name": "PS4_2"
         },
         "position": {
           "height": 20,
@@ -1546,7 +1546,7 @@
       },
       {
         "meta": {
-          "name": "PS4-1"
+          "name": "PS4_1"
         },
         "position": {
           "height": 20,
@@ -1581,7 +1581,7 @@
       },
       {
         "meta": {
-          "name": "PS3-2"
+          "name": "PS3_2"
         },
         "position": {
           "height": 20,
@@ -1616,7 +1616,7 @@
       },
       {
         "meta": {
-          "name": "PS3-1"
+          "name": "PS3_1"
         },
         "position": {
           "height": 20,
@@ -1651,7 +1651,7 @@
       },
       {
         "meta": {
-          "name": "UL12-2"
+          "name": "UL12_2"
         },
         "position": {
           "height": 20,
@@ -1686,7 +1686,7 @@
       },
       {
         "meta": {
-          "name": "UL12-1"
+          "name": "UL12_1"
         },
         "position": {
           "height": 20,
@@ -1721,7 +1721,7 @@
       },
       {
         "meta": {
-          "name": "UL7-2"
+          "name": "UL7_2"
         },
         "position": {
           "height": 20,
@@ -1756,7 +1756,7 @@
       },
       {
         "meta": {
-          "name": "UL7-1"
+          "name": "UL7_1"
         },
         "position": {
           "height": 20,
@@ -1791,7 +1791,7 @@
       },
       {
         "meta": {
-          "name": "UL11-2"
+          "name": "UL11_2"
         },
         "position": {
           "height": 20,
@@ -1826,7 +1826,7 @@
       },
       {
         "meta": {
-          "name": "UL11-3"
+          "name": "UL11_3"
         },
         "position": {
           "height": 20,
@@ -1861,7 +1861,7 @@
       },
       {
         "meta": {
-          "name": "UL12-8"
+          "name": "UL12_8"
         },
         "position": {
           "height": 20,
@@ -1896,7 +1896,7 @@
       },
       {
         "meta": {
-          "name": "UL12-7"
+          "name": "UL12_7"
         },
         "position": {
           "height": 20,
@@ -1931,7 +1931,7 @@
       },
       {
         "meta": {
-          "name": "UL10-2"
+          "name": "UL10_2"
         },
         "position": {
           "height": 20,
@@ -1966,7 +1966,7 @@
       },
       {
         "meta": {
-          "name": "UL9-2"
+          "name": "UL9_2"
         },
         "position": {
           "height": 20,
@@ -2001,7 +2001,7 @@
       },
       {
         "meta": {
-          "name": "UL8-2"
+          "name": "UL8_2"
         },
         "position": {
           "height": 20,
@@ -2036,7 +2036,7 @@
       },
       {
         "meta": {
-          "name": "UL10-3"
+          "name": "UL10_3"
         },
         "position": {
           "height": 20,
@@ -2071,7 +2071,7 @@
       },
       {
         "meta": {
-          "name": "UL9-3"
+          "name": "UL9_3"
         },
         "position": {
           "height": 20,
@@ -2106,7 +2106,7 @@
       },
       {
         "meta": {
-          "name": "UL8-3"
+          "name": "UL8_3"
         },
         "position": {
           "height": 20,
@@ -2141,7 +2141,7 @@
       },
       {
         "meta": {
-          "name": "UL7-1-SS1"
+          "name": "UL7_1_SS1"
         },
         "position": {
           "height": 13,
@@ -2173,7 +2173,7 @@
       },
       {
         "meta": {
-          "name": "UL12-1-SS1"
+          "name": "UL12_1_SS1"
         },
         "position": {
           "height": 13,
@@ -2205,7 +2205,7 @@
       },
       {
         "meta": {
-          "name": "UL7-2_JR1"
+          "name": "UL7_2_JR1"
         },
         "position": {
           "height": 13,
@@ -2237,7 +2237,7 @@
       },
       {
         "meta": {
-          "name": "UL8-3_JR1"
+          "name": "UL8_3_JR1"
         },
         "position": {
           "height": 13,
@@ -2269,7 +2269,7 @@
       },
       {
         "meta": {
-          "name": "UL9-3_JR1"
+          "name": "UL9_3_JR1"
         },
         "position": {
           "height": 13,
@@ -2301,7 +2301,7 @@
       },
       {
         "meta": {
-          "name": "UL10-3_JR1"
+          "name": "UL10_3_JR1"
         },
         "position": {
           "height": 13,
@@ -2333,7 +2333,7 @@
       },
       {
         "meta": {
-          "name": "UL11-3_JR1"
+          "name": "UL11_3_JR1"
         },
         "position": {
           "height": 13,
@@ -2397,7 +2397,7 @@
       },
       {
         "meta": {
-          "name": "PS3-1_JR1"
+          "name": "PS3_1_JR1"
         },
         "position": {
           "height": 13,
@@ -2429,7 +2429,7 @@
       },
       {
         "meta": {
-          "name": "PS3-1_JR2"
+          "name": "PS3_1_JR2"
         },
         "position": {
           "height": 13,
@@ -2461,7 +2461,7 @@
       },
       {
         "meta": {
-          "name": "PS4-1_JR1"
+          "name": "PS4_1_JR1"
         },
         "position": {
           "height": 13,
@@ -2493,7 +2493,7 @@
       },
       {
         "meta": {
-          "name": "PS4-1_JR2"
+          "name": "PS4_1_JR2"
         },
         "position": {
           "height": 13,
@@ -2525,7 +2525,7 @@
       },
       {
         "meta": {
-          "name": "PS3-7-EPC1"
+          "name": "PS3_7_EPC1"
         },
         "position": {
           "height": 32,
@@ -2560,7 +2560,7 @@
       },
       {
         "meta": {
-          "name": "PS3-7-EPC1_Line"
+          "name": "PS3_7_EPC1_Line"
         },
         "position": {
           "height": 6,
@@ -2595,7 +2595,7 @@
       },
       {
         "meta": {
-          "name": "PS3-7-EPC1_End"
+          "name": "PS3_7_EPC1_End"
         },
         "position": {
           "height": 30,
@@ -2630,7 +2630,7 @@
       },
       {
         "meta": {
-          "name": "PS3-7-EPC2_End"
+          "name": "PS3_7_EPC2_End"
         },
         "position": {
           "height": 30,
@@ -2665,7 +2665,7 @@
       },
       {
         "meta": {
-          "name": "PS3-7-EPC2_Line"
+          "name": "PS3_7_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -2700,7 +2700,7 @@
       },
       {
         "meta": {
-          "name": "PS3-7-EPC2"
+          "name": "PS3_7_EPC2"
         },
         "position": {
           "height": 32,
@@ -2735,7 +2735,7 @@
       },
       {
         "meta": {
-          "name": "PS3-7_S2"
+          "name": "PS3_7_S2"
         },
         "position": {
           "height": 13,
@@ -2767,7 +2767,7 @@
       },
       {
         "meta": {
-          "name": "PS4-7-EPC1"
+          "name": "PS4_7_EPC1"
         },
         "position": {
           "height": 32,
@@ -2802,7 +2802,7 @@
       },
       {
         "meta": {
-          "name": "PS4-7-EPC_Line"
+          "name": "PS4_7_EPC_Line"
         },
         "position": {
           "height": 6,
@@ -2837,7 +2837,7 @@
       },
       {
         "meta": {
-          "name": "PS4-7-EPC1_End"
+          "name": "PS4_7_EPC1_End"
         },
         "position": {
           "height": 30,
@@ -2872,7 +2872,7 @@
       },
       {
         "meta": {
-          "name": "PS4-7-EPC2_End"
+          "name": "PS4_7_EPC2_End"
         },
         "position": {
           "height": 30,
@@ -2907,7 +2907,7 @@
       },
       {
         "meta": {
-          "name": "PS4-7-EPC2_Line"
+          "name": "PS4_7_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -2942,7 +2942,7 @@
       },
       {
         "meta": {
-          "name": "PS4-7-EPC2"
+          "name": "PS4_7_EPC2"
         },
         "position": {
           "height": 32,
@@ -2977,7 +2977,7 @@
       },
       {
         "meta": {
-          "name": "PS4-7_S2"
+          "name": "PS4_7_S2"
         },
         "position": {
           "height": 13,
@@ -3009,7 +3009,7 @@
       },
       {
         "meta": {
-          "name": "UL7-1-EPC1_End"
+          "name": "UL7_1_EPC1_End"
         },
         "position": {
           "height": 30,
@@ -3044,7 +3044,7 @@
       },
       {
         "meta": {
-          "name": "UL7-1-EPC1_Line"
+          "name": "UL7_1_EPC1_Line"
         },
         "position": {
           "height": 6,
@@ -3079,7 +3079,7 @@
       },
       {
         "meta": {
-          "name": "UL7-1-EPC1"
+          "name": "UL7_1_EPC1"
         },
         "position": {
           "height": 32,
@@ -3114,7 +3114,7 @@
       },
       {
         "meta": {
-          "name": "UL7-1-EPC2"
+          "name": "UL7_1_EPC2"
         },
         "position": {
           "height": 32,
@@ -3149,7 +3149,7 @@
       },
       {
         "meta": {
-          "name": "UL7-1-EPC2_Line"
+          "name": "UL7_1_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -3184,7 +3184,7 @@
       },
       {
         "meta": {
-          "name": "UL7-1-EPC2_End"
+          "name": "UL7_1_EPC2_End"
         },
         "position": {
           "height": 30,
@@ -3219,7 +3219,7 @@
       },
       {
         "meta": {
-          "name": "UL12-1-EPC1_End"
+          "name": "UL12_1_EPC1_End"
         },
         "position": {
           "height": 30,
@@ -3254,7 +3254,7 @@
       },
       {
         "meta": {
-          "name": "UL12-1-EPC2_End"
+          "name": "UL12_1_EPC2_End"
         },
         "position": {
           "height": 30,
@@ -3289,7 +3289,7 @@
       },
       {
         "meta": {
-          "name": "UL12-1-EPC1_Line"
+          "name": "UL12_1_EPC1_Line"
         },
         "position": {
           "height": 6,
@@ -3324,7 +3324,7 @@
       },
       {
         "meta": {
-          "name": "UL12-1-EPC2_Line"
+          "name": "UL12_1_EPC2_Line"
         },
         "position": {
           "height": 6,
@@ -3359,7 +3359,7 @@
       },
       {
         "meta": {
-          "name": "UL12-1-EPC1"
+          "name": "UL12_1_EPC1"
         },
         "position": {
           "height": 32,
@@ -3394,7 +3394,7 @@
       },
       {
         "meta": {
-          "name": "UL12-1-EPC2"
+          "name": "UL12_1_EPC2"
         },
         "position": {
           "height": 32,
@@ -3429,7 +3429,7 @@
       },
       {
         "meta": {
-          "name": "UL7-2-FIO1"
+          "name": "UL7_2_FIO1"
         },
         "position": {
           "height": 20,
@@ -3464,7 +3464,7 @@
       },
       {
         "meta": {
-          "name": "UL8-3-FIO1"
+          "name": "UL8_3_FIO1"
         },
         "position": {
           "height": 20,
@@ -3499,7 +3499,7 @@
       },
       {
         "meta": {
-          "name": "UL9-3-FIO1"
+          "name": "UL9_3_FIO1"
         },
         "position": {
           "height": 20,
@@ -3534,7 +3534,7 @@
       },
       {
         "meta": {
-          "name": "UL10-3-FIO1"
+          "name": "UL10_3_FIO1"
         },
         "position": {
           "height": 20,
@@ -3569,7 +3569,7 @@
       },
       {
         "meta": {
-          "name": "UL11-3-FIO1"
+          "name": "UL11_3_FIO1"
         },
         "position": {
           "height": 20,
@@ -3604,7 +3604,7 @@
       },
       {
         "meta": {
-          "name": "UL12-2-FIO1"
+          "name": "UL12_2_FIO1"
         },
         "position": {
           "height": 20,
@@ -3639,7 +3639,7 @@
       },
       {
         "meta": {
-          "name": "PS3-4B"
+          "name": "PS3_4B"
         },
         "position": {
           "height": 20,
@@ -3674,7 +3674,7 @@
       },
       {
         "meta": {
-          "name": "PS4-4B"
+          "name": "PS4_4B"
         },
         "position": {
           "height": 20,
@@ -3709,7 +3709,7 @@
       },
       {
         "meta": {
-          "name": "MCM04-MCM5_Button"
+          "name": "MCM04_MCM5_Button"
         },
         "position": {
           "height": 46.01,
@@ -3719,9 +3719,9 @@
         },
         "props": {
           "params": {
-            "pageid": "DetailedView/MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass",
+            "pageid": "DetailedView/MCM04 & MCM05 Sorter Destination,chutes and bypass",
             "panel_id": "value",
-            "text": "MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass"
+            "text": "MCM04 & MCM05 Sorter Destination,chutes and bypass"
           },
           "path": "Custom-Views/Area_Nav_Button"
         },
@@ -3729,7 +3729,7 @@
       },
       {
         "meta": {
-          "name": "PS4-7_S1"
+          "name": "PS4_7_S1"
         },
         "position": {
           "height": 13,
@@ -3761,7 +3761,7 @@
       },
       {
         "meta": {
-          "name": "PS3-7_S1"
+          "name": "PS3_7_S1"
         },
         "position": {
           "height": 13,
diff --git a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 Sorter Destination, Chutes and Bypass/view.json b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 Sorter Destination, Chutes and Bypass/view.json
index de48f4f..890cdae 100644
--- a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 Sorter Destination, Chutes and Bypass/view.json	
+++ b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 Sorter Destination, Chutes and Bypass/view.json	
@@ -41,7 +41,7 @@
         "meta": {
           "elementPrefix": null,
           "id": "rect1-6-2-0-0-6-8-3-4-8-07",
-          "name": "BYAB-3",
+          "name": "BYAB_3",
           "originalName": "rect1-6-2-0-0-6-8-3-4-8-07"
         },
         "position": {
@@ -62,7 +62,7 @@
         "meta": {
           "elementPrefix": null,
           "id": "rect1-6-2-0-0-6-8-3-4-8-0-0",
-          "name": "BYAB-2",
+          "name": "BYAB_2",
           "originalName": "rect1-6-2-0-0-6-8-3-4-8-0-0"
         },
         "position": {
@@ -104,7 +104,7 @@
         "meta": {
           "elementPrefix": null,
           "id": "rect144",
-          "name": "BYCB-3",
+          "name": "BYCB_3",
           "originalName": "rect144"
         },
         "position": {
@@ -125,7 +125,7 @@
         "meta": {
           "elementPrefix": null,
           "id": "rect145",
-          "name": "BYCB-2",
+          "name": "BYCB_2",
           "originalName": "rect145"
         },
         "position": {
@@ -2087,7 +2087,7 @@
           "groupSuffix": "u",
           "id": "rect226",
           "inheritedGroupPrefix": "CON",
-          "name": "BYAB-4CH",
+          "name": "BYAB_4CH",
           "originalName": "rect226"
         },
         "position": {
@@ -2111,7 +2111,7 @@
           "groupSuffix": "u",
           "id": "rect226",
           "inheritedGroupPrefix": "CON",
-          "name": "BYCB-4CH",
+          "name": "BYCB_4CH",
           "originalName": "rect226"
         },
         "position": {
@@ -2150,7 +2150,7 @@
       },
       {
         "meta": {
-          "name": "MCM02-MCM03_Button"
+          "name": "MCM02_MCM03_Button"
         },
         "position": {
           "height": 45.04,
@@ -2160,9 +2160,9 @@
         },
         "props": {
           "params": {
-            "pageid": "DetailedView/MCM02 \u0026 MCM03 Fluid Inbound",
+            "pageid": "DetailedView/MCM02 & MCM03 Fluid Inbound",
             "panel_id": "value",
-            "text": "MCM02 \u0026 MCM03 Fluid Inbound"
+            "text": "MCM02 & MCM03 Fluid Inbound"
           },
           "path": "Custom-Views/Area_Nav_Button"
         },
diff --git a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Sorter Destination and Chutes/view.json b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Sorter Destination and Chutes/view.json
index ebb2ec8..f7bf794 100644
--- a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Sorter Destination and Chutes/view.json	
+++ b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Sorter Destination and Chutes/view.json	
@@ -2819,7 +2819,7 @@
       },
       {
         "meta": {
-          "name": "MCM02-MCM03_Button"
+          "name": "MCM02_MCM03_Button"
         },
         "position": {
           "height": 45.04,
@@ -2829,9 +2829,9 @@
         },
         "props": {
           "params": {
-            "pageid": "DetailedView/MCM02 \u0026 MCM03 Fluid Inbound",
+            "pageid": "DetailedView/MCM02 & MCM03 Fluid Inbound",
             "panel_id": "value",
-            "text": "MCM02 \u0026 MCM03 Fluid Inbound"
+            "text": "MCM02 & MCM03 Fluid Inbound"
           },
           "path": "Custom-Views/Area_Nav_Button"
         },
@@ -2839,7 +2839,7 @@
       },
       {
         "meta": {
-          "name": "ULC1-7-JR2"
+          "name": "ULC1_7_JR2"
         },
         "position": {
           "height": 13,