diff --git a/static/mapFiles/yaml/0001.yaml b/static/mapFiles/yaml/0001.yaml
index efaa67a..4d62605 100644
--- a/static/mapFiles/yaml/0001.yaml
+++ b/static/mapFiles/yaml/0001.yaml
@@ -52,7 +52,7 @@ routeDetail:
     chains: 52
 
   - type: crossovers
-    name: Subway Junction
+    name: Subway Jn
     miles: 0
     chains: 61
 
@@ -85,7 +85,7 @@ routeDetail:
     chains: 18
 
   - type: junction
-    name: Westbourne Park Junction
+    name: Westbourne Park Jn
     diverges: left
     direction: up
     description: to Crossrail Core Operating Section
@@ -93,7 +93,7 @@ routeDetail:
     chains: 21
 
   - type: crossovers
-    name: Portobello Junction
+    name: Portobello Jn
     miles: 1
     chains: 33
 
@@ -120,7 +120,7 @@ routeDetail:
     chains: 73
 
   - type: junction
-    name: Kensal Green East Junction
+    name: Kensal Green East Jn
     diverges: both
     direction: down
     description: to Crossrail & North Pole Depots
@@ -177,7 +177,7 @@ routeDetail:
     chains: 45
 
   - type: junction
-    name: Friars Junction
+    name: Friars Jn
     diverges: left
     direction: up
     elecBranch: none
@@ -207,7 +207,7 @@ routeDetail:
     chains: 80
 
   - type: junction
-    name: Acton East Junction
+    name: Acton East Jn
     diverges: left
     direction: up
     description: Up/Dn Poplar to Acton Wells Jn
@@ -312,7 +312,7 @@ routeDetail:
     chains: 46
 
   - type: junction
-    name: West Ealing Junction
+    name: West Ealing Jn
     diverges: left
     direction: down
     elecBranch: none
@@ -328,7 +328,7 @@ routeDetail:
     chains: 71
 
   - type: junction
-    name: Hanwell Junction
+    name: Hanwell Jn
     diverges: left
     direction: up
     elecBranch: none
@@ -394,7 +394,7 @@ routeDetail:
     chains: 46
 
   - type: junction
-    name: Southall East Junction
+    name: Southall East Jn
     diverges: right
     direction: up
     elecBranch: none
@@ -423,7 +423,7 @@ routeDetail:
     chains: 53
 
   - type: crossovers
-    name: Southall West Junction
+    name: Southall West Jn
     description: Southall Sidings Diverge
     miles: 9
     chains: 70
@@ -490,7 +490,7 @@ routeDetail:
     chains: 77
 
   - type: junction
-    name: Heathrow Airport Junction
+    name: Heathrow Airport Jn
     diverges: both
     direction: down
     miles: 11
@@ -506,7 +506,7 @@ routeDetail:
     chains: 28
 
   - type: crossovers
-    name: Stockley Bridge Junction
+    name: Stockley Bridge Jn
     miles: 12
     chains: 9
 
@@ -519,7 +519,7 @@ routeDetail:
     chains: 22
 
   - type: crossovers
-    name: West Drayton East Junction
+    name: West Drayton East Jn
     miles: 12
     chains: 67
 
@@ -544,7 +544,7 @@ routeDetail:
     chains: 56
 
   - type: junction
-    name: West Drayton Junction
+    name: West Drayton Jn
     diverges: left
     direction: down
     description: Colnbrook Freight (near Heathrow)
@@ -725,7 +725,7 @@ routeDetail:
     chains: 42
 
   - type: junction
-    name: Windsor Branch Junction
+    name: Windsor Branch Jn
     diverges: right
     direction: down
     description: Windsor Branch from platforms 1 & 2 Only
@@ -1048,7 +1048,7 @@ routeDetail:
     chains: 1
 
   - type: junction
-    name: Henley Branch Junction
+    name: Henley Branch Jn
     diverges: left
     direction: down
     description: Henley-on-Thames from Platform 4 only
@@ -1169,7 +1169,7 @@ routeDetail:
     chains: 77
 
   - type: crossovers
-    name: Kennet Bridge Junction
+    name: Kennet Bridge Jn
     miles: 35
     chains: 10
 
@@ -1182,7 +1182,7 @@ routeDetail:
     chains: 28
 
   - type: junction
-    name: Reading New Junction
+    name: Reading New Jn
     diverges: right
     direction: up
     elecBranch: none
@@ -1199,7 +1199,7 @@ routeDetail:
     chains: 40
 
   - type: junction
-    name: Reading East Junction
+    name: Reading East Jn
     diverges: left
     direction: up
     elecBranch: none
@@ -1222,3 +1222,4 @@ routeDetail:
   - type: continues
     routeName: Reading - Bristol TM
     routeId: '0002'
+    entryPoint: reading
diff --git a/static/mapFiles/yaml/0002.yaml b/static/mapFiles/yaml/0002.yaml
index 9986f4a..0a9eb4b 100644
--- a/static/mapFiles/yaml/0002.yaml
+++ b/static/mapFiles/yaml/0002.yaml
@@ -14,6 +14,7 @@ routeDetail:
   - type: continues
     routeName: Paddington - Reading
     routeId: '0001'
+    entryPoint: reading
 
   - type: station
     name: Reading
@@ -30,21 +31,25 @@ routeDetail:
   - type: junction
     diverges: right
     direction: down
-    name: Westbury Line Junction
+    name: Westbury Line Jn
     description: to Oxford Road Jn
+    goto: "0201"
+    entryPoint: "oxford-road-jn"
     miles: 36
     chains: 17
 
   - type: junction
     diverges: right
     direction: down
-    name: Caversham Road Junction
+    name: Caversham Road Jn
     description: Reading Feeder Main/Relief diverge and pass under Reading Viaduct to Oxford Rd Jn
+    goto: "0201"
+    entryPoint: "oxford-road-jn"
     miles: 36
     chains: 22
 
   - type: crossovers
-    name: Reading High Level Junction
+    name: Reading High Level Jn
     description: Down Reading Festival Connects to Down Main
     miles: 36
     chains: 47
@@ -52,7 +57,9 @@ routeDetail:
   - type: junction
     diverges: right
     direction: up
-    name: Reading West Junction
+    name: Reading West Jn
     description: to Oxford Road Junction (From relief lines only)
+    goto: "0201"
+    entryPoint: "oxford-road-jn"
     miles: 37
     chains: 17
diff --git a/static/mapFiles/yaml/0240.yaml b/static/mapFiles/yaml/0240.yaml
index 0c76588..f5a42d9 100644
--- a/static/mapFiles/yaml/0240.yaml
+++ b/static/mapFiles/yaml/0240.yaml
@@ -1,5 +1,5 @@
-routeStart: Wootton Bassett Junction
-routeEnd: Stoke Gifford Junction
+routeStart: Wootton Bassett Jn
+routeEnd: Stoke Gifford Jn
 routeId: 0240
 updated: 2026-02-11
 checked: 2026-02-11
@@ -14,14 +14,16 @@ elecEnd:
 routeDetail:
   - type: continues
     routeName: Reading - Bristol TM
-    entryPoint: wootton-bassett-junction
+    entryPoint: wootton-bassett-jn
     routeId: '0002'
 
   - type: junction
     diverges: right
     direction: down
-    name: Wootton Basset Junction
+    name: Wootton Basset Jn
     description: to Chippenham & Bristol via Bath
+    goto: "0002"
+    entryPoint: wootton-bassett-jn
     miles: 83
     chains: 7
 
@@ -486,7 +488,7 @@ routeDetail:
   - type: junction
     diverges: left
     direction: up
-    name: Westerleigh Junction
+    name: Westerleigh Jn
     miles: 107
     chains: 14
     description: Up/Dn Charfield towards Gloucester
@@ -614,7 +616,7 @@ routeDetail:
     chains: 14
 
   - type: crossovers
-    name: Stoke Gifford East Junction
+    name: Stoke Gifford East Jn
     miles: 111
     chains: 20
 
@@ -639,7 +641,7 @@ routeDetail:
     chains: 77
 
   - type: junction
-    name: Stoke Gifford No.1 Junction
+    name: Stoke Gifford No.1 Jn
     diverges: right
     direction: down
     description: Up/Dn Filton & Bristol TM
diff --git a/static/mapFiles/yaml/2420.yaml b/static/mapFiles/yaml/2420.yaml
index 0b30cd8..b55dcb9 100644
--- a/static/mapFiles/yaml/2420.yaml
+++ b/static/mapFiles/yaml/2420.yaml
@@ -1,4 +1,4 @@
-routeStart: Westerleigh Junction
+routeStart: Westerleigh Jn
 routeEnd: Gloucester
 routeId: 2420
 updated: 2026-02-11