diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json
index a7300e1..056a25a 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json	
@@ -43,7 +43,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-0-3",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-6",
+          "name": "PS7_6",
           "originalName": "PS7-6"
         },
         "position": {
@@ -77,7 +77,7 @@
           "groupSuffix": "l",
           "id": "path1-2-1",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-9",
+          "name": "PS5_9",
           "originalName": "PS5-9"
         },
         "position": {
@@ -113,7 +113,7 @@
           "elementPrefix": null,
           "id": "path3-4",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-1",
+          "name": "PS5_1",
           "originalName": "PS5-1"
         },
         "position": {
@@ -150,7 +150,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-5",
+          "name": "PS6_5",
           "originalName": "PS6-5"
         },
         "position": {
@@ -184,7 +184,7 @@
           "groupSuffix": "l",
           "id": "path1-4",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-11",
+          "name": "PS5_11",
           "originalName": "PS5-11"
         },
         "position": {
@@ -221,7 +221,7 @@
           "groupSuffix": "l",
           "id": "path1-2",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-9",
+          "name": "PS6_9",
           "originalName": "PS6-9"
         },
         "position": {
@@ -289,7 +289,7 @@
           "elementPrefix": null,
           "id": "path2-5",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-6",
+          "name": "PS5_6",
           "originalName": "PS5-6"
         },
         "position": {
@@ -326,7 +326,7 @@
           "groupSuffix": "l",
           "id": "path1",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-11",
+          "name": "PS6_11",
           "originalName": "PS6-11"
         },
         "position": {
@@ -359,7 +359,7 @@
       },
       {
         "meta": {
-          "name": "PS5-1_EPC2"
+          "name": "PS5_1_EPC2"
         },
         "position": {
           "height": 32,
@@ -423,7 +423,7 @@
       },
       {
         "meta": {
-          "name": "PS5-9_JR2"
+          "name": "PS5_9_JR2"
         },
         "position": {
           "height": 13,
@@ -458,7 +458,7 @@
           "groupSuffix": "l",
           "id": "rect1-1-6",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-8",
+          "name": "PS6_8",
           "originalName": "PS6-8"
         },
         "position": {
@@ -495,7 +495,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-1-8-5",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-2",
+          "name": "PS5_2",
           "originalName": "PS5-2"
         },
         "position": {
@@ -528,7 +528,7 @@
       },
       {
         "meta": {
-          "name": "PS6-6_JR1"
+          "name": "PS6_6_JR1"
         },
         "position": {
           "height": 13,
@@ -563,7 +563,7 @@
           "groupSuffix": "l",
           "id": "rect1-1-6-1-3",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-7",
+          "name": "PS5_7",
           "originalName": "PS5-7"
         },
         "position": {
@@ -596,7 +596,7 @@
       },
       {
         "meta": {
-          "name": "PS6-9_JR1"
+          "name": "PS6_9_JR1"
         },
         "position": {
           "height": 13,
@@ -630,7 +630,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-0-3-6-8-5",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-10",
+          "name": "PS7_10",
           "originalName": "PS7-10"
         },
         "position": {
@@ -665,7 +665,7 @@
           "groupSuffix": "l",
           "id": "rect1-1-6-1",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-7",
+          "name": "PS6_7",
           "originalName": "PS6-7"
         },
         "position": {
@@ -698,7 +698,7 @@
       },
       {
         "meta": {
-          "name": "PS5-1_EPC1"
+          "name": "PS5_1_EPC1"
         },
         "position": {
           "height": 32,
@@ -735,7 +735,7 @@
           "groupSuffix": "l",
           "id": "rect1-1",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-12",
+          "name": "PS6_12",
           "originalName": "PS6-12"
         },
         "position": {
@@ -768,7 +768,7 @@
       },
       {
         "meta": {
-          "name": "PS5-6_JR1"
+          "name": "PS5_6_JR1"
         },
         "position": {
           "height": 13,
@@ -830,7 +830,7 @@
       },
       {
         "meta": {
-          "name": "PS6-8_JR1"
+          "name": "PS6_8_JR1"
         },
         "position": {
           "height": 13,
@@ -864,7 +864,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-0-3-6-8",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-9",
+          "name": "PS7_9",
           "originalName": "PS7-9"
         },
         "position": {
@@ -894,7 +894,7 @@
       },
       {
         "meta": {
-          "name": "PS5-1_EPC2_END"
+          "name": "PS5_1_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -926,7 +926,7 @@
       },
       {
         "meta": {
-          "name": "PS5-10_JR1"
+          "name": "PS5_10_JR1"
         },
         "position": {
           "height": 13,
@@ -960,7 +960,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-12",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-5",
+          "name": "PS5_5",
           "originalName": "PS5-5"
         },
         "position": {
@@ -994,7 +994,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-1",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-4",
+          "name": "PS6_4",
           "originalName": "PS6-4"
         },
         "position": {
@@ -1029,7 +1029,7 @@
           "groupSuffix": "l",
           "id": "rect1-1-6-8",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-8",
+          "name": "PS5_8",
           "originalName": "PS5-8"
         },
         "position": {
@@ -1062,7 +1062,7 @@
       },
       {
         "meta": {
-          "name": "PS7-1_EPC2"
+          "name": "PS7_1_EPC2"
         },
         "position": {
           "height": 32,
@@ -1094,7 +1094,7 @@
       },
       {
         "meta": {
-          "name": "PS7-1_EPC1_END"
+          "name": "PS7_1_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -1130,7 +1130,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-0-3-6-9",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-8",
+          "name": "PS7_8",
           "originalName": "PS7-8"
         },
         "position": {
@@ -1192,7 +1192,7 @@
       },
       {
         "meta": {
-          "name": "PS5-1_S2"
+          "name": "PS5_1_S2"
         },
         "position": {
           "height": 13,
@@ -1225,7 +1225,7 @@
           "elementPrefix": null,
           "id": "path1-2-8-9",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-3",
+          "name": "PS7_3",
           "originalName": "PS7-3"
         },
         "position": {
@@ -1261,7 +1261,7 @@
           "elementPrefix": null,
           "id": "path1-2-8-4",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-3",
+          "name": "PS5_3",
           "originalName": "PS5-3"
         },
         "position": {
@@ -1297,7 +1297,7 @@
           "elementPrefix": null,
           "id": "path1-4-7",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-11",
+          "name": "PS7_11",
           "originalName": "PS7-11"
         },
         "position": {
@@ -1362,7 +1362,7 @@
       },
       {
         "meta": {
-          "name": "PS7-1_EPC1"
+          "name": "PS7_1_EPC1"
         },
         "position": {
           "height": 32,
@@ -1394,7 +1394,7 @@
       },
       {
         "meta": {
-          "name": "PS5-11_JR1"
+          "name": "PS5_11_JR1"
         },
         "position": {
           "height": 13,
@@ -1429,7 +1429,7 @@
           "groupSuffix": "l",
           "id": "rect1-3",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-13",
+          "name": "PS5_13",
           "originalName": "PS5-13"
         },
         "position": {
@@ -1462,7 +1462,7 @@
       },
       {
         "meta": {
-          "name": "PS5-9_JR1"
+          "name": "PS5_9_JR1"
         },
         "position": {
           "height": 13,
@@ -1527,7 +1527,7 @@
           "elementPrefix": null,
           "id": "path3-6",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-1",
+          "name": "PS7_1",
           "originalName": "PS7-1"
         },
         "position": {
@@ -1563,7 +1563,7 @@
           "elementPrefix": null,
           "id": "path2",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-6",
+          "name": "PS6_6",
           "originalName": "PS6-6"
         },
         "position": {
@@ -1601,7 +1601,7 @@
           "groupSuffix": "l",
           "id": "rect1-1-2-1",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-10",
+          "name": "PS5_10",
           "originalName": "PS5-10"
         },
         "position": {
@@ -1637,7 +1637,7 @@
           "elementPrefix": null,
           "id": "path1-2-8",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-3",
+          "name": "PS6_3",
           "originalName": "PS6-3"
         },
         "position": {
@@ -1675,7 +1675,7 @@
           "groupSuffix": "l",
           "id": "rect1-1-3",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-12",
+          "name": "PS5_12",
           "originalName": "PS5-12"
         },
         "position": {
@@ -1712,7 +1712,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-0-3-6-8-5-5",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-12",
+          "name": "PS7_12",
           "originalName": "PS7-12"
         },
         "position": {
@@ -1745,7 +1745,7 @@
       },
       {
         "meta": {
-          "name": "PS7-1_EPC2_END"
+          "name": "PS7_1_EPC2_END"
         },
         "position": {
           "height": 30,
@@ -1813,7 +1813,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-1-0",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-4",
+          "name": "PS7_4",
           "originalName": "PS7-4"
         },
         "position": {
@@ -1847,7 +1847,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-0-3-6",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-7",
+          "name": "PS7_7",
           "originalName": "PS7-7"
         },
         "position": {
@@ -1882,7 +1882,7 @@
           "groupSuffix": "l",
           "id": "rect1-1-2",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-10",
+          "name": "PS6_10",
           "originalName": "PS6-10"
         },
         "position": {
@@ -1915,7 +1915,7 @@
       },
       {
         "meta": {
-          "name": "PS5-1_EPC1_END"
+          "name": "PS5_1_EPC1_END"
         },
         "position": {
           "height": 30,
@@ -1951,7 +1951,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-1-8-50",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-2",
+          "name": "PS7_2",
           "originalName": "PS7-2"
         },
         "position": {
@@ -1984,7 +1984,7 @@
       },
       {
         "meta": {
-          "name": "PS6-11_JR1"
+          "name": "PS6_11_JR1"
         },
         "position": {
           "height": 13,
@@ -2018,7 +2018,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-0",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-5",
+          "name": "PS7_5",
           "originalName": "PS7-5"
         },
         "position": {
@@ -2052,7 +2052,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-1-8",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-2",
+          "name": "PS6_2",
           "originalName": "PS6-2"
         },
         "position": {
@@ -2088,7 +2088,7 @@
           "elementPrefix": null,
           "id": "path3",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-1",
+          "name": "PS6_1",
           "originalName": "PS6-1"
         },
         "position": {
@@ -2125,7 +2125,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-0-3-6-8-0",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-14",
+          "name": "PS7_14",
           "originalName": "PS7-9"
         },
         "position": {
@@ -2159,7 +2159,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-1-6-1-8-1-3",
           "inheritedGroupPrefix": "CON",
-          "name": "PS5-4",
+          "name": "PS5_4",
           "originalName": "PS5-4"
         },
         "position": {
@@ -2192,7 +2192,7 @@
           "elementPrefix": null,
           "id": "path1-4-7-7",
           "inheritedGroupPrefix": "CON",
-          "name": "PS7-13",
+          "name": "PS7_13",
           "originalName": "PS7-13"
         },
         "position": {
@@ -2230,7 +2230,7 @@
           "groupSuffix": "l",
           "id": "rect1",
           "inheritedGroupPrefix": "CON",
-          "name": "PS6-13",
+          "name": "PS6_13",
           "originalName": "PS6-13"
         },
         "position": {
@@ -2263,7 +2263,7 @@
       },
       {
         "meta": {
-          "name": "MCM02-Lower_Button",
+          "name": "MCM02_Lower_Button",
           "tooltip": {
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }
@@ -2681,7 +2681,7 @@
       },
       {
         "meta": {
-          "name": "PS5-1_S1"
+          "name": "PS5_1_S1"
         },
         "position": {
           "height": 13,
@@ -2711,7 +2711,7 @@
       },
       {
         "meta": {
-          "name": "PS6-1_S2"
+          "name": "PS6_1_S2"
         },
         "position": {
           "height": 13,
@@ -2741,7 +2741,7 @@
       },
       {
         "meta": {
-          "name": "PS6-1_S1"
+          "name": "PS6_1_S1"
         },
         "position": {
           "height": 13,
@@ -2771,7 +2771,7 @@
       },
       {
         "meta": {
-          "name": "PS5-1_EPC1_Line_1"
+          "name": "PS5_1_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -2805,7 +2805,7 @@
       },
       {
         "meta": {
-          "name": "PS5-1_EPC1_Line_2"
+          "name": "PS5_1_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -2839,7 +2839,7 @@
       },
       {
         "meta": {
-          "name": "PS5-1_EPC2_Line_1"
+          "name": "PS5_1_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -2873,7 +2873,7 @@
       },
       {
         "meta": {
-          "name": "PS5-1_EPC2_Line_2"
+          "name": "PS5_1_EPC2_Line_2"
         },
         "position": {
           "height": 6,
@@ -3043,7 +3043,7 @@
       },
       {
         "meta": {
-          "name": "PS7-1_EPC1_Line_1"
+          "name": "PS7_1_EPC1_Line_1"
         },
         "position": {
           "height": 6,
@@ -3077,7 +3077,7 @@
       },
       {
         "meta": {
-          "name": "PS7-1_EPC1_Line_2"
+          "name": "PS7_1_EPC1_Line_2"
         },
         "position": {
           "height": 6,
@@ -3111,7 +3111,7 @@
       },
       {
         "meta": {
-          "name": "PS7-1_EPC2_Line_1"
+          "name": "PS7_1_EPC2_Line_1"
         },
         "position": {
           "height": 6,
@@ -3145,7 +3145,7 @@
       },
       {
         "meta": {
-          "name": "PS7-1_EPC2_Line_2"
+          "name": "PS7_1_EPC2_Line_2"
         },
         "position": {
           "height": 6,