diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 16fc75bb7e5..e0c15eb8cc5 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -241,7 +241,7 @@ public Dictionary<NetEntity, List<DockingPortState>> GetAllDocks()
                     _xformQuery.TryGetComponent(comp.DockedWith, out var otherDockXform) ?
                     GetNetEntity(otherDockXform.GridUid) :
                     null,
-                LabelName = comp.Name, // Frontier: docking labels
+                LabelName = comp.Name != null ? Loc.GetString(comp.Name) : null, // Frontier: docking labels
             };
 
             gridDocks.Add(state);
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 32a277e641d..cbdc78f4280 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -5621,3 +5621,15 @@ Entries:
       message: modified aspects of the Ambition to comply with ship guidelines.
   id: 5544
   time: '2024-11-30T18:00:47.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Add
+      message: Localized dock names.
+  id: 5545
+  time: '2024-11-30T22:59:36.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Remove
+      message: Cryoxadone no longer restores blood.
+  id: 5546
+  time: '2024-12-01T16:08:58.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/dock/dock.ftl b/Resources/Locale/en-US/_NF/dock/dock.ftl
new file mode 100644
index 00000000000..8b90f86dedb
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/dock/dock.ftl
@@ -0,0 +1,48 @@
+dock-label-station-one-a = 1A
+dock-label-station-one-b = 1B
+dock-label-station-one-c = 1C
+dock-label-station-two-a = 2A
+dock-label-station-two-b = 2B
+dock-label-station-two-c = 2C
+dock-label-station-three-a = 3A
+dock-label-station-three-b = 3B
+dock-label-station-three-c = 3C
+dock-label-station-four-a = 4A
+dock-label-station-four-b = 4B
+dock-label-station-four-c = 4C
+dock-label-station-five-a = 5A
+dock-label-station-five-b = 5B
+dock-label-station-five-c = 5C
+dock-label-station-six-a = 6A
+dock-label-station-six-b = 6B
+dock-label-station-six-c = 6C
+dock-label-station-seven-a = 7A
+dock-label-station-seven-b = 7B
+dock-label-station-seven-c = 7C
+
+dock-label-trade-cargo-bay-one = CB1
+dock-label-trade-cargo-bay-two = CB2
+dock-label-trade-cargo-bay-three = CB3
+dock-label-trade-cargo-bay-four = CB4
+dock-label-trade-four = D4
+dock-label-trade-four-a = D4A
+dock-label-trade-four-b = D4B
+dock-label-trade-four-c = D4C
+dock-label-trade-five = D5
+dock-label-trade-five-a = D5A
+dock-label-trade-five-b = D5B
+dock-label-trade-five-c = D5C
+dock-label-trade-six = D6
+dock-label-trade-six-a = D6A
+dock-label-trade-six-b = D6B
+dock-label-trade-six-c = D6C
+dock-label-trade-seven = D7
+dock-label-trade-seven-a = D7A
+dock-label-trade-seven-b = D7B
+dock-label-trade-seven-c = D7C
+
+dock-label-bus = Bus Dock
+dock-label-janitor = Jani
+dock-label-guard = Guard
+dock-label-nfsd = NFSD
+dock-label-drive-thru = McDrive Thru
diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
index efd3f77f83c..52e74899159 100644
--- a/Resources/Maps/_NF/Outpost/frontier.yml
+++ b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -4321,7 +4321,7 @@ entities:
       pos: -16.5,15.5
       parent: 2173
     - type: Docking
-      name: Bus Dock
+      name: dock-label-bus
   - uid: 532
     components:
     - type: Transform
@@ -4329,7 +4329,7 @@ entities:
       pos: -8.5,15.5
       parent: 2173
     - type: Docking
-      name: Bus Dock
+      name: dock-label-bus
   - uid: 935
     components:
     - type: Transform
@@ -4337,7 +4337,7 @@ entities:
       pos: -16.5,16.5
       parent: 2173
     - type: Docking
-      name: Bus Dock
+      name: dock-label-bus
   - uid: 936
     components:
     - type: Transform
@@ -4345,7 +4345,7 @@ entities:
       pos: -8.5,16.5
       parent: 2173
     - type: Docking
-      name: Bus Dock
+      name: dock-label-bus
 - proto: AirlockFrontierBridgeGlassLocked
   entities:
   - uid: 453
@@ -4630,7 +4630,7 @@ entities:
       pos: 2.5,30.5
       parent: 2173
     - type: Docking
-      name: 6C
+      name: dock-label-station-six-c
   - uid: 1999
     components:
     - type: Transform
@@ -4638,7 +4638,7 @@ entities:
       pos: 0.5,30.5
       parent: 2173
     - type: Docking
-      name: 6C
+      name: dock-label-station-six-c
   - uid: 2011
     components:
     - type: Transform
@@ -4646,7 +4646,7 @@ entities:
       pos: 27.5,28.5
       parent: 2173
     - type: Docking
-      name: 6B
+      name: dock-label-station-six-b
   - uid: 2170
     components:
     - type: Transform
@@ -4654,7 +4654,7 @@ entities:
       pos: -33.5,-25.5
       parent: 2173
     - type: Docking
-      name: 2A
+      name: dock-label-station-two-a
   - uid: 2171
     components:
     - type: Transform
@@ -4662,7 +4662,7 @@ entities:
       pos: -33.5,-26.5
       parent: 2173
     - type: Docking
-      name: 2A
+      name: dock-label-station-two-a
   - uid: 2172
     components:
     - type: Transform
@@ -4670,14 +4670,14 @@ entities:
       pos: -33.5,-27.5
       parent: 2173
     - type: Docking
-      name: 2A
+      name: dock-label-station-two-a
   - uid: 2175
     components:
     - type: Transform
       pos: -28.5,-30.5
       parent: 2173
     - type: Docking
-      name: 2B
+      name: dock-label-station-two-b
   - uid: 2176
     components:
     - type: Transform
@@ -4685,7 +4685,7 @@ entities:
       pos: -25.5,-27.5
       parent: 2173
     - type: Docking
-      name: 2C
+      name: dock-label-station-two-c
   - uid: 2177
     components:
     - type: Transform
@@ -4693,7 +4693,7 @@ entities:
       pos: -25.5,-26.5
       parent: 2173
     - type: Docking
-      name: 2C
+      name: dock-label-station-two-c
   - uid: 2178
     components:
     - type: Transform
@@ -4701,42 +4701,42 @@ entities:
       pos: -25.5,-25.5
       parent: 2173
     - type: Docking
-      name: 2C
+      name: dock-label-station-two-c
   - uid: 2179
     components:
     - type: Transform
       pos: -1.5,-0.5
       parent: 2173
     - type: Docking
-      name: 6A
+      name: dock-label-station-six-a
   - uid: 2180
     components:
     - type: Transform
       pos: 0.5,-0.5
       parent: 2173
     - type: Docking
-      name: 6A
+      name: dock-label-station-six-a
   - uid: 2181
     components:
     - type: Transform
       pos: 27.5,-30.5
       parent: 2173
     - type: Docking
-      name: 3B
+      name: dock-label-station-three-b
   - uid: 2182
     components:
     - type: Transform
       pos: 28.5,-30.5
       parent: 2173
     - type: Docking
-      name: 3B
+      name: dock-label-station-three-b
   - uid: 2183
     components:
     - type: Transform
       pos: 29.5,-30.5
       parent: 2173
     - type: Docking
-      name: 3B
+      name: dock-label-station-three-b
   - uid: 2184
     components:
     - type: Transform
@@ -4744,7 +4744,7 @@ entities:
       pos: 24.5,-27.5
       parent: 2173
     - type: Docking
-      name: 3A
+      name: dock-label-station-three-a
   - uid: 2185
     components:
     - type: Transform
@@ -4752,7 +4752,7 @@ entities:
       pos: 24.5,-26.5
       parent: 2173
     - type: Docking
-      name: 3A
+      name: dock-label-station-three-a
   - uid: 2186
     components:
     - type: Transform
@@ -4760,7 +4760,7 @@ entities:
       pos: 24.5,-25.5
       parent: 2173
     - type: Docking
-      name: 3A
+      name: dock-label-station-three-a
   - uid: 2187
     components:
     - type: Transform
@@ -4768,7 +4768,7 @@ entities:
       pos: 32.5,-27.5
       parent: 2173
     - type: Docking
-      name: 3C
+      name: dock-label-station-three-c
   - uid: 2188
     components:
     - type: Transform
@@ -4776,7 +4776,7 @@ entities:
       pos: 32.5,-26.5
       parent: 2173
     - type: Docking
-      name: 3C
+      name: dock-label-station-three-c
   - uid: 2189
     components:
     - type: Transform
@@ -4784,7 +4784,7 @@ entities:
       pos: 32.5,-25.5
       parent: 2173
     - type: Docking
-      name: 3C
+      name: dock-label-station-three-c
   - uid: 2190
     components:
     - type: Transform
@@ -4792,7 +4792,7 @@ entities:
       pos: 61.5,1.5
       parent: 2173
     - type: Docking
-      name: 4B
+      name: dock-label-station-four-b
   - uid: 2191
     components:
     - type: Transform
@@ -4800,7 +4800,7 @@ entities:
       pos: 61.5,2.5
       parent: 2173
     - type: Docking
-      name: 4B
+      name: dock-label-station-four-b
   - uid: 2192
     components:
     - type: Transform
@@ -4808,49 +4808,49 @@ entities:
       pos: 61.5,3.5
       parent: 2173
     - type: Docking
-      name: 4B
+      name: dock-label-station-four-b
   - uid: 2193
     components:
     - type: Transform
       pos: 58.5,-1.5
       parent: 2173
     - type: Docking
-      name: 4A
+      name: dock-label-station-four-a
   - uid: 2194
     components:
     - type: Transform
       pos: 57.5,-1.5
       parent: 2173
     - type: Docking
-      name: 4A
+      name: dock-label-station-four-a
   - uid: 2195
     components:
     - type: Transform
       pos: 56.5,-1.5
       parent: 2173
     - type: Docking
-      name: 4A
+      name: dock-label-station-four-a
   - uid: 2202
     components:
     - type: Transform
       pos: -57.5,-1.5
       parent: 2173
     - type: Docking
-      name: 1B
+      name: dock-label-station-one-b
   - uid: 2203
     components:
     - type: Transform
       pos: -58.5,-1.5
       parent: 2173
     - type: Docking
-      name: 1B
+      name: dock-label-station-one-b
   - uid: 2204
     components:
     - type: Transform
       pos: -59.5,-1.5
       parent: 2173
     - type: Docking
-      name: 1B
+      name: dock-label-station-one-b
   - uid: 2205
     components:
     - type: Transform
@@ -4858,7 +4858,7 @@ entities:
       pos: -62.5,1.5
       parent: 2173
     - type: Docking
-      name: 1A
+      name: dock-label-station-one-a
   - uid: 2206
     components:
     - type: Transform
@@ -4866,7 +4866,7 @@ entities:
       pos: -62.5,2.5
       parent: 2173
     - type: Docking
-      name: 1A
+      name: dock-label-station-one-a
   - uid: 2207
     components:
     - type: Transform
@@ -4874,7 +4874,7 @@ entities:
       pos: -62.5,3.5
       parent: 2173
     - type: Docking
-      name: 1A
+      name: dock-label-station-one-a
   - uid: 2587
     components:
     - type: Transform
@@ -4882,7 +4882,7 @@ entities:
       pos: 56.5,29.5
       parent: 2173
     - type: Docking
-      name: 5B
+      name: dock-label-station-five-b
   - uid: 2589
     components:
     - type: Transform
@@ -4890,7 +4890,7 @@ entities:
       pos: 29.5,28.5
       parent: 2173
     - type: Docking
-      name: 6B
+      name: dock-label-station-six-b
   - uid: 3770
     components:
     - type: Transform
@@ -4898,7 +4898,7 @@ entities:
       pos: 61.5,26.5
       parent: 2173
     - type: Docking
-      name: 5A
+      name: dock-label-station-five-a
   - uid: 3919
     components:
     - type: Transform
@@ -4906,7 +4906,7 @@ entities:
       pos: 58.5,29.5
       parent: 2173
     - type: Docking
-      name: 5B
+      name: dock-label-station-five-b
   - uid: 3920
     components:
     - type: Transform
@@ -4914,7 +4914,7 @@ entities:
       pos: 57.5,29.5
       parent: 2173
     - type: Docking
-      name: 5B
+      name: dock-label-station-five-b
   - uid: 4982
     components:
     - type: Transform
@@ -4922,7 +4922,7 @@ entities:
       pos: 61.5,24.5
       parent: 2173
     - type: Docking
-      name: 5A
+      name: dock-label-station-five-a
   - uid: 4983
     components:
     - type: Transform
@@ -4930,21 +4930,21 @@ entities:
       pos: 61.5,25.5
       parent: 2173
     - type: Docking
-      name: 5A
+      name: dock-label-station-five-a
   - uid: 5801
     components:
     - type: Transform
       pos: -29.5,-30.5
       parent: 2173
     - type: Docking
-      name: 2B
+      name: dock-label-station-two-b
   - uid: 5805
     components:
     - type: Transform
       pos: -30.5,-30.5
       parent: 2173
     - type: Docking
-      name: 2B
+      name: dock-label-station-two-b
 - proto: AirlockJanitorLocked
   entities:
   - uid: 2754
diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml
index c495652bbe9..ca88fdb0f4c 100644
--- a/Resources/Maps/_NF/POI/lodge.yml
+++ b/Resources/Maps/_NF/POI/lodge.yml
@@ -3123,7 +3123,7 @@ entities:
       pos: 0.5,-3.5
       parent: 1
     - type: Docking
-      name: Bus Dock
+      name: dock-label-bus
   - uid: 171
     components:
     - type: Transform
@@ -3156,7 +3156,7 @@ entities:
       pos: 31.5,-3.5
       parent: 1
     - type: Docking
-      name: 4C
+      name: dock-label-station-four-c
   - uid: 153
     components:
     - type: Transform
@@ -3175,7 +3175,7 @@ entities:
       pos: 35.5,0.5
       parent: 1
     - type: Docking
-      name: 4B
+      name: dock-label-station-four-b
   - uid: 156
     components:
     - type: Transform
@@ -3195,7 +3195,7 @@ entities:
       pos: 31.5,4.5
       parent: 1
     - type: Docking
-      name: 4A
+      name: dock-label-station-four-a
   - uid: 159
     components:
     - type: Transform
@@ -3213,7 +3213,7 @@ entities:
       pos: -30.5,-3.5
       parent: 1
     - type: Docking
-      name: 6B
+      name: dock-label-station-six-b
   - uid: 162
     components:
     - type: Transform
@@ -3232,7 +3232,7 @@ entities:
       pos: -34.5,0.5
       parent: 1
     - type: Docking
-      name: 6C
+      name: dock-label-station-six-c
   - uid: 165
     components:
     - type: Transform
@@ -3252,7 +3252,7 @@ entities:
       pos: -30.5,4.5
       parent: 1
     - type: Docking
-      name: 6A
+      name: dock-label-station-six-a
   - uid: 168
     components:
     - type: Transform
@@ -3278,7 +3278,7 @@ entities:
       pos: -24.5,22.5
       parent: 1
     - type: Docking
-      name: 1A
+      name: dock-label-station-one-a
   - uid: 376
     components:
     - type: Transform
@@ -3304,7 +3304,7 @@ entities:
       pos: 25.5,22.5
       parent: 1
     - type: Docking
-      name: 3B
+      name: dock-label-station-three-b
   - uid: 380
     components:
     - type: Transform
@@ -3318,7 +3318,7 @@ entities:
       pos: -20.5,26.5
       parent: 1
     - type: Docking
-      name: 1B
+      name: dock-label-station-one-b
   - uid: 401
     components:
     - type: Transform
@@ -3338,7 +3338,7 @@ entities:
       pos: 0.5,26.5
       parent: 1
     - type: Docking
-      name: 2A
+      name: dock-label-station-two-a
   - uid: 503
     components:
     - type: Transform
@@ -3352,7 +3352,7 @@ entities:
       pos: 21.5,26.5
       parent: 1
     - type: Docking
-      name: 3A
+      name: dock-label-station-three-a
   - uid: 911
     components:
     - type: Transform
diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
index bb8e738c7a6..dbd3c288846 100644
--- a/Resources/Maps/_NF/POI/nfsd.yml
+++ b/Resources/Maps/_NF/POI/nfsd.yml
@@ -2404,7 +2404,7 @@ entities:
       pos: 20.5,28.5
       parent: 1
     - type: Docking
-      name: Jani
+      name: dock-label-janitor
   - uid: 235
     components:
     - type: Transform
@@ -2412,7 +2412,7 @@ entities:
       pos: 18.5,28.5
       parent: 1
     - type: Docking
-      name: Jani
+      name: dock-label-janitor
   - uid: 2130
     components:
     - type: Transform
@@ -2420,7 +2420,7 @@ entities:
       pos: 19.5,28.5
       parent: 1
     - type: Docking
-      name: Jani
+      name: dock-label-janitor
 - proto: AirSensor
   entities:
   - uid: 1360
diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml
index fbbc9859e90..f70ae896966 100644
--- a/Resources/Maps/_NF/POI/trade.yml
+++ b/Resources/Maps/_NF/POI/trade.yml
@@ -3140,11 +3140,15 @@ entities:
     - type: Transform
       pos: -2.5,-15.5
       parent: 1
+    - type: Docking
+      name: dock-label-trade-seven
   - uid: 219
     components:
     - type: Transform
       pos: -3.5,-15.5
       parent: 1
+    - type: Docking
+      name: dock-label-trade-seven
 - proto: AirlockFrontierBridgeGlassLocked
   entities:
   - uid: 2620
@@ -3467,7 +3471,7 @@ entities:
       pos: 55.5,29.5
       parent: 1
     - type: Docking
-      name: CB1
+      name: dock-label-trade-cargo-bay-one
   - uid: 222
     components:
     - type: Transform
@@ -3475,7 +3479,7 @@ entities:
       pos: 56.5,29.5
       parent: 1
     - type: Docking
-      name: CB1
+      name: dock-label-trade-cargo-bay-one
   - uid: 223
     components:
     - type: Transform
@@ -3483,7 +3487,7 @@ entities:
       pos: 57.5,29.5
       parent: 1
     - type: Docking
-      name: CB1
+      name: dock-label-trade-cargo-bay-one
   - uid: 809
     components:
     - type: Transform
@@ -3491,7 +3495,7 @@ entities:
       pos: 88.5,0.5
       parent: 1
     - type: Docking
-      name: CB2
+      name: dock-label-trade-cargo-bay-two
   - uid: 810
     components:
     - type: Transform
@@ -3499,7 +3503,7 @@ entities:
       pos: 88.5,-0.5
       parent: 1
     - type: Docking
-      name: CB2
+      name: dock-label-trade-cargo-bay-two
   - uid: 811
     components:
     - type: Transform
@@ -3507,49 +3511,49 @@ entities:
       pos: 88.5,-1.5
       parent: 1
     - type: Docking
-      name: CB2
+      name: dock-label-trade-cargo-bay-two
   - uid: 1006
     components:
     - type: Transform
       pos: 74.5,-22.5
       parent: 1
     - type: Docking
-      name: D6
+      name: dock-label-trade-six
   - uid: 1014
     components:
     - type: Transform
       pos: 75.5,-22.5
       parent: 1
     - type: Docking
-      name: D6
+      name: dock-label-trade-six
   - uid: 1015
     components:
     - type: Transform
       pos: 76.5,-22.5
       parent: 1
     - type: Docking
-      name: D6
+      name: dock-label-trade-six
   - uid: 3695
     components:
     - type: Transform
       pos: 13.5,-25.5
       parent: 1
     - type: Docking
-      name: CB3
+      name: dock-label-trade-cargo-bay-three
   - uid: 3696
     components:
     - type: Transform
       pos: 14.5,-25.5
       parent: 1
     - type: Docking
-      name: CB3
+      name: dock-label-trade-cargo-bay-three
   - uid: 3697
     components:
     - type: Transform
       pos: 15.5,-25.5
       parent: 1
     - type: Docking
-      name: CB3
+      name: dock-label-trade-cargo-bay-three
   - uid: 3698
     components:
     - type: Transform
@@ -3557,7 +3561,7 @@ entities:
       pos: -15.5,25.5
       parent: 1
     - type: Docking
-      name: D5
+      name: dock-label-trade-five
   - uid: 3699
     components:
     - type: Transform
@@ -3565,7 +3569,7 @@ entities:
       pos: -14.5,25.5
       parent: 1
     - type: Docking
-      name: D5
+      name: dock-label-trade-five
   - uid: 3700
     components:
     - type: Transform
@@ -3573,7 +3577,7 @@ entities:
       pos: -13.5,25.5
       parent: 1
     - type: Docking
-      name: D5
+      name: dock-label-trade-five
   - uid: 3701
     components:
     - type: Transform
@@ -3581,7 +3585,7 @@ entities:
       pos: -31.5,3.5
       parent: 1
     - type: Docking
-      name: CB4
+      name: dock-label-trade-cargo-bay-four
   - uid: 3702
     components:
     - type: Transform
@@ -3589,7 +3593,7 @@ entities:
       pos: -31.5,2.5
       parent: 1
     - type: Docking
-      name: CB4
+      name: dock-label-trade-cargo-bay-four
   - uid: 3703
     components:
     - type: Transform
@@ -3597,7 +3601,7 @@ entities:
       pos: -31.5,1.5
       parent: 1
     - type: Docking
-      name: CB4
+      name: dock-label-trade-cargo-bay-four
 - proto: AirlockMaint
   entities:
   - uid: 1282
diff --git a/Resources/Maps/_NF/POI/trademall.yml b/Resources/Maps/_NF/POI/trademall.yml
index d3b33795205..21a8a2cbdec 100644
--- a/Resources/Maps/_NF/POI/trademall.yml
+++ b/Resources/Maps/_NF/POI/trademall.yml
@@ -5982,7 +5982,7 @@ entities:
       pos: 17.5,3.5
       parent: 1
     - type: Docking
-      name: Bus Dock
+      name: dock-label-bus
   - uid: 2468
     components:
     - type: Transform
@@ -5990,21 +5990,21 @@ entities:
       pos: 18.5,3.5
       parent: 1
     - type: Docking
-      name: Bus Dock
+      name: dock-label-bus
   - uid: 2469
     components:
     - type: Transform
       pos: 17.5,11.5
       parent: 1
     - type: Docking
-      name: Bus Dock
+      name: dock-label-bus
   - uid: 2470
     components:
     - type: Transform
       pos: 18.5,11.5
       parent: 1
     - type: Docking
-      name: Bus Dock
+      name: dock-label-bus
 - proto: AirlockFreezer
   entities:
   - uid: 5402
@@ -6294,14 +6294,14 @@ entities:
       pos: -6.5,20.5
       parent: 1
     - type: Docking
-      name: D6
+      name: dock-label-trade-six
   - uid: 235
     components:
     - type: Transform
       pos: -32.5,-3.5
       parent: 1
     - type: Docking
-      name: D5A
+      name: dock-label-trade-five-a
   - uid: 381
     components:
     - type: Transform
@@ -6309,7 +6309,7 @@ entities:
       pos: -3.5,-41.5
       parent: 1
     - type: Docking
-      name: D4C
+      name: dock-label-trade-four-c
   - uid: 796
     components:
     - type: Transform
@@ -6317,14 +6317,14 @@ entities:
       pos: -4.5,20.5
       parent: 1
     - type: Docking
-      name: D6
+      name: dock-label-trade-six
   - uid: 1526
     components:
     - type: Transform
       pos: 50.5,-17.5
       parent: 1
     - type: Docking
-      name: CB3
+      name: dock-label-trade-cargo-bay-three
   - uid: 1730
     components:
     - type: Transform
@@ -6332,7 +6332,7 @@ entities:
       pos: 50.5,18.5
       parent: 1
     - type: Docking
-      name: CB1
+      name: dock-label-trade-cargo-bay-one
   - uid: 1750
     components:
     - type: Transform
@@ -6340,14 +6340,14 @@ entities:
       pos: 68.5,0.5
       parent: 1
     - type: Docking
-      name: CB2
+      name: dock-label-trade-cargo-bay-two
   - uid: 1754
     components:
     - type: Transform
       pos: -0.5,-44.5
       parent: 1
     - type: Docking
-      name: D4B
+      name: dock-label-trade-four-b
   - uid: 1755
     components:
     - type: Transform
@@ -6355,7 +6355,7 @@ entities:
       pos: 4.5,-41.5
       parent: 1
     - type: Docking
-      name: D4A
+      name: dock-label-trade-four-a
   - uid: 1756
     components:
     - type: Transform
@@ -6363,21 +6363,21 @@ entities:
       pos: 4.5,-39.5
       parent: 1
     - type: Docking
-      name: D4A
+      name: dock-label-trade-four-a
   - uid: 1789
     components:
     - type: Transform
       pos: 1.5,-44.5
       parent: 1
     - type: Docking
-      name: D4B
+      name: dock-label-trade-four-b
   - uid: 1790
     components:
     - type: Transform
       pos: 0.5,-44.5
       parent: 1
     - type: Docking
-      name: D4B
+      name: dock-label-trade-four-b
   - uid: 1831
     components:
     - type: Transform
@@ -6385,7 +6385,7 @@ entities:
       pos: -3.5,-40.5
       parent: 1
     - type: Docking
-      name: D4C
+      name: dock-label-trade-four-c
   - uid: 1832
     components:
     - type: Transform
@@ -6393,7 +6393,7 @@ entities:
       pos: -3.5,-39.5
       parent: 1
     - type: Docking
-      name: D4C
+      name: dock-label-trade-four-c
   - uid: 2366
     components:
     - type: Transform
@@ -6401,7 +6401,7 @@ entities:
       pos: 4.5,-40.5
       parent: 1
     - type: Docking
-      name: D4A
+      name: dock-label-trade-four-a
   - uid: 2375
     components:
     - type: Transform
@@ -6409,7 +6409,7 @@ entities:
       pos: -36.5,0.5
       parent: 1
     - type: Docking
-      name: D5B
+      name: dock-label-trade-five-b
   - uid: 2376
     components:
     - type: Transform
@@ -6417,7 +6417,7 @@ entities:
       pos: -36.5,-0.5
       parent: 1
     - type: Docking
-      name: D5B
+      name: dock-label-trade-five-b
   - uid: 2377
     components:
     - type: Transform
@@ -6425,7 +6425,7 @@ entities:
       pos: -36.5,1.5
       parent: 1
     - type: Docking
-      name: D5B
+      name: dock-label-trade-five-b
   - uid: 2378
     components:
     - type: Transform
@@ -6433,7 +6433,7 @@ entities:
       pos: -32.5,4.5
       parent: 1
     - type: Docking
-      name: D5C
+      name: dock-label-trade-five-c
   - uid: 2379
     components:
     - type: Transform
@@ -6441,7 +6441,7 @@ entities:
       pos: -31.5,4.5
       parent: 1
     - type: Docking
-      name: D5C
+      name: dock-label-trade-five-c
   - uid: 2380
     components:
     - type: Transform
@@ -6449,21 +6449,21 @@ entities:
       pos: -33.5,4.5
       parent: 1
     - type: Docking
-      name: D5C
+      name: dock-label-trade-five-c
   - uid: 2408
     components:
     - type: Transform
       pos: -33.5,-3.5
       parent: 1
     - type: Docking
-      name: D5A
+      name: dock-label-trade-five-a
   - uid: 2409
     components:
     - type: Transform
       pos: -31.5,-3.5
       parent: 1
     - type: Docking
-      name: D5A
+      name: dock-label-trade-five-a
   - uid: 2493
     components:
     - type: Transform
@@ -6471,7 +6471,7 @@ entities:
       pos: -3.5,42.5
       parent: 1
     - type: Docking
-      name: D7A
+      name: dock-label-trade-seven-a
   - uid: 2494
     components:
     - type: Transform
@@ -6479,7 +6479,7 @@ entities:
       pos: -3.5,41.5
       parent: 1
     - type: Docking
-      name: D7A
+      name: dock-label-trade-seven-a
   - uid: 2495
     components:
     - type: Transform
@@ -6487,7 +6487,7 @@ entities:
       pos: -3.5,40.5
       parent: 1
     - type: Docking
-      name: D7A
+      name: dock-label-trade-seven-a
   - uid: 2496
     components:
     - type: Transform
@@ -6495,7 +6495,7 @@ entities:
       pos: 4.5,42.5
       parent: 1
     - type: Docking
-      name: D7C
+      name: dock-label-trade-seven-c
   - uid: 2501
     components:
     - type: Transform
@@ -6503,7 +6503,7 @@ entities:
       pos: 4.5,41.5
       parent: 1
     - type: Docking
-      name: D7C
+      name: dock-label-trade-seven-c
   - uid: 2503
     components:
     - type: Transform
@@ -6511,7 +6511,7 @@ entities:
       pos: 4.5,40.5
       parent: 1
     - type: Docking
-      name: D7C
+      name: dock-label-trade-seven-c
   - uid: 2504
     components:
     - type: Transform
@@ -6519,7 +6519,7 @@ entities:
       pos: -0.5,45.5
       parent: 1
     - type: Docking
-      name: D7B
+      name: dock-label-trade-seven-b
   - uid: 2506
     components:
     - type: Transform
@@ -6527,7 +6527,7 @@ entities:
       pos: 1.5,45.5
       parent: 1
     - type: Docking
-      name: D7B
+      name: dock-label-trade-seven-b
   - uid: 2543
     components:
     - type: Transform
@@ -6535,7 +6535,7 @@ entities:
       pos: 28.5,15.5
       parent: 1
     - type: Docking
-      name: Guard
+      name: dock-label-guard
   - uid: 2842
     components:
     - type: Transform
@@ -6543,7 +6543,7 @@ entities:
       pos: 68.5,1.5
       parent: 1
     - type: Docking
-      name: CB2
+      name: dock-label-trade-cargo-bay-two
   - uid: 2843
     components:
     - type: Transform
@@ -6551,21 +6551,21 @@ entities:
       pos: 68.5,-0.5
       parent: 1
     - type: Docking
-      name: CB2
+      name: dock-label-trade-cargo-bay-two
   - uid: 2844
     components:
     - type: Transform
       pos: 51.5,-17.5
       parent: 1
     - type: Docking
-      name: CB3
+      name: dock-label-trade-cargo-bay-three
   - uid: 2845
     components:
     - type: Transform
       pos: 49.5,-17.5
       parent: 1
     - type: Docking
-      name: CB3
+      name: dock-label-trade-cargo-bay-three
   - uid: 2846
     components:
     - type: Transform
@@ -6573,7 +6573,7 @@ entities:
       pos: 49.5,18.5
       parent: 1
     - type: Docking
-      name: CB1
+      name: dock-label-trade-cargo-bay-one
   - uid: 2847
     components:
     - type: Transform
@@ -6581,7 +6581,7 @@ entities:
       pos: 51.5,18.5
       parent: 1
     - type: Docking
-      name: CB1
+      name: dock-label-trade-cargo-bay-one
   - uid: 2852
     components:
     - type: Transform
@@ -6589,7 +6589,7 @@ entities:
       pos: 0.5,45.5
       parent: 1
     - type: Docking
-      name: D7B
+      name: dock-label-trade-seven-b
 - proto: AirlockGlassShuttleNfsdLocked
   entities:
   - uid: 2544
@@ -6598,21 +6598,21 @@ entities:
       pos: 29.5,-14.5
       parent: 1
     - type: Docking
-      name: NFSD
+      name: dock-label-nfsd
   - uid: 2545
     components:
     - type: Transform
       pos: 28.5,-14.5
       parent: 1
     - type: Docking
-      name: NFSD
+      name: dock-label-nfsd
   - uid: 2546
     components:
     - type: Transform
       pos: 27.5,-14.5
       parent: 1
     - type: Docking
-      name: NFSD
+      name: dock-label-nfsd
 - proto: AirlockHatchMaintenance
   entities:
   - uid: 2855
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 2532cb988bb..2e3334ea753 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -190,8 +190,6 @@
               # Brute: -4 # Frontier
               # Burn: -6 # Frontier
               # Toxin: -4 # Frontier
-        - !type:ModifyBloodLevel # Frontier
-          amount: 5 # Frontier
 
 - type: reagent
   id: Doxarubixadone
@@ -1166,7 +1164,7 @@
         conditions:
         - !type:ReagentThreshold
           min: 12
-          
+
 - type: reagent
   id: Opporozidone #Name based of an altered version of the startreck chem "Opporozine"
   name: reagent-name-opporozidone
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml
index d932bc94f66..9752fd42d33 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -72,5 +72,5 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: Docking
-    name: McDrive Thru
+    name: dock-label-drive-thru
 # endregion
\ No newline at end of file