diff --git a/tools/test/topos/att-mpls.json b/tools/test/topos/att-mpls.json
index ccf9332..8bae0e2 100644
--- a/tools/test/topos/att-mpls.json
+++ b/tools/test/topos/att-mpls.json
@@ -1,58 +1,58 @@
 {
   "devices": [
-    { "name": "CMBR", "alias":  "s1", "uri": "of:0000000000000001", "mac": "000000000001", "annotations": { "latitude": 42.373730, "longitude": -71.109734  }, "type": "SWITCH" },
-    { "name": "CHCG", "alias":  "s2", "uri": "of:0000000000000002", "mac": "000000000002", "annotations": { "latitude": 41.877461, "longitude": -87.642892  }, "type": "SWITCH" },
-    { "name": "CLEV", "alias":  "s3", "uri": "of:0000000000000003", "mac": "000000000003", "annotations": { "latitude": 41.498928, "longitude": -81.695217  }, "type": "SWITCH" },
-    { "name": "RLGH", "alias":  "s4", "uri": "of:0000000000000004", "mac": "000000000004", "annotations": { "latitude": 35.780150, "longitude": -78.644026  }, "type": "SWITCH" },
-    { "name": "ATLN", "alias":  "s5", "uri": "of:0000000000000005", "mac": "000000000005", "annotations": { "latitude": 33.749017, "longitude": -84.394168  }, "type": "SWITCH" },
-    { "name": "PHLA", "alias":  "s6", "uri": "of:0000000000000006", "mac": "000000000006", "annotations": { "latitude": 39.952906, "longitude": -75.172278  }, "type": "SWITCH" },
-    { "name": "WASH", "alias":  "s7", "uri": "of:0000000000000007", "mac": "000000000007", "annotations": { "latitude": 38.906696, "longitude": -77.035509  }, "type": "SWITCH" },
-    { "name": "NSVL", "alias":  "s8", "uri": "of:0000000000000008", "mac": "000000000008", "annotations": { "latitude": 36.166410, "longitude": -86.787305  }, "type": "SWITCH" },
-    { "name": "STLS", "alias":  "s9", "uri": "of:0000000000000009", "mac": "000000000009", "annotations": { "latitude": 38.626418, "longitude": -90.198143  }, "type": "SWITCH" },
-    { "name": "NWOR", "alias": "s10", "uri": "of:000000000000000a", "mac": "00000000000a", "annotations": { "Xlatitude": 0.0,      "Xlongitude": 0.00       }, "type": "SWITCH" },
-    { "name": "HSTN", "alias": "s11", "uri": "of:000000000000000b", "mac": "00000000000b", "annotations": { "latitude": 29.763249, "longitude": -95.368332  }, "type": "SWITCH" },
-    { "name": "SNAN", "alias": "s12", "uri": "of:000000000000000c", "mac": "00000000000c", "annotations": { "latitude": 29.424331, "longitude": -98.491745  }, "type": "SWITCH" },
-    { "name": "DLLS", "alias": "s13", "uri": "of:000000000000000d", "mac": "00000000000d", "annotations": { "latitude": 32.777665, "longitude": -96.802064  }, "type": "SWITCH" },
-    { "name": "ORLD", "alias": "s14", "uri": "of:000000000000000e", "mac": "00000000000e", "annotations": { "latitude": 28.538641, "longitude": -81.381110  }, "type": "SWITCH" },
-    { "name": "DNVR", "alias": "s15", "uri": "of:000000000000000f", "mac": "00000000000f", "annotations": { "latitude": 39.736623, "longitude": -104.984887 }, "type": "SWITCH" },
-    { "name": "KSCY", "alias": "s16", "uri": "of:0000000000000010", "mac": "000000000010", "annotations": { "latitude": 39.100725, "longitude": -94.581228  }, "type": "SWITCH" },
-    { "name": "SNFN", "alias": "s17", "uri": "of:0000000000000011", "mac": "000000000011", "annotations": { "latitude": 37.779751, "longitude": -122.409791 }, "type": "SWITCH" },
-    { "name": "SCRM", "alias": "s18", "uri": "of:0000000000000012", "mac": "000000000012", "annotations": { "latitude": 38.581001, "longitude": -121.497844 }, "type": "SWITCH" },
-    { "name": "PTLD", "alias": "s19", "uri": "of:0000000000000013", "mac": "000000000013", "annotations": { "latitude": 45.523317, "longitude": -122.677768 }, "type": "SWITCH" },
-    { "name": "STTL", "alias": "s20", "uri": "of:0000000000000014", "mac": "000000000014", "annotations": { "latitude": 47.607326, "longitude": -122.331786 }, "type": "SWITCH" },
-    { "name": "SLKC", "alias": "s21", "uri": "of:0000000000000015", "mac": "000000000015", "annotations": { "latitude": 40.759577, "longitude": -111.895079 }, "type": "SWITCH" },
-    { "name": "LA03", "alias": "s22", "uri": "of:0000000000000016", "mac": "000000000016", "annotations": { "latitude": 34.056346, "longitude": -118.235951 }, "type": "SWITCH" },
-    { "name": "SNDG", "alias": "s23", "uri": "of:0000000000000017", "mac": "000000000017", "annotations": { "latitude": 32.714564, "longitude": -117.153528 }, "type": "SWITCH" },
-    { "name": "PHNX", "alias": "s24", "uri": "of:0000000000000018", "mac": "000000000018", "annotations": { "latitude": 33.448289, "longitude": -112.076299 }, "type": "SWITCH" },
-    { "name": "NY54", "alias": "s25", "uri": "of:0000000000000019", "mac": "000000000019", "annotations": { "latitude": 40.728270, "longitude": -73.994483  }, "type": "SWITCH" }
+    { "alias":  "s1", "uri": "of:0000000000000001", "mac": "000000000001", "annotations": { "name": "CMBR", "latitude": 42.373730, "longitude": -71.109734  }, "type": "SWITCH" },
+    { "alias":  "s2", "uri": "of:0000000000000002", "mac": "000000000002", "annotations": { "name": "CHCG", "latitude": 41.877461, "longitude": -87.642892  }, "type": "SWITCH" },
+    { "alias":  "s3", "uri": "of:0000000000000003", "mac": "000000000003", "annotations": { "name": "CLEV", "latitude": 41.498928, "longitude": -81.695217  }, "type": "SWITCH" },
+    { "alias":  "s4", "uri": "of:0000000000000004", "mac": "000000000004", "annotations": { "name": "RLGH", "latitude": 35.780150, "longitude": -78.644026  }, "type": "SWITCH" },
+    { "alias":  "s5", "uri": "of:0000000000000005", "mac": "000000000005", "annotations": { "name": "ATLN", "latitude": 33.749017, "longitude": -84.394168  }, "type": "SWITCH" },
+    { "alias":  "s6", "uri": "of:0000000000000006", "mac": "000000000006", "annotations": { "name": "PHLA", "latitude": 39.952906, "longitude": -75.172278  }, "type": "SWITCH" },
+    { "alias":  "s7", "uri": "of:0000000000000007", "mac": "000000000007", "annotations": { "name": "WASH", "latitude": 38.906696, "longitude": -77.035509  }, "type": "SWITCH" },
+    { "alias":  "s8", "uri": "of:0000000000000008", "mac": "000000000008", "annotations": { "name": "NSVL", "latitude": 36.166410, "longitude": -86.787305  }, "type": "SWITCH" },
+    { "alias":  "s9", "uri": "of:0000000000000009", "mac": "000000000009", "annotations": { "name": "STLS", "latitude": 38.626418, "longitude": -90.198143  }, "type": "SWITCH" },
+    { "alias": "s10", "uri": "of:000000000000000a", "mac": "00000000000a", "annotations": { "name": "NWOR", "Xlatitude": 0.0,      "Xlongitude": 0.00       }, "type": "SWITCH" },
+    { "alias": "s11", "uri": "of:000000000000000b", "mac": "00000000000b", "annotations": { "name": "HSTN", "latitude": 29.763249, "longitude": -95.368332  }, "type": "SWITCH" },
+    { "alias": "s12", "uri": "of:000000000000000c", "mac": "00000000000c", "annotations": { "name": "SNAN", "latitude": 29.424331, "longitude": -98.491745  }, "type": "SWITCH" },
+    { "alias": "s13", "uri": "of:000000000000000d", "mac": "00000000000d", "annotations": { "name": "DLLS", "latitude": 32.777665, "longitude": -96.802064  }, "type": "SWITCH" },
+    { "alias": "s14", "uri": "of:000000000000000e", "mac": "00000000000e", "annotations": { "name": "ORLD", "latitude": 28.538641, "longitude": -81.381110  }, "type": "SWITCH" },
+    { "alias": "s15", "uri": "of:000000000000000f", "mac": "00000000000f", "annotations": { "name": "DNVR", "latitude": 39.736623, "longitude": -104.984887 }, "type": "SWITCH" },
+    { "alias": "s16", "uri": "of:0000000000000010", "mac": "000000000010", "annotations": { "name": "KSCY", "latitude": 39.100725, "longitude": -94.581228  }, "type": "SWITCH" },
+    { "alias": "s17", "uri": "of:0000000000000011", "mac": "000000000011", "annotations": { "name": "SNFN", "latitude": 37.779751, "longitude": -122.409791 }, "type": "SWITCH" },
+    { "alias": "s18", "uri": "of:0000000000000012", "mac": "000000000012", "annotations": { "name": "SCRM", "latitude": 38.581001, "longitude": -121.497844 }, "type": "SWITCH" },
+    { "alias": "s19", "uri": "of:0000000000000013", "mac": "000000000013", "annotations": { "name": "PTLD", "latitude": 45.523317, "longitude": -122.677768 }, "type": "SWITCH" },
+    { "alias": "s20", "uri": "of:0000000000000014", "mac": "000000000014", "annotations": { "name": "STTL", "latitude": 47.607326, "longitude": -122.331786 }, "type": "SWITCH" },
+    { "alias": "s21", "uri": "of:0000000000000015", "mac": "000000000015", "annotations": { "name": "SLKC", "latitude": 40.759577, "longitude": -111.895079 }, "type": "SWITCH" },
+    { "alias": "s22", "uri": "of:0000000000000016", "mac": "000000000016", "annotations": { "name": "LA03", "latitude": 34.056346, "longitude": -118.235951 }, "type": "SWITCH" },
+    { "alias": "s23", "uri": "of:0000000000000017", "mac": "000000000017", "annotations": { "name": "SNDG", "latitude": 32.714564, "longitude": -117.153528 }, "type": "SWITCH" },
+    { "alias": "s24", "uri": "of:0000000000000018", "mac": "000000000018", "annotations": { "name": "PHNX", "latitude": 33.448289, "longitude": -112.076299 }, "type": "SWITCH" },
+    { "alias": "s25", "uri": "of:0000000000000019", "mac": "000000000019", "annotations": { "name": "NY54", "latitude": 40.728270, "longitude": -73.994483  }, "type": "SWITCH" }
   ],
 
   "hosts": [
-    { "name": "CMBR", "alias":  "h1", "mac": "00:00:00:00:00:01", "vlan": -1, "location": "of:0000000000000001/1", "ip": "10.0.0.1",  "annotations": { "latitude": 44.373730, "longitude": -71.109734  } },
-    { "name": "CHCG", "alias":  "h2", "mac": "00:00:00:00:00:02", "vlan": -1, "location": "of:0000000000000002/1", "ip": "10.0.0.2",  "annotations": { "latitude": 43.877461, "longitude": -87.642892  } },
-    { "name": "CLEV", "alias":  "h3", "mac": "00:00:00:00:00:03", "vlan": -1, "location": "of:0000000000000003/1", "ip": "10.0.0.3",  "annotations": { "latitude": 43.498928, "longitude": -81.695217  } },
-    { "name": "RLGH", "alias":  "h4", "mac": "00:00:00:00:00:04", "vlan": -1, "location": "of:0000000000000004/1", "ip": "10.0.0.4",  "annotations": { "latitude": 37.780150, "longitude": -78.644026  } },
-    { "name": "ATLN", "alias":  "h5", "mac": "00:00:00:00:00:05", "vlan": -1, "location": "of:0000000000000005/1", "ip": "10.0.0.5",  "annotations": { "latitude": 35.749017, "longitude": -84.394168  } },
-    { "name": "PHLA", "alias":  "h6", "mac": "00:00:00:00:00:06", "vlan": -1, "location": "of:0000000000000006/1", "ip": "10.0.0.6",  "annotations": { "latitude": 41.952906, "longitude": -75.172278  } },
-    { "name": "WASH", "alias":  "h7", "mac": "00:00:00:00:00:07", "vlan": -1, "location": "of:0000000000000007/1", "ip": "10.0.0.7",  "annotations": { "latitude": 40.906696, "longitude": -77.035509  } },
-    { "name": "NSVL", "alias":  "h8", "mac": "00:00:00:00:00:08", "vlan": -1, "location": "of:0000000000000008/1", "ip": "10.0.0.8",  "annotations": { "latitude": 38.166410, "longitude": -86.787305  } },
-    { "name": "STLS", "alias":  "h9", "mac": "00:00:00:00:00:09", "vlan": -1, "location": "of:0000000000000009/1", "ip": "10.0.0.9",  "annotations": { "latitude": 40.626418, "longitude": -90.198143  } },
-    { "name": "NWOR", "alias": "h10", "mac": "00:00:00:00:00:0a", "vlan": -1, "location": "of:000000000000000a/1", "ip": "10.0.0.10", "annotations": { "Xlatitude": 0.0,      "Xlongitude": 0.00       } },
-    { "name": "HSTN", "alias": "h11", "mac": "00:00:00:00:00:0b", "vlan": -1, "location": "of:000000000000000b/1", "ip": "10.0.0.11", "annotations": { "latitude": 31.763249, "longitude": -95.368332  } },
-    { "name": "SNAN", "alias": "h12", "mac": "00:00:00:00:00:0c", "vlan": -1, "location": "of:000000000000000c/1", "ip": "10.0.0.12", "annotations": { "latitude": 31.424331, "longitude": -98.491745  } },
-    { "name": "DLLS", "alias": "h13", "mac": "00:00:00:00:00:0d", "vlan": -1, "location": "of:000000000000000d/1", "ip": "10.0.0.13", "annotations": { "latitude": 34.777665, "longitude": -96.802064  } },
-    { "name": "ORLD", "alias": "h14", "mac": "00:00:00:00:00:0e", "vlan": -1, "location": "of:000000000000000e/1", "ip": "10.0.0.14", "annotations": { "latitude": 31.538641, "longitude": -81.381110  } },
-    { "name": "DNVR", "alias": "h15", "mac": "00:00:00:00:00:0f", "vlan": -1, "location": "of:000000000000000f/1", "ip": "10.0.0.15", "annotations": { "latitude": 41.736623, "longitude": -104.984887 } },
-    { "name": "KSCY", "alias": "h16", "mac": "00:00:00:00:00:10", "vlan": -1, "location": "of:0000000000000010/1", "ip": "10.0.0.16", "annotations": { "latitude": 41.100725, "longitude": -94.581228  } },
-    { "name": "SNFN", "alias": "h17", "mac": "00:00:00:00:00:11", "vlan": -1, "location": "of:0000000000000011/1", "ip": "10.0.0.17", "annotations": { "latitude": 39.779751, "longitude": -122.409791 } },
-    { "name": "SCRM", "alias": "h18", "mac": "00:00:00:00:00:12", "vlan": -1, "location": "of:0000000000000012/1", "ip": "10.0.0.18", "annotations": { "latitude": 40.581001, "longitude": -121.497844 } },
-    { "name": "PTLD", "alias": "h19", "mac": "00:00:00:00:00:13", "vlan": -1, "location": "of:0000000000000013/1", "ip": "10.0.0.19", "annotations": { "latitude": 47.523317, "longitude": -122.677768 } },
-    { "name": "STTL", "alias": "h20", "mac": "00:00:00:00:00:14", "vlan": -1, "location": "of:0000000000000014/1", "ip": "10.0.0.20", "annotations": { "latitude": 49.607326, "longitude": -122.331786 } },
-    { "name": "SLKC", "alias": "h21", "mac": "00:00:00:00:00:15", "vlan": -1, "location": "of:0000000000000015/1", "ip": "10.0.0.21", "annotations": { "latitude": 42.759577, "longitude": -111.895079 } },
-    { "name": "LA03", "alias": "h22", "mac": "00:00:00:00:00:16", "vlan": -1, "location": "of:0000000000000016/1", "ip": "10.0.0.22", "annotations": { "latitude": 36.056346, "longitude": -118.235951 } },
-    { "name": "SNDG", "alias": "h23", "mac": "00:00:00:00:00:17", "vlan": -1, "location": "of:0000000000000017/1", "ip": "10.0.0.23", "annotations": { "latitude": 34.714564, "longitude": -117.153528 } },
-    { "name": "PHNX", "alias": "h24", "mac": "00:00:00:00:00:18", "vlan": -1, "location": "of:0000000000000018/1", "ip": "10.0.0.24", "annotations": { "latitude": 35.448289, "longitude": -112.076299 } },
-    { "name": "NY54", "alias": "h25", "mac": "00:00:00:00:00:19", "vlan": -1, "location": "of:0000000000000019/1", "ip": "10.0.0.25", "annotations": { "latitude": 42.728270, "longitude": -73.994483  } }
+    { "alias":  "h1", "mac": "00:00:00:00:00:01", "vlan": -1, "location": "of:0000000000000001/1", "ip": "10.0.0.1",  "annotations": { "name": "CMBR", "latitude": 44.373730, "longitude": -71.109734  } },
+    { "alias":  "h2", "mac": "00:00:00:00:00:02", "vlan": -1, "location": "of:0000000000000002/1", "ip": "10.0.0.2",  "annotations": { "name": "CHCG", "latitude": 43.877461, "longitude": -87.642892  } },
+    { "alias":  "h3", "mac": "00:00:00:00:00:03", "vlan": -1, "location": "of:0000000000000003/1", "ip": "10.0.0.3",  "annotations": { "name": "CLEV", "latitude": 43.498928, "longitude": -81.695217  } },
+    { "alias":  "h4", "mac": "00:00:00:00:00:04", "vlan": -1, "location": "of:0000000000000004/1", "ip": "10.0.0.4",  "annotations": { "name": "RLGH", "latitude": 37.780150, "longitude": -78.644026  } },
+    { "alias":  "h5", "mac": "00:00:00:00:00:05", "vlan": -1, "location": "of:0000000000000005/1", "ip": "10.0.0.5",  "annotations": { "name": "ATLN", "latitude": 35.749017, "longitude": -84.394168  } },
+    { "alias":  "h6", "mac": "00:00:00:00:00:06", "vlan": -1, "location": "of:0000000000000006/1", "ip": "10.0.0.6",  "annotations": { "name": "PHLA", "latitude": 41.952906, "longitude": -75.172278  } },
+    { "alias":  "h7", "mac": "00:00:00:00:00:07", "vlan": -1, "location": "of:0000000000000007/1", "ip": "10.0.0.7",  "annotations": { "name": "WASH", "latitude": 40.906696, "longitude": -77.035509  } },
+    { "alias":  "h8", "mac": "00:00:00:00:00:08", "vlan": -1, "location": "of:0000000000000008/1", "ip": "10.0.0.8",  "annotations": { "name": "NSVL", "latitude": 38.166410, "longitude": -86.787305  } },
+    { "alias":  "h9", "mac": "00:00:00:00:00:09", "vlan": -1, "location": "of:0000000000000009/1", "ip": "10.0.0.9",  "annotations": { "name": "STLS", "latitude": 40.626418, "longitude": -90.198143  } },
+    { "alias": "h10", "mac": "00:00:00:00:00:0a", "vlan": -1, "location": "of:000000000000000a/1", "ip": "10.0.0.10", "annotations": { "name": "NWOR", "Xlatitude": 0.0,      "Xlongitude": 0.00       } },
+    { "alias": "h11", "mac": "00:00:00:00:00:0b", "vlan": -1, "location": "of:000000000000000b/1", "ip": "10.0.0.11", "annotations": { "name": "HSTN", "latitude": 31.763249, "longitude": -95.368332  } },
+    { "alias": "h12", "mac": "00:00:00:00:00:0c", "vlan": -1, "location": "of:000000000000000c/1", "ip": "10.0.0.12", "annotations": { "name": "SNAN", "latitude": 31.424331, "longitude": -98.491745  } },
+    { "alias": "h13", "mac": "00:00:00:00:00:0d", "vlan": -1, "location": "of:000000000000000d/1", "ip": "10.0.0.13", "annotations": { "name": "DLLS", "latitude": 34.777665, "longitude": -96.802064  } },
+    { "alias": "h14", "mac": "00:00:00:00:00:0e", "vlan": -1, "location": "of:000000000000000e/1", "ip": "10.0.0.14", "annotations": { "name": "ORLD", "latitude": 31.538641, "longitude": -81.381110  } },
+    { "alias": "h15", "mac": "00:00:00:00:00:0f", "vlan": -1, "location": "of:000000000000000f/1", "ip": "10.0.0.15", "annotations": { "name": "DNVR", "latitude": 41.736623, "longitude": -104.984887 } },
+    { "alias": "h16", "mac": "00:00:00:00:00:10", "vlan": -1, "location": "of:0000000000000010/1", "ip": "10.0.0.16", "annotations": { "name": "KSCY", "latitude": 41.100725, "longitude": -94.581228  } },
+    { "alias": "h17", "mac": "00:00:00:00:00:11", "vlan": -1, "location": "of:0000000000000011/1", "ip": "10.0.0.17", "annotations": { "name": "SNFN", "latitude": 39.779751, "longitude": -122.409791 } },
+    { "alias": "h18", "mac": "00:00:00:00:00:12", "vlan": -1, "location": "of:0000000000000012/1", "ip": "10.0.0.18", "annotations": { "name": "SCRM", "latitude": 40.581001, "longitude": -121.497844 } },
+    { "alias": "h19", "mac": "00:00:00:00:00:13", "vlan": -1, "location": "of:0000000000000013/1", "ip": "10.0.0.19", "annotations": { "name": "PTLD", "latitude": 47.523317, "longitude": -122.677768 } },
+    { "alias": "h20", "mac": "00:00:00:00:00:14", "vlan": -1, "location": "of:0000000000000014/1", "ip": "10.0.0.20", "annotations": { "name": "STTL", "latitude": 49.607326, "longitude": -122.331786 } },
+    { "alias": "h21", "mac": "00:00:00:00:00:15", "vlan": -1, "location": "of:0000000000000015/1", "ip": "10.0.0.21", "annotations": { "name": "SLKC", "latitude": 42.759577, "longitude": -111.895079 } },
+    { "alias": "h22", "mac": "00:00:00:00:00:16", "vlan": -1, "location": "of:0000000000000016/1", "ip": "10.0.0.22", "annotations": { "name": "LA03", "latitude": 36.056346, "longitude": -118.235951 } },
+    { "alias": "h23", "mac": "00:00:00:00:00:17", "vlan": -1, "location": "of:0000000000000017/1", "ip": "10.0.0.23", "annotations": { "name": "SNDG", "latitude": 34.714564, "longitude": -117.153528 } },
+    { "alias": "h24", "mac": "00:00:00:00:00:18", "vlan": -1, "location": "of:0000000000000018/1", "ip": "10.0.0.24", "annotations": { "name": "PHNX", "latitude": 35.448289, "longitude": -112.076299 } },
+    { "alias": "h25", "mac": "00:00:00:00:00:19", "vlan": -1, "location": "of:0000000000000019/1", "ip": "10.0.0.25", "annotations": { "name": "NY54", "latitude": 42.728270, "longitude": -73.994483  } }
   ]
 
 }
diff --git a/tools/test/topos/oe-linear-3.json b/tools/test/topos/oe-linear-3.json
index 71addcb..44fccd9 100644
--- a/tools/test/topos/oe-linear-3.json
+++ b/tools/test/topos/oe-linear-3.json
@@ -2,33 +2,33 @@
     "devices" : [
         {
             "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM1",
-            "annotations": { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROADM1", "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
             "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM2",
-            "annotations": { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROADM2", "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
             "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM3",
-            "annotations": { "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROADM3", "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 },
             "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
         },
 
         {
             "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
-            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER1",
-            "annotations": { "latitude": 37.6, "longitude": -122.3 },
+            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROUTER1", "latitude": 37.6, "longitude": -122.3 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH",
-            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER2",
-            "annotations": { "latitude": 37.3, "longitude": -121.9 },
+            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROUTER2", "latitude": 37.3, "longitude": -121.9 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         }
     ],
diff --git a/tools/test/topos/oe-nonlinear-10.json b/tools/test/topos/oe-nonlinear-10.json
index d208bff..11a8784 100644
--- a/tools/test/topos/oe-nonlinear-10.json
+++ b/tools/test/topos/oe-nonlinear-10.json
@@ -2,40 +2,40 @@
     "devices" : [
         {
             "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SFO-W10",
-            "annotations": { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "SFO-W10", "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
             "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" },
             { "port": 50, "speed":100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SJC-W10",
-            "annotations": { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "SJC-W10", "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
             "ports": [ { "port": 20, "speed": 100000, "type": "FIBER" },
             { "port": 30, "speed": 0, "type": "FIBER" },
             { "port": 50, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "LAX-W10",
-            "annotations": { "latitude": 33.9, "longitude": -118.4, "optical.regens": 0 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "LAX-W10", "latitude": 33.9, "longitude": -118.4, "optical.regens": 0 },
             "ports": [ { "port": 30, "speed": 0, "type": "FIBER" },
             { "port": 50, "speed": 0, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SDG-W10",
-            "annotations": { "latitude": 32.8, "longitude": -117.1, "optical.regens": 3 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "SDG-W10", "latitude": 32.8, "longitude": -117.1, "optical.regens": 3 },
             "ports": [ { "port": 30, "speed": 0, "type": "FIBER" },
             { "port":50, "speed": 0, "type": "FIBER" },
              { "port":20, "speed": 0, "type": "FIBER" }]
         },
         {
             "uri": "of:0000ffffffffff05", "mac": "ffffffffffff05", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "MSP-M10",
-            "annotations": { "latitude": 44.8, "longitude": -93.1, "optical.regens": 3 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "MSP-M10", "latitude": 44.8, "longitude": -93.1, "optical.regens": 3 },
             "ports": [ { "port": 20, "speed": 0, "type": "FIBER" },
              { "port": 30, "speed": 0, "type": "FIBER" },
              { "port": 40, "speed": 0, "type": "FIBER" },
@@ -43,8 +43,8 @@
         },
         {
             "uri": "of:0000ffffffffff06", "mac": "ffffffffffff06", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "DFW-M10",
-            "annotations": { "latitude": 32.8, "longitude": -97.1, "optical.regens": 3 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "DFW-M10", "latitude": 32.8, "longitude": -97.1, "optical.regens": 3 },
             "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" },
              { "port": 30, "speed": 0, "type": "FIBER" },
@@ -53,8 +53,8 @@
         },
         {
             "uri": "of:0000ffffffffff07", "mac": "ffffffffffff07", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "CHG-N10",
-            "annotations": { "latitude": 41.8, "longitude": -120.1, "optical.regens": 3 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": {  "name": "CHG-N10", "latitude": 41.8, "longitude": -87.6, "optical.regens": 3 },
             "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" },
              { "port": 30, "speed": 0, "type": "FIBER" },
@@ -62,62 +62,62 @@
         },
         {
             "uri": "of:0000ffffffffff08", "mac": "ffffffffffff08", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "IAD-M10",
-            "annotations": { "latitude": 38.8, "longitude": -77.1, "optical.regens": 3 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": {  "name": "IAD-M10", "latitude": 38.8, "longitude": -77.1, "optical.regens": 3 },
             "ports": [ { "port": 20, "speed": 0, "type": "FIBER" },
              { "port": 30, "speed": 0, "type": "FIBER" },
              { "port": 50, "speed": 0, "type": "FIBER" }]
         },
         {
             "uri": "of:0000ffffffffff09", "mac": "ffffffffffff09", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "JFK-M10",
-            "annotations": { "latitude": 40.8, "longitude": -73.1, "optical.regens": 0 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "JFK-M10", "latitude": 40.8, "longitude": -73.1, "optical.regens": 0 },
             "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" },
             { "port": 50, "speed": 0, "type": "FIBER" }]
         },
         {
             "uri": "of:0000ffffffffff0A", "mac": "ffffffffffff0A", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ATL-S10",
-            "annotations": { "latitude": 33.8, "longitude": -84.1, "optical.regens": 0 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "ATL-S10", "latitude": 33.8, "longitude": -84.1, "optical.regens": 0 },
             "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" },
             { "port": 50, "speed": 0, "type": "FIBER" }]
         },
         {
             "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
-            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "SFO-R10",
-            "annotations": { "latitude": 37.6, "longitude": -122.3 },
+            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+            "annotations": { "name": "SFO-R10", "latitude": 37.6, "longitude": -122.3 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0002", "mac": "ffffffffff0003", "type": "SWITCH",
-            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "LAX-R10",
-            "annotations": { "latitude": 33.9, "longitude": -118.4 },
+            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+            "annotations": { "name": "LAX-R10", "latitude": 33.9, "longitude": -118.4 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0003", "mac": "ffffffffff0004", "type": "SWITCH",
-            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "SDG-R10",
-            "annotations": { "latitude": 32.8, "longitude": -117.1 },
+            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+            "annotations": { "name": "SDG-R10", "latitude": 32.8, "longitude": -117.1 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0004", "mac": "ffffffffff0007", "type": "SWITCH",
-            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "CHG-R10",
-            "annotations": { "latitude": 41.8, "longitude": -120.1 },
+            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+            "annotations": { "name": "CHG-R10", "latitude": 41.8, "longitude": -87.6 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0005", "mac": "ffffffffff0009", "type": "SWITCH",
-            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "JFK-R10",
-            "annotations": { "latitude": 40.8, "longitude": -73.1 },
+            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+            "annotations": { "name": "JFK-R10", "latitude": 40.8, "longitude": -73.1 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0006", "mac": "ffffffffff000A", "type": "SWITCH",
-            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ATL-R10",
-            "annotations": { "latitude": 33.8, "longitude": -84.1 },
+            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+            "annotations": { "name": "ATL-R10", "latitude": 33.8, "longitude": -84.1 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         }
 
diff --git a/tools/test/topos/oe-nonlinear-4.json b/tools/test/topos/oe-nonlinear-4.json
index 3a0d18c..47782a8 100644
--- a/tools/test/topos/oe-nonlinear-4.json
+++ b/tools/test/topos/oe-nonlinear-4.json
@@ -2,38 +2,38 @@
     "devices" : [
         {
             "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM1",
-            "annotations": { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROADM1", "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
             "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM2",
-            "annotations": { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROADM2", "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
             "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM3",
-            "annotations": { "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROADM3", "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 },
             "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type":"ROADM",
-            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM4",
-            "annotations": { "latitude": 39.9, "longitude": -119.4, "optical.regens": 2 },
+            "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROADM4", "latitude": 39.9, "longitude": -119.4, "optical.regens": 2 },
             "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
-            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER1",
-            "annotations": { "latitude": 37.6, "longitude": -122.3 },
+            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROUTER1", "latitude": 37.6, "longitude": -122.3 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH",
-            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER2",
-            "annotations": { "latitude": 37.3, "longitude": -121.9 },
+            "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+            "annotations": { "name": "ROUTER2", "latitude": 37.3, "longitude": -121.9 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         }
     ],
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
index fdc8d06..87ea7cd 100644
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
@@ -143,8 +143,10 @@
     // Produces JSON structure from annotations.
     private JsonNode props(Annotations annotations) {
         ObjectNode props = mapper.createObjectNode();
-        for (String key : annotations.keys()) {
-            props.put(key, annotations.value(key));
+        if (annotations != null) {
+            for (String key : annotations.keys()) {
+                props.put(key, annotations.value(key));
+            }
         }
         return props;
     }
@@ -306,6 +308,10 @@
     // Adds a geo location JSON to the specified payload object.
     private void addGeoLocation(Annotated annotated, ObjectNode payload) {
         Annotations annotations = annotated.annotations();
+        if (annotations == null) {
+            return;
+        }
+
         String slat = annotations.value("latitude");
         String slng = annotations.value("longitude");
         try {