diff --git a/models/Chart.json b/models/Chart.json
index 48050b0..66c6063 100644
--- a/models/Chart.json
+++ b/models/Chart.json
@@ -3,7 +3,7 @@
   "description": "The chart of a system or waypoint, which makes the location visible to other agents.",
   "properties": {
     "waypointSymbol": {
-      "type": "string",
+      "$ref": "./WaypointSymbol.json",
       "description": "The symbol of the waypoint."
     },
     "submittedBy": {
diff --git a/models/MarketTransaction.json b/models/MarketTransaction.json
index 7b1a95d..132aca9 100644
--- a/models/MarketTransaction.json
+++ b/models/MarketTransaction.json
@@ -2,7 +2,7 @@
   "type": "object",
   "properties": {
     "waypointSymbol": {
-      "type": "string",
+      "$ref": "./WaypointSymbol.json",
       "description": "The symbol of the waypoint where the transaction took place."
     },
     "shipSymbol": {
diff --git a/models/ScannedWaypoint.json b/models/ScannedWaypoint.json
index 83ba981..b75593a 100644
--- a/models/ScannedWaypoint.json
+++ b/models/ScannedWaypoint.json
@@ -3,16 +3,14 @@
   "type": "object",
   "properties": {
     "symbol": {
-      "type": "string",
-      "minLength": 1,
+      "$ref": "./WaypointSymbol.json",
       "description": "Symbol of the waypoint."
     },
     "type": {
       "$ref": "./WaypointType.json"
     },
     "systemSymbol": {
-      "type": "string",
-      "minLength": 1,
+      "$ref": "./SystemSymbol.json",
       "description": "Symbol of the system."
     },
     "x": {
diff --git a/models/ShipNav.json b/models/ShipNav.json
index c6aaf57..5fe1e91 100644
--- a/models/ShipNav.json
+++ b/models/ShipNav.json
@@ -3,11 +3,11 @@
   "description": "The navigation information of the ship.",
   "properties": {
     "systemSymbol": {
-      "type": "string",
+      "$ref": "./SystemSymbol.json",
       "description": "The system symbol of the ship's current location."
     },
     "waypointSymbol": {
-      "type": "string",
+      "$ref": "./WaypointSymbol.json",
       "description": "The waypoint symbol of the ship's current location, or if the ship is in-transit, the waypoint symbol of the ship's destination."
     },
     "route": {
diff --git a/models/ShipNavRouteWaypoint.json b/models/ShipNavRouteWaypoint.json
index 240dcab..ce706ef 100644
--- a/models/ShipNavRouteWaypoint.json
+++ b/models/ShipNavRouteWaypoint.json
@@ -11,8 +11,7 @@
       "$ref": "./WaypointType.json"
     },
     "systemSymbol": {
-      "type": "string",
-      "minLength": 1,
+      "$ref": "./SystemSymbol.json",
       "description": "The symbol of the system the waypoint is in."
     },
     "x": {
diff --git a/models/ShipyardTransaction.json b/models/ShipyardTransaction.json
index 0da6199..5e5c481 100644
--- a/models/ShipyardTransaction.json
+++ b/models/ShipyardTransaction.json
@@ -3,7 +3,7 @@
   "description": "Results of a transaction with a shipyard.",
   "properties": {
     "waypointSymbol": {
-      "type": "string",
+      "$ref": "./WaypointSymbol.json",
       "description": "The symbol of the waypoint where the transaction took place."
     },
     "shipSymbol": {
diff --git a/models/SystemSymbol.json b/models/SystemSymbol.json
new file mode 100644
index 0000000..e23d267
--- /dev/null
+++ b/models/SystemSymbol.json
@@ -0,0 +1,7 @@
+{
+  "type": "string",
+  "minLength": 1,
+  "x-faker": {
+    "fake": ["X1-{{random.alphaNumeric(5)}}"]
+  }
+}
\ No newline at end of file
diff --git a/models/SystemWaypoint.json b/models/SystemWaypoint.json
index 04aa605..b1eea05 100644
--- a/models/SystemWaypoint.json
+++ b/models/SystemWaypoint.json
@@ -2,7 +2,7 @@
   "type": "object",
   "properties": {
     "symbol": {
-      "type": "string",
+      "$ref": "./WaypointSymbol.json",
       "description": "The symbol of the waypoint."
     },
     "type": {
diff --git a/models/Waypoint.json b/models/Waypoint.json
index 8248d89..6b195f0 100644
--- a/models/Waypoint.json
+++ b/models/Waypoint.json
@@ -3,16 +3,14 @@
   "type": "object",
   "properties": {
     "symbol": {
-      "type": "string",
-      "minLength": 1,
+      "$ref": "./WaypointSymbol.json",
       "description": "Symbol fo the waypoint."
     },
     "type": {
       "$ref": "./WaypointType.json"
     },
     "systemSymbol": {
-      "type": "string",
-      "minLength": 1,
+      "$ref": "./SystemSymbol.json",
       "description": "The symbol of the system this waypoint belongs to."
     },
     "x": {
diff --git a/models/WaypointSymbol.json b/models/WaypointSymbol.json
new file mode 100644
index 0000000..27a1d67
--- /dev/null
+++ b/models/WaypointSymbol.json
@@ -0,0 +1,7 @@
+{
+  "type": "string",
+  "minLength": 1,
+  "x-faker": {
+    "fake": ["X1-{{random.alphaNumeric(5)}}-{{random.alphaNumeric(5)}}"]
+  }
+}
\ No newline at end of file