diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 285c02a011..b0264937c9 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -32223,7 +32223,7 @@ entities:
     parent: 60
     type: Transform
 - uid: 728
-  type: SpawnVehiclePussywagon
+  type: SpawnVehicleJanicart
   components:
   - pos: -3.5,-26.5
     parent: 60
@@ -33568,7 +33568,7 @@ entities:
   - color: '#FF1212FF'
     type: AtmosPipeColor
 - uid: 918
-  type: VehicleKeyPussyWagon
+  type: VehicleKeyJanicart
   components:
   - pos: -4.5299664,-28.410858
     parent: 60
diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml
index 0750af2576..16c66880aa 100644
--- a/Resources/Maps/barratry.yml
+++ b/Resources/Maps/barratry.yml
@@ -90490,7 +90490,7 @@ entities:
     parent: 1
     type: Transform
 - uid: 7067
-  type: SpawnVehiclePussywagon
+  type: SpawnVehicleJanicart
   components:
   - pos: -51.5,36.5
     parent: 1
@@ -147998,7 +147998,7 @@ entities:
     parent: 1
     type: Transform
 - uid: 15049
-  type: VehicleKeyPussyWagon
+  type: VehicleKeyJanicart
   components:
   - flags: InContainer
     type: MetaData
diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
index 9409ac1ba5..b9f96c8019 100644
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -85074,7 +85074,7 @@ entities:
     parent: 8364
     type: Transform
 - uid: 8812
-  type: VehicleKeyPussyWagon
+  type: VehicleKeyJanicart
   components:
   - pos: -49.53985,-5.3556643
     parent: 8364
@@ -119588,7 +119588,7 @@ entities:
     parent: 8364
     type: Transform
 - uid: 14104
-  type: SpawnVehiclePussywagon
+  type: SpawnVehicleJanicart
   components:
   - pos: -51.5,-5.5
     parent: 8364
diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index 346a23b39c..c98d4ca31e 100644
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -12770,7 +12770,7 @@ entities:
     parent: 127
     type: Transform
 - uid: 314
-  type: VehicleKeyPussyWagon
+  type: VehicleKeyJanicart
   components:
   - pos: 7.4941626,-12.513269
     parent: 127
@@ -29843,7 +29843,7 @@ entities:
     parent: 127
     type: Transform
 - uid: 2920
-  type: SpawnVehiclePussywagon
+  type: SpawnVehicleJanicart
   components:
   - pos: 7.5,-12.5
     parent: 127
diff --git a/Resources/Maps/kettle.yml b/Resources/Maps/kettle.yml
index 9684c08f33..41a87876d3 100644
--- a/Resources/Maps/kettle.yml
+++ b/Resources/Maps/kettle.yml
@@ -86188,7 +86188,7 @@ entities:
     parent: 82
     type: Transform
 - uid: 7174
-  type: VehicleKeyPussyWagon
+  type: VehicleKeyJanicart
   components:
   - pos: 1.9728081,37.62823
     parent: 82
@@ -164953,7 +164953,7 @@ entities:
     parent: 82
     type: Transform
 - uid: 18902
-  type: SpawnVehiclePussywagon
+  type: SpawnVehicleJanicart
   components:
   - pos: -0.5,39.5
     parent: 82
diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index f3a3450a96..ccc46124e1 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -162815,7 +162815,7 @@ entities:
     parent: 30
     type: Transform
 - uid: 20440
-  type: VehicleKeyPussyWagon
+  type: VehicleKeyJanicart
   components:
   - pos: -30.815971,6.7175894
     parent: 30
@@ -163016,7 +163016,7 @@ entities:
     parent: 30
     type: Transform
 - uid: 20464
-  type: SpawnVehiclePussywagon
+  type: SpawnVehicleJanicart
   components:
   - pos: -32.5,9.5
     parent: 30
diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
index d3cb400aad..c19aa62092 100644
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -94014,13 +94014,13 @@ entities:
     parent: 0
     type: Transform
 - uid: 9290
-  type: VehicleKeyPussyWagon
+  type: VehicleKeyJanicart
   components:
   - pos: -28.519938,26.44267
     parent: 0
     type: Transform
 - uid: 9291
-  type: SpawnVehiclePussywagon
+  type: SpawnVehicleJanicart
   components:
   - pos: -23.5,28.5
     parent: 0
diff --git a/Resources/Maps/moose.yml b/Resources/Maps/moose.yml
index 7e75478931..ad5b5aaae3 100644
--- a/Resources/Maps/moose.yml
+++ b/Resources/Maps/moose.yml
@@ -25698,7 +25698,7 @@ entities:
     parent: 6
     type: Transform
 - uid: 541
-  type: SpawnVehiclePussywagon
+  type: SpawnVehicleJanicart
   components:
   - pos: 26.5,3.5
     parent: 6
@@ -26747,7 +26747,7 @@ entities:
     parent: 6
     type: Transform
 - uid: 700
-  type: VehicleKeyPussyWagon
+  type: VehicleKeyJanicart
   components:
   - pos: 26.799675,3.7001503
     parent: 6
@@ -58114,7 +58114,7 @@ entities:
     parent: 6
     type: Transform
 - uid: 5541
-  type: VehiclePussyWagonDestroyed
+  type: VehicleJanicartDestroyed
   components:
   - pos: -56.5,-32.5
     parent: 6
diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index 7c4ee63c32..6cc4757eef 100644
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -23172,13 +23172,13 @@ entities:
     parent: 0
     type: Transform
 - uid: 1481
-  type: SpawnVehiclePussywagon
+  type: SpawnVehicleJanicart
   components:
   - pos: -22.5,-6.5
     parent: 0
     type: Transform
 - uid: 1482
-  type: VehicleKeyPussyWagon
+  type: VehicleKeyJanicart
   components:
   - pos: -22.528929,-6.6977267
     parent: 0
diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml
index 859a1dddb1..b3e205424d 100644
--- a/Resources/Maps/origin.yml
+++ b/Resources/Maps/origin.yml
@@ -77788,7 +77788,7 @@ entities:
     parent: 1
     type: Transform
 - uid: 6212
-  type: VehicleKeyPussyWagon
+  type: VehicleKeyJanicart
   components:
   - pos: -13.519899,-23.451248
     parent: 1
@@ -77825,7 +77825,7 @@ entities:
     parent: 1
     type: Transform
 - uid: 6218
-  type: SpawnVehiclePussywagon
+  type: SpawnVehicleJanicart
   components:
   - pos: -12.5,-23.5
     parent: 1
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/vehicles.yml b/Resources/Prototypes/Entities/Markers/Spawners/vehicles.yml
index 97467ba1d8..733422cbeb 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/vehicles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/vehicles.yml
@@ -14,17 +14,17 @@
 
 - type: entity
   name: Janicart Spawner
-  id: SpawnVehiclePussywagon
+  id: SpawnVehicleJanicart
   parent: MarkerBase
   components:
   - type: Sprite
     layers:
       - state: green
-      - sprite: Objects/Vehicles/pussywagon.rsi
+      - sprite: Objects/Vehicles/janicart.rsi
         state: keys
   - type: ConditionalSpawner
     prototypes:
-      - VehiclePussyWagon
+      - VehicleJanicart
 
 - type: entity
   name: ATV Spawner
diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
index 10d181e561..36fbe0028e 100644
--- a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
+++ b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
@@ -74,7 +74,7 @@
     price: 750 # Grand Theft Auto.
 
 - type: entity
-  id: VehiclePussyWagon
+  id: VehicleJanicart
   parent: BaseVehicle
   name: janicart
   description: The janitor's trusty steed.
@@ -83,7 +83,7 @@
     northOverride: -0.15
     southOverride: 0.22
   - type: Sprite
-    sprite: Objects/Vehicles/pussywagon.rsi
+    sprite: Objects/Vehicles/janicart.rsi
     layers:
     - state: vehicle
       map: ["enum.VehicleVisualLayers.AutoAnimate"]
@@ -116,7 +116,7 @@
       - !type:ExplodeBehavior
       - !type:SpawnEntitiesBehavior # in future should also emit a cloud of hot gas
         spawn:
-          VehiclePussyWagonDestroyed:
+          VehicleJanicartDestroyed:
             min: 1
             max: 1
   - type: ItemSlots
@@ -127,7 +127,7 @@
           requireAll: true
           tags:
           - VehicleKey
-          - PussyWagonKeys
+          - JanicartKeys
         insertSound:
           path: /Audio/Effects/Vehicle/vehiclestartup.ogg
           params:
@@ -143,17 +143,16 @@
         whitelist:
           tags:
             - TrashBag
-    sprite: Objects/Vehicles/pussywagon.rsi
+    sprite: Objects/Vehicles/janicart.rsi
   - type: Appearance
 
 - type: entity
-  id: VehiclePussyWagonDestroyed
+  id: VehicleJanicartDestroyed
   parent: MachineFrameDestroyed
   name: destroyed janicart
-  description: R.I.P. (Rest In Pussy)
   components:
   - type: Sprite
-    sprite: Objects/Vehicles/pussywagon.rsi
+    sprite: Objects/Vehicles/janicart.rsi
     state: destroyed
     netsync: false
 
diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml b/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml
index 56acfee652..8144d512f7 100644
--- a/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml
@@ -1,6 +1,6 @@
 - type: entity
   parent: BaseItem
-  id: VehicleKeyPussyWagon
+  id: VehicleKeyJanicart
   name: janicart keys
   description: Interesting design.
   components:
@@ -9,14 +9,14 @@
   - type: Tag
     tags:
     - VehicleKey
-    - PussyWagonKeys
+    - JanicartKeys
   - type: Sprite
-    sprite: Objects/Vehicles/pussywagon.rsi
+    sprite: Objects/Vehicles/janicart.rsi
     state: keys
     netsync: false
 
 - type: entity
-  parent: VehicleKeyPussyWagon
+  parent: VehicleKeyJanicart
   id: VehicleKeySecway
   name: secway keys
   description: The keys to the future.
@@ -31,7 +31,7 @@
     netsync: false
 
 - type: entity
-  parent: VehicleKeyPussyWagon
+  parent: VehicleKeyJanicart
   id: VehicleKeyATV
   name: ATV keys
   description: Think this looks like just one key? ATV keys means "actually two vehicle keys."
@@ -54,14 +54,14 @@
   - type: Tag
     tags:
     - VehicleKey
-    - PussyWagonKeys
+    - JanicartKeys
     - SecwayKeys
     - ATVKeys
     - SyndicateSegwayKeys
     - SkeletonMotorcycleKeys
 
 - type: entity
-  parent: VehicleKeyPussyWagon
+  parent: VehicleKeyJanicart
   id: VehicleKeySyndicateSegway
   name: syndicate segway keys
   description: Patterned after the iconic EMAG design.
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 0321bac988..859eff49db 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -459,7 +459,7 @@
   id: ProximitySensor
 
 - type: Tag
-  id: PussyWagonKeys
+  id: JanicartKeys
 
 - type: Tag
   id: Radio
diff --git a/Resources/Textures/Objects/Vehicles/pussywagon.rsi/destroyed.png b/Resources/Textures/Objects/Vehicles/janicart.rsi/destroyed.png
similarity index 100%
rename from Resources/Textures/Objects/Vehicles/pussywagon.rsi/destroyed.png
rename to Resources/Textures/Objects/Vehicles/janicart.rsi/destroyed.png
diff --git a/Resources/Textures/Objects/Vehicles/janicart.rsi/keys.png b/Resources/Textures/Objects/Vehicles/janicart.rsi/keys.png
new file mode 100644
index 0000000000..2c616a1389
Binary files /dev/null and b/Resources/Textures/Objects/Vehicles/janicart.rsi/keys.png differ
diff --git a/Resources/Textures/Objects/Vehicles/pussywagon.rsi/meta.json b/Resources/Textures/Objects/Vehicles/janicart.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Vehicles/pussywagon.rsi/meta.json
rename to Resources/Textures/Objects/Vehicles/janicart.rsi/meta.json
diff --git a/Resources/Textures/Objects/Vehicles/pussywagon.rsi/storage.png b/Resources/Textures/Objects/Vehicles/janicart.rsi/storage.png
similarity index 100%
rename from Resources/Textures/Objects/Vehicles/pussywagon.rsi/storage.png
rename to Resources/Textures/Objects/Vehicles/janicart.rsi/storage.png
diff --git a/Resources/Textures/Objects/Vehicles/pussywagon.rsi/vehicle.png b/Resources/Textures/Objects/Vehicles/janicart.rsi/vehicle.png
similarity index 100%
rename from Resources/Textures/Objects/Vehicles/pussywagon.rsi/vehicle.png
rename to Resources/Textures/Objects/Vehicles/janicart.rsi/vehicle.png
diff --git a/Resources/Textures/Objects/Vehicles/pussywagon.rsi/keys.png b/Resources/Textures/Objects/Vehicles/pussywagon.rsi/keys.png
deleted file mode 100644
index 7a362ca331..0000000000
Binary files a/Resources/Textures/Objects/Vehicles/pussywagon.rsi/keys.png and /dev/null differ