diff --git a/Resources/Maps/Shuttles/whippet.yml b/Resources/Maps/Shuttles/whippet.yml
index 57d6b479b3f..4efc4383c1b 100644
--- a/Resources/Maps/Shuttles/whippet.yml
+++ b/Resources/Maps/Shuttles/whippet.yml
@@ -61,181 +61,140 @@ entities:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            72: 2,1
-        - node:
-            color: '#FFFFFFFF'
-            id: Box
-          decals:
-            24: 1,11
-            25: 2,11
-            26: 2,10
-            27: -1,8
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: Box
-          decals:
-            0: -1,6
-            1: -2,6
-            2: -2,7
-            3: -1,7
-            4: -2,8
-            5: -2,9
-            6: -1,9
-            7: -1,10
-            8: -2,10
-            9: -2,11
-            10: -1,11
-            11: 2,11
-            12: 2,10
-            13: 1,10
-            14: 1,9
-            15: 2,9
-            16: 2,8
-            17: 1,8
-            18: 1,7
-            19: 2,7
-            20: 2,6
-            21: 1,6
+            44: 2,1
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
           decals:
-            54: 1,4
+            28: 1,4
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
           decals:
-            55: -1,4
+            29: -1,4
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
           decals:
-            53: 1,3
+            27: 1,3
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
           decals:
-            52: -1,3
+            26: -1,3
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
           decals:
-            48: 0,5
+            22: 0,5
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
           decals:
-            49: 0,5
+            23: 0,5
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
           decals:
-            50: 0,12
+            24: 0,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
           decals:
-            51: 0,12
+            25: 0,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
           decals:
-            34: 0,6
-            35: 0,7
-            36: 0,9
-            37: 0,8
-            38: 0,10
-            39: 0,11
+            8: 0,6
+            9: 0,7
+            10: 0,9
+            11: 0,8
+            12: 0,10
+            13: 0,11
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
           decals:
-            44: -2,5
-            45: -1,5
-            46: 1,5
-            47: 2,5
-            57: 0,4
+            18: -2,5
+            19: -1,5
+            20: 1,5
+            21: 2,5
+            31: 0,4
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
           decals:
-            40: -1,12
-            41: -2,12
-            42: 1,12
-            43: 2,12
-            56: 0,3
+            14: -1,12
+            15: -2,12
+            16: 1,12
+            17: 2,12
+            30: 0,3
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
           decals:
-            28: 0,6
-            29: 0,7
-            30: 0,8
-            31: 0,9
-            32: 0,10
-            33: 0,11
+            2: 0,6
+            3: 0,7
+            4: 0,8
+            5: 0,9
+            6: 0,10
+            7: 0,11
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
           decals:
-            22: -2,12
-            23: 2,12
+            0: -2,12
+            1: 2,12
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            61: 2,3
-            62: 1,12
+            33: 2,3
+            34: 1,12
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            60: -2,3
-            63: -1,12
-        - node:
-            color: '#FFFFFFFF'
-            id: Delivery
-          decals:
-            58: -3,3
-            59: 3,3
+            32: -2,3
+            35: -1,12
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            70: -2,5
-            71: 2,5
+            42: -2,5
+            43: 2,5
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSE
           decals:
-            69: -2,1
+            41: -2,1
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
           decals:
-            73: 2,1
+            45: 2,1
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            65: 1,12
+            37: 1,12
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
-            66: -1,1
-            67: 0,1
-            68: 1,1
+            38: -1,1
+            39: 0,1
+            40: 1,1
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            64: -1,12
+            36: -1,12
       type: DecalGrid
     - version: 2
       data:
@@ -288,36 +247,8 @@ entities:
       type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
-    - id: Whippet
+    - id: whippet
       type: BecomesStation
-- proto: ActionToggleInternals
-  entities:
-  - uid: 249
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 248
-      type: Transform
-    - container: 248
-      type: InstantAction
-- proto: ActionToggleLight
-  entities:
-  - uid: 237
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 236
-      type: Transform
-    - container: 236
-      type: InstantAction
-  - uid: 239
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 238
-      type: Transform
-    - container: 238
-      type: InstantAction
 - proto: AirAlarm
   entities:
   - uid: 214
@@ -364,18 +295,16 @@ entities:
     - pos: 2.5,1.5
       parent: 1
       type: Transform
-- proto: Airlock
+- proto: AirlockCommand
   entities:
   - uid: 100
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,4.5
+    - pos: 2.5,4.5
       parent: 1
       type: Transform
   - uid: 101
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,4.5
+    - pos: -1.5,4.5
       parent: 1
       type: Transform
 - proto: AirlockExternalGlass
@@ -400,14 +329,16 @@ entities:
       pos: 3.5,10.5
       parent: 1
       type: Transform
+    - name: Starboard Dock 1
+      type: Docking
   - uid: 15
     components:
-    - name: external airlock
-      type: MetaData
     - rot: 3.141592653589793 rad
       pos: -0.5,13.5
       parent: 1
       type: Transform
+    - name: Fore Dock 1
+      type: Docking
   - uid: 44
     components:
     - name: external airlock
@@ -416,6 +347,8 @@ entities:
       pos: -2.5,12.5
       parent: 1
       type: Transform
+    - name: Port Dock 2
+      type: Docking
   - uid: 58
     components:
     - name: external airlock
@@ -424,6 +357,8 @@ entities:
       pos: -2.5,10.5
       parent: 1
       type: Transform
+    - name: Port Dock 1
+      type: Docking
   - uid: 59
     components:
     - name: external airlock
@@ -432,6 +367,8 @@ entities:
       pos: 3.5,12.5
       parent: 1
       type: Transform
+    - name: Starboard Dock 2
+      type: Docking
   - uid: 69
     components:
     - name: external airlock
@@ -440,6 +377,8 @@ entities:
       pos: 1.5,13.5
       parent: 1
       type: Transform
+    - name: Fore Dock 2
+      type: Docking
 - proto: AirlockMaint
   entities:
   - uid: 87
@@ -552,16 +491,6 @@ entities:
     - pos: 1.5,13.5
       parent: 1
       type: Transform
-- proto: Bloodpack
-  entities:
-  - uid: 307
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 303
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: BoxFolderClipboard
   entities:
   - uid: 301
@@ -570,24 +499,6 @@ entities:
       pos: -1.5088913,1.6462982
       parent: 1
       type: Transform
-- proto: Brutepack
-  entities:
-  - uid: 304
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 303
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 305
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 303
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: CableApcExtension
   entities:
   - uid: 35
@@ -1109,7 +1020,7 @@ entities:
       pos: 0.5,3.5
       parent: 1
       type: Transform
-- proto: ClosetWallEmergency
+- proto: ClosetWallEmergencyFilledRandom
   entities:
   - uid: 231
     components:
@@ -1117,81 +1028,13 @@ entities:
       pos: -2.5,5.5
       parent: 1
       type: Transform
-    - containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 247
-          - 246
-          - 245
-          - 244
-          - 243
-          - 234
-          - 233
-          - 232
-          - 248
-      type: ContainerContainer
 - proto: ClothingBackpackCaptain
   entities:
   - uid: 293
     components:
     - flags: InContainer
       type: MetaData
-    - parent: 256
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: ClothingHandsGlovesCaptain
-  entities:
-  - uid: 259
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 256
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: ClothingHeadHatCapcap
-  entities:
-  - uid: 261
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 256
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: ClothingHeadHatCaptain
-  entities:
-  - uid: 263
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 256
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: ClothingMaskBreath
-  entities:
-  - uid: 233
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 231
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 244
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 231
+    - parent: 233
       type: Transform
     - canCollide: False
       type: Physics
@@ -1202,60 +1045,7 @@ entities:
     components:
     - flags: InContainer
       type: MetaData
-    - parent: 256
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: ClothingNeckCloakCap
-  entities:
-  - uid: 268
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 256
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: ClothingNeckMantleCap
-  entities:
-  - uid: 265
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 256
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: ClothingOuterArmorCaptainCarapace
-  entities:
-  - uid: 257
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 256
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: ClothingOuterSuitEmergency
-  entities:
-  - uid: 245
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 231
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 247
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 231
+    - parent: 233
       type: Transform
     - canCollide: False
       type: Physics
@@ -1266,7 +1056,7 @@ entities:
     components:
     - flags: InContainer
       type: MetaData
-    - parent: 256
+    - parent: 233
       type: Transform
     - canCollide: False
       type: Physics
@@ -1277,7 +1067,7 @@ entities:
     components:
     - flags: InContainer
       type: MetaData
-    - parent: 256
+    - parent: 233
       type: Transform
     - canCollide: False
       type: Physics
@@ -1288,7 +1078,7 @@ entities:
     components:
     - flags: InContainer
       type: MetaData
-    - parent: 256
+    - parent: 233
       type: Transform
     - canCollide: False
       type: Physics
@@ -1394,16 +1184,6 @@ entities:
     - links:
       - 27
       type: DeviceLinkSink
-- proto: CrowbarRed
-  entities:
-  - uid: 235
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 234
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: Defibrillator
   entities:
   - uid: 56
@@ -1428,17 +1208,6 @@ entities:
           occludes: True
           ent: 56
       type: ContainerContainer
-- proto: DrinkFlask
-  entities:
-  - uid: 258
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 256
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
 - proto: EmergencyLight
   entities:
   - uid: 105
@@ -1449,14 +1218,7 @@ entities:
       type: Transform
   - uid: 187
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,11.5
-      parent: 1
-      type: Transform
-  - uid: 219
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,11.5
+    - pos: 0.5,12.5
       parent: 1
       type: Transform
   - uid: 225
@@ -1465,54 +1227,6 @@ entities:
       pos: 2.5,2.5
       parent: 1
       type: Transform
-- proto: EmergencyNitrogenTankFilled
-  entities:
-  - uid: 232
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 231
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 243
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 231
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: EmergencyOxygenTankFilled
-  entities:
-  - uid: 246
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 231
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 248
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 231
-      type: Transform
-    - toggleActionEntity: 249
-      type: GasTank
-    - canCollide: False
-      type: Physics
-    - type: ActionsContainer
-    - containers:
-        actions: !type:Container
-          ents:
-          - 249
-      type: ContainerContainer
-    - type: InsideEntityStorage
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 216
@@ -1564,70 +1278,6 @@ entities:
       - 214
       - 286
       type: DeviceNetwork
-- proto: FlashlightLantern
-  entities:
-  - uid: 236
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 234
-      type: Transform
-    - toggleActionEntity: 237
-      type: HandheldLight
-    - containers:
-        cell_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        actions: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 237
-      type: ContainerContainer
-    - canCollide: False
-      type: Physics
-    - type: ActionsContainer
-  - uid: 238
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 234
-      type: Transform
-    - toggleActionEntity: 239
-      type: HandheldLight
-    - containers:
-        cell_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        actions: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 239
-      type: ContainerContainer
-    - canCollide: False
-      type: Physics
-    - type: ActionsContainer
-- proto: FoodSnackChocolate
-  entities:
-  - uid: 240
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 234
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 241
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 234
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: GasOutletInjector
   entities:
   - uid: 205
@@ -1849,16 +1499,6 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-- proto: Gauze
-  entities:
-  - uid: 308
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 303
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: GravityGeneratorMini
   entities:
   - uid: 86
@@ -1930,19 +1570,9 @@ entities:
       pos: -5.5,3.5
       parent: 1
       type: Transform
-- proto: HarmonicaInstrument
+- proto: LockerCaptainFilled
   entities:
-  - uid: 242
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 234
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: LockerCaptain
-  entities:
-  - uid: 256
+  - uid: 233
     components:
     - anchored: True
       pos: 2.5,2.5
@@ -1953,10 +1583,10 @@ entities:
     - air:
         volume: 200
         immutable: False
-        temperature: 293.1496
+        temperature: 293.14957
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.734816
+        - 6.5262127
         - 0
         - 0
         - 0
@@ -1974,54 +1604,23 @@ entities:
           occludes: True
           ents:
           - 264
-          - 263
-          - 262
-          - 261
           - 260
-          - 259
-          - 258
-          - 257
-          - 265
-          - 266
           - 267
-          - 268
           - 293
+          - 266
+          - 262
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
           ent: null
       type: ContainerContainer
-- proto: Medkit
+- proto: MedkitFilled
   entities:
-  - uid: 303
+  - uid: 232
     components:
-    - pos: 0.546875,1.6687727
+    - pos: 0.53624237,1.703125
       parent: 1
       type: Transform
-    - storageUsed: 55
-      type: Storage
-    - containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 304
-          - 305
-          - 306
-          - 307
-          - 308
-          - 309
-      type: ContainerContainer
-- proto: Ointment
-  entities:
-  - uid: 306
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 303
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: PaperBin10
   entities:
   - uid: 300
@@ -2038,107 +1637,6 @@ entities:
       type: Transform
     - stampedName: Unknown
       type: Stamp
-- proto: PillCanister
-  entities:
-  - uid: 309
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 303
-      type: Transform
-    - storageUsed: 9
-      type: Storage
-    - containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 310
-          - 311
-          - 312
-          - 313
-          - 314
-          - 315
-          - 316
-          - 317
-          - 318
-      type: ContainerContainer
-    - canCollide: False
-      type: Physics
-- proto: PillTricordrazine
-  entities:
-  - uid: 310
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 309
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 311
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 309
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 312
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 309
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 313
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 309
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 314
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 309
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 315
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 309
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 316
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 309
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 317
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 309
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 318
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 309
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 215
@@ -2193,6 +1691,18 @@ entities:
       pos: 2.5,9.5
       parent: 1
       type: Transform
+  - uid: 219
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,11.5
+      parent: 1
+      type: Transform
+  - uid: 235
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -1.5,11.5
+      parent: 1
+      type: Transform
   - uid: 252
     components:
     - rot: 1.5707963267948966 rad
@@ -2205,11 +1715,6 @@ entities:
       pos: 2.5,1.5
       parent: 1
       type: Transform
-  - uid: 254
-    components:
-    - pos: 0.5,12.5
-      parent: 1
-      type: Transform
 - proto: PoweredSmallLight
   entities:
   - uid: 51
@@ -2310,7 +1815,7 @@ entities:
       type: Transform
 - proto: SpawnPointLatejoin
   entities:
-  - uid: 269
+  - uid: 234
     components:
     - pos: 0.5,8.5
       parent: 1
@@ -2328,7 +1833,7 @@ entities:
     components:
     - flags: InContainer
       type: MetaData
-    - parent: 256
+    - parent: 233
       type: Transform
     - canCollide: False
       type: Physics
@@ -2387,31 +1892,6 @@ entities:
       pos: -6.5,3.5
       parent: 1
       type: Transform
-- proto: ToolboxEmergency
-  entities:
-  - uid: 234
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 231
-      type: Transform
-    - storageUsed: 36
-      type: Storage
-    - containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 235
-          - 236
-          - 238
-          - 240
-          - 241
-          - 242
-      type: ContainerContainer
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
 - proto: TwoWayLever
   entities:
   - uid: 18
@@ -2694,7 +2174,7 @@ entities:
   entities:
   - uid: 288
     components:
-    - pos: 0.513818,1.5491064
+    - pos: 0.4387642,1.5743928
       parent: 1
       type: Transform
 ...
diff --git a/Resources/Prototypes/_NF/Shipyard/whippet.yml b/Resources/Prototypes/_NF/Shipyard/whippet.yml
index 0e04b6617e0..b8bdd0fb589 100644
--- a/Resources/Prototypes/_NF/Shipyard/whippet.yml
+++ b/Resources/Prototypes/_NF/Shipyard/whippet.yml
@@ -1,19 +1,19 @@
 - type: vessel
-  id: Whippet
+  id: whippet
   name: NC Whippet
   description: A no-frills cargo hauler to get large amounts there and back fast.
-  price: 17500
+  price: 18500
   category: Small
   group: Civilian
   shuttlePath: /Maps/Shuttles/whippet.yml
 
 - type: gameMap
-  id: Whippet
-  mapName: 'NC Whippet'
+  id: whippet
+  mapName: 'Whippet'
   mapPath: /Maps/Shuttles/whippet.yml
   minPlayers: 0
   stations:
-    Whippet:
+    whippet:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup