GUI -- Clean up local test events.

Change-Id: I112ccb2db65a8190ff03c274717abf9735084e81
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_10_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_10_onos.json
index ec0f258..e07a3c7 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_10_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_10_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff04",
-      "FF:FF:FF:FF:FF:04",
-      "?"
+      "",
+      "opt-4",
+      "0000ffffffffff04"
     ],
     "metaUi": {
       "x": 322,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_11_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_11_onos.json
index 04e6754..71efaf3 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_11_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_11_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff000A",
-      "FF:FF:FF:FF:00:0A",
-      "?"
+      "",
+      "sw-A",
+      "0000ffffffff000A"
     ],
     "metaUi": {
       "x": 832,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_12_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_12_onos.json
index c778cd5..7d9fe61 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_12_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_12_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0001",
-      "FF:FF:FF:FF:00:01",
-      "?"
+      "",
+      "sw-1",
+      "0000ffffffff0001"
     ],
     "metaUi": {
       "x": 167,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_13_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_13_onos.json
index a0cc21f..12937b4 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_13_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_13_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff01",
-      "FF:FF:FF:FF:FF:01",
-      "?"
+      "",
+      "opt-1",
+      "0000ffffffffff01"
     ],
     "metaUi": {
       "x": 227,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_14_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_14_onos.json
index 93127a8..c4f9790 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_14_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_14_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0004",
-      "FF:FF:FF:FF:00:04",
-      "?"
+      "",
+      "sw-4",
+      "0000ffffffff0004"
     ],
     "metaUi": {
       "x": 317,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_15_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_15_onos.json
index f2d6891..6a51e77 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_15_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_15_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff0A",
-      "FF:FF:FF:FF:FF:0A",
-      "?"
+      "",
+      "opt-A",
+      "0000ffffffffff0A"
     ],
     "metaUi": {
       "x": 840,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_16_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_16_onos.json
index 3b0db4b..ba243ba5 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_16_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_16_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff09",
-      "FF:FF:FF:FF:FF:09",
-      "?"
+      "",
+      "opt-9",
+      "0000ffffffffff09"
     ],
     "metaUi": {
       "x": 1010,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_17_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_17_onos.json
index 69c62b9..1a7e24b 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_17_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_17_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff02/20-of:0000ffffffffff05/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 4,
     "src": "of:0000ffffffffff02",
     "srcPort": "20",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_18_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_18_onos.json
index d11f13e..5f9f7d7 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_18_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_18_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffff000A/2-of:0000ffffffffff0A/1",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffff000A",
     "srcPort": "2",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_19_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_19_onos.json
index 1349a3b..5c928ee 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_19_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_19_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff03/10-of:0000ffffffffff02/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff03",
     "srcPort": "10",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_1_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_1_onos.json
index 00a3e17..bd07ae6 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_1_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_1_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff08",
-      "FF:FF:FF:FF:FF:08",
-      "?"
+      "",
+      "opt-B",
+      "0000ffffffffff08"
     ],
     "metaUi": {
       "x": 539,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_20_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_20_onos.json
index e4d2161..44705d5 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_20_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_20_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff07/21-of:0000ffffffffff05/20",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff07",
     "srcPort": "21",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_21_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_21_onos.json
index ccdad88..0fa67d2 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_21_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_21_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffff0001/2-of:0000ffffffffff01/1",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffff0001",
     "srcPort": "2",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_22_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_22_onos.json
index 52a4a02..0edde2a 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_22_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_22_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff09/20-of:0000ffffffffff0A/20",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff09",
     "srcPort": "20",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_23_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_23_onos.json
index be778551..5443b41 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_23_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_23_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff07/30-of:0000ffffffffff08/20",
     "type": "optical",
+    "online": true,
     "linkWidth": 4,
     "src": "of:0000ffffffffff07",
     "srcPort": "30",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_24_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_24_onos.json
index 6ae5192..5e7bb99 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_24_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_24_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff02/10-of:0000ffffffffff01/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff02",
     "srcPort": "10",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_25_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_25_onos.json
index 7fabce6..1d0e976 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_25_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_25_onos.json
@@ -2,12 +2,13 @@
   "event": "addLink",
   "payload": {
     "id": "of:0000ffffffffff04/27-of:0000ffffffffff08/10",
+    "type": "optical",
+    "online": true,
+    "linkWidth": 2,
     "src": "of:0000ffffffffff04",
     "srcPort": "27",
     "dst": "of:0000ffffffffff08",
     "dstPort": "10",
-    "type": "optical",
-    "linkWidth": 2,
     "props" : {
       "BW": "30 G"
     }
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_26_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_26_onos.json
index b89a287..9f2cd7b 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_26_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_26_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffff0003/2-of:0000ffffffffff03/1",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffff0003",
     "srcPort": "2",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_27_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_27_onos.json
index 112a33e..23ccc22 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_27_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_27_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff09/1-of:0000ffffffff0009/2",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff09",
     "srcPort": "1",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_28_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_28_onos.json
index 52207df..84be94f 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_28_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_28_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff03/30-of:0000ffffffffff04/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff03",
     "srcPort": "30",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_29_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_29_onos.json
index c4660a3..be5c696 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_29_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_29_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff07/20-of:0000ffffffffff09/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff07",
     "srcPort": "20",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_2_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_2_onos.json
index 8d4fbfa..b00c689 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_2_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_2_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff03",
-      "FF:FF:FF:FF:FF:03",
-      "?"
+      "",
+      "opt-3",
+      "0000ffffffffff03"
     ],
     "metaUi": {
       "x": 95,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_30_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_30_onos.json
index e23cc2a..283d300 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_30_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_30_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff0A/10-of:0000ffffffffff08/30",
     "type": "optical",
+    "online": true,
     "linkWidth": 4,
     "src": "of:0000ffffffffff0A",
     "srcPort": "10",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_31_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_31_onos.json
index a798e53..965f76b 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_31_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_31_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffff0004/2-of:0000ffffffffff04/1",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffff0004",
     "srcPort": "2",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_32_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_32_onos.json
index aac204f..3d90bfa 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_32_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_32_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff07/1-of:0000ffffffff0007/2",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff07",
     "srcPort": "1",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_33_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_33_onos.json
index ab23e93..7b17dda 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_33_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_33_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff06",
-      "FF:FF:FF:FF:FF:06",
-      "?"
+      "",
+      "opt-6",
+      "0000ffffffffff06"
     ],
     "metaUi": {
       "x": 336,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_34_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_34_onos.json
index 09be8e6..a75a345 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_34_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_34_onos.json
@@ -2,12 +2,13 @@
   "event": "addLink",
   "payload": {
     "id": "of:0000ffffffffff06/20-of:0000ffffffffff05/30",
+    "type": "optical",
+    "online": true,
+    "linkWidth": 4,
     "src": "of:0000ffffffffff06",
     "srcPort": "20",
     "dst": "of:0000ffffffffff05",
     "dstPort": "30",
-    "type": "optical",
-    "linkWidth": 4,
     "props" : {
       "BW": "70 G"
     }
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_35_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_35_onos.json
index 4b612e9..055a80d 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_35_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_35_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff03/20-of:0000ffffffffff06/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff03",
     "srcPort": "20",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_36_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_36_onos.json
index cddb929..addcc6d 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_36_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_36_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff06/30-of:0000ffffffffff08/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 4,
     "src": "of:0000ffffffffff06",
     "srcPort": "30",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_37_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_37_onos.json
index 6f608cd..42adbf9 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_37_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_37_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": false,
     "labels": [
-      "0000ffffffffff08",
-      "FF:FF:FF:FF:FF:08",
-      "?"
+      "",
+      "opt-8",
+      "0000ffffffffff08"
     ],
     "metaUi": {
       "x": 539,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_38_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_38_onos.json
index 09a0339..5479f6e 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_38_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_38_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff07/30-of:0000ffffffffff08/20",
     "type": "optical",
+    "online": false,
     "linkWidth": 4,
     "src": "of:0000ffffffffff07",
     "srcPort": "30",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_39_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_39_onos.json
index a85cee6..13c2cf2 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_39_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_39_onos.json
@@ -2,12 +2,13 @@
   "event": "removeLink",
   "payload": {
     "id": "of:0000ffffffffff04/27-of:0000ffffffffff08/10",
+    "type": "optical",
+    "online": false,
+    "linkWidth": 2,
     "src": "of:0000ffffffffff04",
     "srcPort": "27",
     "dst": "of:0000ffffffffff08",
     "dstPort": "10",
-    "type": "optical",
-    "linkWidth": 2,
     "props" : {
       "BW": "30 G"
     }
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_3_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_3_onos.json
index b4c3537..eb1da81 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_3_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_3_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0007",
-      "FF:FF:FF:FF:00:07",
-      "?"
+      "",
+      "sw-7",
+      "0000ffffffff0007"
     ],
     "metaUi": {
       "x": 890,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_40_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_40_onos.json
index 1b95d24..7a9c1e1 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_40_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_40_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff0A/10-of:0000ffffffffff08/30",
     "type": "optical",
+    "online": false,
     "linkWidth": 4,
     "src": "of:0000ffffffffff0A",
     "srcPort": "10",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_41_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_41_onos.json
index 1efc1f6..fb2fa45 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_41_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_41_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff06/30-of:0000ffffffffff08/10",
     "type": "optical",
+    "online": false,
     "linkWidth": 4,
     "src": "of:0000ffffffffff06",
     "srcPort": "30",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_4_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_4_onos.json
index 053b963..495d69b 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_4_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_4_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0009",
-      "FF:FF:FF:FF:00:09",
-      "?"
+      "",
+      "sw-9",
+      "0000ffffffff0009"
     ],
     "metaUi": {
       "x": 1004,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_5_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_5_onos.json
index 332bfdb..0fe4341 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_5_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_5_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff02",
-      "FF:FF:FF:FF:FF:02",
-      "?"
+      "",
+      "opt-2",
+      "0000ffffffffff02"
     ],
     "metaUi": {
       "x": 211,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_6_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_6_onos.json
index c764bc1..7557c02 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_6_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_6_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0003",
-      "FF:FF:FF:FF:00:03",
-      "?"
+      "",
+      "sw-3",
+      "0000ffffffff0003"
     ],
     "metaUi": {
       "x": 114,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_7_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_7_onos.json
index 25a6dce..ed90ac3 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_7_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_7_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff07",
-      "FF:FF:FF:FF:FF:07",
-      "?"
+      "",
+      "opt-7",
+      "0000ffffffffff07"
     ],
     "metaUi": {
       "x": 925,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_8_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_8_onos.json
index a4082d1..f9f429b 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_8_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_8_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": false,
     "labels": [
-      "0000ffffffffff06",
-      "FF:FF:FF:FF:FF:06",
-      "?"
+      "",
+      "opt-6",
+      "0000ffffffffff06"
     ],
     "metaUi": {
       "x": 336,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_9_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_9_onos.json
index 0f497c0..72d8fed 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_9_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_9_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff05",
-      "FF:FF:FF:FF:FF:05",
-      "?"
+      "",
+      "opt-5",
+      "0000ffffffffff05"
     ],
     "metaUi": {
       "x": 539,
diff --git a/web/gui/src/main/webapp/json/ev/startup/scenario.json b/web/gui/src/main/webapp/json/ev/startup/scenario.json
index 089d53a..0fe1dd3 100644
--- a/web/gui/src/main/webapp/json/ev/startup/scenario.json
+++ b/web/gui/src/main/webapp/json/ev/startup/scenario.json
@@ -11,9 +11,8 @@
     "Loads 16 devices (10 optical, 6 packet)",
     " and their associated links.",
     "",
-    "Press 'S' to load initial events.",
-    "",
-    "Press spacebar to complete the scenario...",
+    "Press '=' to load initial events.",
+    "Press '-' to fire further events...",
     " * 4 events - device online, add 3 links",
     " * 5 events - device offline, remove 4 links"
   ]