diff --git a/server/data/systems.db b/server/data/systems.db
index e339af242..b04d174f0 100644
Binary files a/server/data/systems.db and b/server/data/systems.db differ
diff --git a/wiki/star-systems/GJ-144/bodies/GJ144d/markers.json b/wiki/star-systems/GJ-144/bodies/GJ144d/markers.json
index 3e17cf6a6..3f49bb738 100644
--- a/wiki/star-systems/GJ-144/bodies/GJ144d/markers.json
+++ b/wiki/star-systems/GJ-144/bodies/GJ144d/markers.json
@@ -6,7 +6,7 @@
   "rivers": [
     {
       "id": "river_0",
-      "name": "Flatland Stream",
+      "name": "R\u00e1n's Run",
       "path": [
         [
           142,
@@ -108,7 +108,7 @@
     },
     {
       "id": "river_1",
-      "name": "Gap Crossing",
+      "name": "Randalfoss",
       "path": [
         [
           132,
@@ -202,7 +202,7 @@
     },
     {
       "id": "river_2",
-      "name": "Ridge Fork",
+      "name": "Scarp Fork",
       "path": [
         [
           255,
@@ -276,7 +276,7 @@
     },
     {
       "id": "river_3",
-      "name": "Pine Gulch",
+      "name": "Timber Keld",
       "path": [
         [
           106,
@@ -326,7 +326,7 @@
     },
     {
       "id": "river_4",
-      "name": "Valley View",
+      "name": "Ranfall Beck",
       "path": [
         [
           22,
@@ -372,7 +372,7 @@
     },
     {
       "id": "river_5",
-      "name": "Canyon Edge",
+      "name": "Cliff Leat",
       "path": [
         [
           229,
@@ -416,7 +416,7 @@
   "oceans": [
     {
       "id": "water_0",
-      "name": "West Pass",
+      "name": "R\u00e1n Sea",
       "kind": "sea",
       "center": [
         22,
@@ -426,7 +426,7 @@
     },
     {
       "id": "water_1",
-      "name": "Boulder Bluff",
+      "name": "Keldmere",
       "kind": "ocean",
       "center": [
         38,
@@ -436,7 +436,7 @@
     },
     {
       "id": "water_2",
-      "name": "High Mesa",
+      "name": "Seterfjord",
       "kind": "ocean",
       "center": [
         185,
@@ -448,7 +448,7 @@
   "mountain_ranges": [
     {
       "id": "range_0",
-      "name": "Sierra Peak",
+      "name": "Seterfjellet",
       "center": [
         75,
         163
@@ -461,7 +461,7 @@
     },
     {
       "id": "range_1",
-      "name": "Prairie Bend",
+      "name": "Kaldmoor Ridge",
       "center": [
         84,
         38
@@ -474,7 +474,7 @@
     },
     {
       "id": "range_2",
-      "name": "Delta Reach",
+      "name": "Ranholm Escarpment",
       "center": [
         136,
         23
@@ -489,7 +489,7 @@
   "roads": [
     {
       "id": "road_0",
-      "name": "",
+      "name": "Kallast\u2013R\u00e1n's Landing Corridor",
       "kind": "commercial",
       "path": [
         [
@@ -758,7 +758,7 @@
   "cities": [
     {
       "id": "city_0",
-      "name": "Iron Creek",
+      "name": "Kallast",
       "kind": "capital",
       "center": [
         250,
@@ -768,7 +768,7 @@
     },
     {
       "id": "city_1",
-      "name": "Willow Bend",
+      "name": "R\u00e1n's Landing",
       "kind": "city",
       "center": [
         246,
@@ -780,7 +780,7 @@
   "railroads": [
     {
       "id": "railroad_0",
-      "name": "",
+      "name": "Kallast\u2013R\u00e1n's Landing Express",
       "kind": "passenger_freight",
       "path": [
         [
@@ -1049,7 +1049,7 @@
   "pois": [
     {
       "id": "poi_0",
-      "name": "Summit Point",
+      "name": "Kallast Gate Terminal",
       "kind": "transit",
       "center": [
         250,
diff --git a/wiki/star-systems/GJ-144/bodies/GJ144e/markers.json b/wiki/star-systems/GJ-144/bodies/GJ144e/markers.json
index ad04f260c..a6fa9aa6c 100644
--- a/wiki/star-systems/GJ-144/bodies/GJ144e/markers.json
+++ b/wiki/star-systems/GJ-144/bodies/GJ144e/markers.json
@@ -6,7 +6,7 @@
   "rivers": [
     {
       "id": "river_0",
-      "name": "Riverbend",
+      "name": "Greywash",
       "path": [
         [
           147,
@@ -184,7 +184,7 @@
     },
     {
       "id": "river_1",
-      "name": "West Bend",
+      "name": "Greywash Fork",
       "path": [
         [
           154,
@@ -346,7 +346,7 @@
     },
     {
       "id": "river_2",
-      "name": "Delta Flow",
+      "name": "Veth Delta",
       "path": [
         [
           183,
@@ -408,7 +408,7 @@
     },
     {
       "id": "river_3",
-      "name": "Stone Point",
+      "name": "Thornrun",
       "path": [
         [
           248,
@@ -462,7 +462,7 @@
     },
     {
       "id": "river_4",
-      "name": "Mesa Run",
+      "name": "Kelside Run",
       "path": [
         [
           232,
@@ -508,7 +508,7 @@
     },
     {
       "id": "river_5",
-      "name": "Blue Ridge",
+      "name": "Ashvale Beck",
       "path": [
         [
           7,
@@ -556,7 +556,7 @@
   "oceans": [
     {
       "id": "water_0",
-      "name": "Canyon View",
+      "name": "Dusthollow",
       "kind": "ocean",
       "center": [
         64,
@@ -566,7 +566,7 @@
     },
     {
       "id": "water_1",
-      "name": "Flat Ground",
+      "name": "The Morlands",
       "kind": "lake",
       "center": [
         216,
@@ -576,7 +576,7 @@
     },
     {
       "id": "water_2",
-      "name": "High Bluff",
+      "name": "Veth Mere",
       "kind": "lake",
       "center": [
         219,
@@ -588,7 +588,7 @@
   "mountain_ranges": [
     {
       "id": "range_0",
-      "name": "Timberline",
+      "name": "Thorncrests",
       "center": [
         177,
         183
@@ -601,7 +601,7 @@
     },
     {
       "id": "range_1",
-      "name": "Golden Valley",
+      "name": "Greymoor Range",
       "center": [
         180,
         4
@@ -614,7 +614,7 @@
     },
     {
       "id": "range_2",
-      "name": "Swift River",
+      "name": "Strandford Heights",
       "center": [
         200,
         17
@@ -627,7 +627,7 @@
     },
     {
       "id": "range_3",
-      "name": "Eastern Slope",
+      "name": "Far Shore Spine",
       "center": [
         193,
         395
@@ -640,7 +640,7 @@
     },
     {
       "id": "range_4",
-      "name": "Broad Fork",
+      "name": "Keld Spur",
       "center": [
         240,
         245
@@ -653,7 +653,7 @@
     },
     {
       "id": "range_5",
-      "name": "Granite Ridge",
+      "name": "Greystone Ridge",
       "center": [
         243,
         501
@@ -668,7 +668,7 @@
   "roads": [
     {
       "id": "road_0",
-      "name": "",
+      "name": "Vethis Station\u2013Ashvale Corridor",
       "kind": "commercial",
       "path": [
         [
@@ -905,7 +905,7 @@
   "cities": [
     {
       "id": "city_0",
-      "name": "Prairie View",
+      "name": "Vethis Station",
       "kind": "capital",
       "center": [
         212,
@@ -915,7 +915,7 @@
     },
     {
       "id": "city_1",
-      "name": "Dusty Gulch",
+      "name": "Ashvale",
       "kind": "city",
       "center": [
         221,
@@ -925,7 +925,7 @@
     },
     {
       "id": "city_2",
-      "name": "Stony Creek",
+      "name": "Kelbridge",
       "kind": "city",
       "center": [
         7,
@@ -935,7 +935,7 @@
     },
     {
       "id": "city_3",
-      "name": "Iron Pass",
+      "name": "Irongate",
       "kind": "city",
       "center": [
         46,
@@ -947,7 +947,7 @@
   "railroads": [
     {
       "id": "railroad_0",
-      "name": "",
+      "name": "Vethis Station\u2013Ashvale Express",
       "kind": "passenger_freight",
       "path": [
         [
@@ -1184,7 +1184,7 @@
   "pois": [
     {
       "id": "poi_0",
-      "name": "Ridge Crossing",
+      "name": "Vethis Gate Terminal",
       "kind": "transit",
       "center": [
         221,
diff --git a/wiki/star-systems/GJ-71/bodies/GJ71c/markers.json b/wiki/star-systems/GJ-71/bodies/GJ71c/markers.json
index 9512735a4..340154307 100644
--- a/wiki/star-systems/GJ-71/bodies/GJ71c/markers.json
+++ b/wiki/star-systems/GJ-71/bodies/GJ71c/markers.json
@@ -6,7 +6,7 @@
   "rivers": [
     {
       "id": "river_0",
-      "name": "Aethelred",
+      "name": "Gaius",
       "path": [
         [
           127,
@@ -395,7 +395,7 @@
     },
     {
       "id": "range_1",
-      "name": "Pantheon",
+      "name": "Arcanum",
       "center": [
         75,
         150
@@ -408,7 +408,7 @@
     },
     {
       "id": "range_2",
-      "name": "Capitolium",
+      "name": "Firmamentum",
       "center": [
         130,
         329
@@ -437,7 +437,7 @@
   "cities": [
     {
       "id": "city_0",
-      "name": "Forum Veritas",
+      "name": "Janua",
       "kind": "capital",
       "center": [
         111,
@@ -458,4 +458,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/wiki/star-systems/GJ-71/bodies/GJ71d-1/markers.json b/wiki/star-systems/GJ-71/bodies/GJ71d-1/markers.json
index 506e307c0..96266335c 100644
--- a/wiki/star-systems/GJ-71/bodies/GJ71d-1/markers.json
+++ b/wiki/star-systems/GJ-71/bodies/GJ71d-1/markers.json
@@ -8,7 +8,7 @@
   "mountain_ranges": [
     {
       "id": "range_0",
-      "name": "The Basilica",
+      "name": "The Lateranum",
       "center": [
         164,
         248
@@ -21,7 +21,7 @@
     },
     {
       "id": "range_1",
-      "name": "The Senate Hall",
+      "name": "The Curia Magna",
       "center": [
         93,
         48
@@ -34,7 +34,7 @@
     },
     {
       "id": "range_2",
-      "name": "The Lyceum",
+      "name": "The Exedra",
       "center": [
         79,
         138
@@ -47,7 +47,7 @@
     },
     {
       "id": "range_3",
-      "name": "The Collegium",
+      "name": "The Aedes Sacra",
       "center": [
         127,
         168
@@ -60,7 +60,7 @@
     },
     {
       "id": "range_4",
-      "name": "The Forum",
+      "name": "The Macellum",
       "center": [
         37,
         22
@@ -86,7 +86,7 @@
     },
     {
       "id": "range_6",
-      "name": "The Tribunal",
+      "name": "The Comitium",
       "center": [
         217,
         378
@@ -115,7 +115,7 @@
   "cities": [
     {
       "id": "city_0",
-      "name": "The Capitolium",
+      "name": "Praetorium",
       "kind": "capital",
       "center": [
         190,
@@ -128,7 +128,7 @@
   "pois": [
     {
       "id": "poi_0",
-      "name": "The Pantheon",
+      "name": "The Pronaos",
       "kind": "transit",
       "center": [
         190,
diff --git a/wiki/star-systems/GJ-71/bodies/GJ71d/markers.json b/wiki/star-systems/GJ-71/bodies/GJ71d/markers.json
index d9d3dfa4c..f4064c3bb 100644
--- a/wiki/star-systems/GJ-71/bodies/GJ71d/markers.json
+++ b/wiki/star-systems/GJ-71/bodies/GJ71d/markers.json
@@ -6,7 +6,7 @@
   "rivers": [
     {
       "id": "river_0",
-      "name": "The Prefecture",
+      "name": "The Rostrum",
       "path": [
         [
           93,
@@ -192,7 +192,7 @@
     },
     {
       "id": "river_1",
-      "name": "Basilica Nova",
+      "name": "Via Principia",
       "path": [
         [
           101,
@@ -462,7 +462,7 @@
     },
     {
       "id": "river_4",
-      "name": "Senate House",
+      "name": "The Curia",
       "path": [
         [
           165,
@@ -540,7 +540,7 @@
     },
     {
       "id": "river_5",
-      "name": "The Tribunal",
+      "name": "The Decumanus",
       "path": [
         [
           255,
@@ -612,7 +612,7 @@
   "oceans": [
     {
       "id": "water_0",
-      "name": "The Pantheon",
+      "name": "The Augusteum",
       "kind": "ocean",
       "center": [
         39,
@@ -632,7 +632,7 @@
     },
     {
       "id": "water_2",
-      "name": "The Lyceum",
+      "name": "The Porticus",
       "kind": "lake",
       "center": [
         227,
@@ -670,7 +670,7 @@
     },
     {
       "id": "range_2",
-      "name": "The Foundation",
+      "name": "The Substructures",
       "center": [
         146,
         155
@@ -683,7 +683,7 @@
     },
     {
       "id": "range_3",
-      "name": "The Axiom",
+      "name": "The Codicil",
       "center": [
         161,
         155
@@ -696,7 +696,7 @@
     },
     {
       "id": "range_4",
-      "name": "The Citadel",
+      "name": "The Oppidum",
       "center": [
         215,
         440
@@ -724,7 +724,7 @@
   "roads": [
     {
       "id": "road_0",
-      "name": "",
+      "name": "Palaestra\u2013Veritas Square Corridor",
       "kind": "commercial",
       "path": [
         [
@@ -993,7 +993,7 @@
   "cities": [
     {
       "id": "city_0",
-      "name": "Athenaeum",
+      "name": "Palaestra",
       "kind": "capital",
       "center": [
         242,
@@ -1013,7 +1013,7 @@
     },
     {
       "id": "city_2",
-      "name": "Concordia Hall",
+      "name": "The Praxis",
       "kind": "city",
       "center": [
         51,
@@ -1025,7 +1025,7 @@
   "railroads": [
     {
       "id": "railroad_0",
-      "name": "",
+      "name": "Palaestra\u2013Veritas Square Express",
       "kind": "passenger_freight",
       "path": [
         [