diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
index 46271cc2ea..bf96374398 100644
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -8,8 +8,8 @@ namespace Content.Shared.GameTicking
     {
         // See ideally these would be pulled from the job definition or something.
         // But this is easier, and at least it isn't hardcoded.
-        public const string FallbackOverflowJob = "Assistant";
-        public const string FallbackOverflowJobName = "assistant";
+        public const string FallbackOverflowJob = "Passenger";
+        public const string FallbackOverflowJobName = "passenger";
     }
 
     [Serializable, NetSerializable]
diff --git a/Resources/Locale/en-US/advertisements/vending/cargodrobe.ftl b/Resources/Locale/en-US/advertisements/vending/cargodrobe.ftl
index ee34b5e282..587979f5c5 100644
--- a/Resources/Locale/en-US/advertisements/vending/cargodrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/cargodrobe.ftl
@@ -1,2 +1,2 @@
-advertisement-cargodrobe-1 = Upgraded Assistant Style! Pick yours today!
+advertisement-cargodrobe-1 = Upgraded Passenger Style! Pick yours today!
 advertisement-cargodrobe-2 = These shorts are comfy and easy to wear, get yours now!
diff --git a/Resources/Locale/en-US/barsign/barsign-component.ftl b/Resources/Locale/en-US/barsign/barsign-component.ftl
index fa05763aba..02f8860811 100644
--- a/Resources/Locale/en-US/barsign/barsign-component.ftl
+++ b/Resources/Locale/en-US/barsign/barsign-component.ftl
@@ -4,7 +4,7 @@ barsign-component-name = bar sign
 
 ## The Harmbaton
 barsign-prototype-name-harmbaton = The Harmbaton
-barsign-prototype-description-harmbaton = A great dining experience for both security members and assistants.
+barsign-prototype-description-harmbaton = A great dining experience for both security members and passengers.
 
 ## The Singulo
 barsign-prototype-name-singulo = The Singulo
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index 659e54de8c..8c28e5b880 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -21,7 +21,7 @@ humanoid-profile-editor-backpack-label = Backpack:
 humanoid-profile-editor-eyes-label = Eye color:
 humanoid-profile-editor-jobs-tab = Jobs
 humanoid-profile-editor-preference-unavailable-stay-in-lobby-button = Stay in lobby if preference unavailable.
-humanoid-profile-editor-preference-unavailable-spawn-as-overflow-button = Be an {$overflowJob} if preference unavailable.
+humanoid-profile-editor-preference-unavailable-spawn-as-overflow-button = Be a {$overflowJob} if preference unavailable.
 humanoid-profile-editor-preference-jumpsuit = Jumpsuit
 humanoid-profile-editor-preference-jumpskirt = Jumpskirt
 humanoid-profile-editor-preference-backpack = Backpack
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index dd00875dc9..bbf620d3c6 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -86,7 +86,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: AssistantPDA
+      - id: PassengerPDA
         amount: 6
   - type: Sprite
     layers:
@@ -106,7 +106,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: AssistantIDCard
+      - id: PassengerIDCard
         amount: 6
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
index 207c165c43..ea0df18763 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
@@ -3,9 +3,9 @@
   name: PTech
   spriteName: cart
   startingInventory:
-    AssistantPDA: 5
+    PassengerPDA: 5
     ClearPDA: 5
-    AssistantIDCard: 5
+    PassengerIDCard: 5
     RubberStampApproved: 1
     RubberStampDenied: 1
     Paper: 10
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 2ae12a73a3..056112c18a 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -245,7 +245,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitHoSGrey
   name: head of security's grey jumpsuit
-  description: A grey jumpsuit of Head of Security, which make him look somewhat like an assistant.
+  description: A grey jumpsuit of Head of Security, which make him look somewhat like a passenger.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi
@@ -723,7 +723,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/capformal.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/capformal.rsi
-    
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitCentcomFormal
@@ -733,8 +733,8 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi 
-    
+    sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitHosFormal
@@ -744,8 +744,8 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi 
-     
+    sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitOperative
@@ -756,7 +756,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
-    
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitAtmos
@@ -767,5 +767,5 @@
     sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi
-    
-    
+
+
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
index 18f8dbd3e5..aa7230bc93 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -76,16 +76,16 @@
 # Civilian
 
 - type: entity
-  id: SpawnPointAssistant
+  id: SpawnPointAssistant # TODO rename, but requires map changes.
   parent: SpawnPointJobBase
-  name: assistant
+  name: passenger
   components:
   - type: SpawnPoint
-    job_id: Assistant
+    job_id: Passenger
   - type: Sprite
     layers:
       - state: green
-      - state: assistant
+      - state: passenger
 
 - type: entity
   id: SpawnPointTechnicalAssistant
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/dummy_npcs.yml b/Resources/Prototypes/Entities/Mobs/NPCs/dummy_npcs.yml
index edca406560..281eee5f05 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/dummy_npcs.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/dummy_npcs.yml
@@ -7,6 +7,6 @@
   suffix: AI
   components:
   - type: UtilityAI
-    startingGear: AssistantGear
+    startingGear: PassengerGear
     behaviorSets:
     - PathingDummy
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
index c1e46a2767..c63f374525 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -10,7 +10,7 @@
     - Hunger
     - Thirst
     - Idle
-    startingGear: AssistantGear
+    startingGear: PassengerGear
   - type: AiFactionTag
     factions:
     - NanoTrasen
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 3f140c5bbe..5df040755b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -70,12 +70,12 @@
 
 - type: entity
   parent: BasePDA
-  id: AssistantPDA
-  name: assistant PDA
+  id: PassengerPDA
+  name: passenger PDA
   description: Why isn't it gray?
   components:
   - type: PDA
-    id: AssistantIDCard
+    id: PassengerIDCard
 
 - type: entity
   parent: BasePDA
@@ -531,7 +531,7 @@
   parent: BasePDA
   id: SecurityPDA
   name: security PDA
-  description: Red to hide the stains of assistant blood.
+  description: Red to hide the stains of passenger blood.
   components:
   - type: PDA
     id: SecurityIDCard
@@ -543,7 +543,7 @@
     state: pda-security
 
 - type: entity
-  parent: AssistantPDA
+  parent: PassengerPDA
   id: CentcomPDA
   name: centcom PDA
   description: Colored the numbing grey of bureaucracy.
@@ -591,7 +591,7 @@
   description: 99 and 44/100ths percent pure plastic.
   components:
   - type: PDA
-    id: AssistantIDCard
+    id: PassengerIDCard
   - type: Appearance
     visuals:
       - type: PDAVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 0f05eb99a7..e69889f195 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -257,8 +257,8 @@
 
 - type: entity
   parent: BaseItem
-  id: ToyAssistant
-  name: assistant toy
+  id: ToyAssistant # TODO rename but needs map changes
+  name: passenger toy
   description: Grey tide world wide!
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 6d8b433623..3a8ad3787d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -22,18 +22,18 @@
 
 - type: entity
   parent: IDCardStandard
-  id: AssistantIDCard
-  name: assistant ID card
+  id: PassengerIDCard
+  name: passenger ID card
   components:
   - type: Sprite
     layers:
     - state: default
-    - state: idassistant
+    - state: idpassenger
   - type: PresetIdCard
-    job: Assistant
+    job: Passenger
 
 - type: entity
-  parent: AssistantIDCard
+  parent: PassengerIDCard
   id: TechnicalAssistantIDCard
   name: technical assistant ID card
   components:
@@ -45,7 +45,7 @@
     - state: idintern-tech
 
 - type: entity
-  parent: AssistantIDCard
+  parent: PassengerIDCard
   id: MedicalInternIDCard
   name: medical intern ID card
   components:
@@ -57,7 +57,7 @@
     - state: idintern-med
 
 - type: entity
-  parent: AssistantIDCard
+  parent: PassengerIDCard
   id: SecurityCadetIDCard
   name: security cadet ID card
   components:
@@ -69,7 +69,7 @@
     - state: idintern-cadet
 
 - type: entity
-  parent: AssistantIDCard
+  parent: PassengerIDCard
   id: ServiceWorkerIDCard
   name: service worker ID card
   components:
@@ -427,7 +427,7 @@
       job: Musician
 
 - type: entity
-  parent: AssistantIDCard
+  parent: PassengerIDCard
   id: AgentIDCard
   suffix: Agent
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index c2c991c778..91f70aeea8 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -116,7 +116,7 @@
   parent: PosterBase
   id: PosterContrabandGreyTide
   name: "Grey Tide"
-  description: "A rebellious poster symbolizing assistant solidarity."
+  description: "A rebellious poster symbolizing passenger solidarity."
   components:
   - type: Sprite
     state: poster8_contraband
@@ -861,7 +861,7 @@
   components:
   - type: Sprite
     state: poster37_legit
-    
+
 #maps
 
 - type: entity
@@ -881,7 +881,7 @@
   components:
   - type: Sprite
     state: deltamap
-    
+
 - type: entity
   parent: PosterBase
   id: PosterMapMarathon
@@ -889,7 +889,7 @@
   description: "A map of Marathon Station."
   components:
   - type: Sprite
-    state: marathonmap    
+    state: marathonmap
 
 - type: entity
   parent: PosterBase
@@ -899,7 +899,7 @@
   components:
   - type: Sprite
     state: moosemap
-    
+
 - type: entity
   parent: PosterBase
   id: PosterMapPacked
@@ -907,7 +907,7 @@
   description: "A map of Packed Station."
   components:
   - type: Sprite
-    state: packedmap  
+    state: packedmap
 
 - type: entity
   parent: PosterBase
@@ -917,7 +917,7 @@
   components:
   - type: Sprite
     state: pillarmap
-    
+
 - type: entity
   parent: PosterBase
   id: PosterMapSaltern
@@ -925,8 +925,8 @@
   description: "A map of Saltern Station."
   components:
   - type: Sprite
-    state: salternmap  
-    
+    state: salternmap
+
 - type: entity
   parent: PosterBase
   id: PosterMapSplit
@@ -934,5 +934,5 @@
   description: "A map of Split Station."
   components:
   - type: Sprite
-    state: splitmap 
-    
+    state: splitmap
+
diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml
index b3d0e4cf49..f367662f5a 100644
--- a/Resources/Prototypes/Maps/atlas.yml
+++ b/Resources/Prototypes/Maps/atlas.yml
@@ -9,10 +9,10 @@
   minPlayers: 0
   maxPlayers: 25
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 1, 2 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 2, 2]
     Chef: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
index 0b2f215324..7c9331cbbd 100644
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -8,10 +8,10 @@
   mapPath: /Maps/bagel.yml
   minPlayers: 35
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 3, 3 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 2, 2 ]
     Botanist: [ 3, 3]
     Chef: [ 2, 2 ]
@@ -34,7 +34,7 @@
     Librarian: [ 1, 1 ]
     Lawyer: [ 2, 2 ]
     Quartermaster: [ 1, 1 ]
-    SalvageSpecialist: [ 3, 3 ] 
+    SalvageSpecialist: [ 3, 3 ]
     Musician: [ 1, 1 ]
     AtmosphericTechnician: [ 3, 3 ]
     TechnicalAssistant: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/barratry.yml b/Resources/Prototypes/Maps/barratry.yml
index 67b1ba786f..426e29acb3 100644
--- a/Resources/Prototypes/Maps/barratry.yml
+++ b/Resources/Prototypes/Maps/barratry.yml
@@ -8,10 +8,10 @@
   mapPath: /Maps/barratry.yml
   minPlayers: 40
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 3, 3 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 2, 2 ]
     Botanist: [ 3, 4]
     Chef: [ 2, 2 ]
@@ -34,6 +34,6 @@
     Librarian: [ 1, 1 ]
     Lawyer: [ 2, 2 ]
     Quartermaster: [ 1, 1 ]
-    SalvageSpecialist: [ 3, 3 ] 
+    SalvageSpecialist: [ 3, 3 ]
     Musician: [ 1, 1 ]
     AtmosphericTechnician: [ 2, 3 ]
diff --git a/Resources/Prototypes/Maps/delta.yml b/Resources/Prototypes/Maps/delta.yml
index 64d6dd7316..89858e5582 100644
--- a/Resources/Prototypes/Maps/delta.yml
+++ b/Resources/Prototypes/Maps/delta.yml
@@ -8,10 +8,10 @@
   mapPath: /Maps/delta.yml
   minPlayers: 60
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 4, 4 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 4, 4]
     Chef: [ 1, 2 ]
@@ -34,6 +34,6 @@
     Librarian: [ 1, 1 ]
     Lawyer: [ 2, 2 ]
     Quartermaster: [ 1, 1 ]
-    SalvageSpecialist: [ 3, 3 ] 
+    SalvageSpecialist: [ 3, 3 ]
     Musician: [ 2, 2 ]
     AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/game.yml b/Resources/Prototypes/Maps/game.yml
index 912d74f07e..1a39e338a3 100644
--- a/Resources/Prototypes/Maps/game.yml
+++ b/Resources/Prototypes/Maps/game.yml
@@ -1,3 +1,44 @@
+- type: gameMap
+  id: saltern
+  mapName: 'Saltern'
+  mapNameTemplate: '{0} Saltern {1}'
+  nameGenerator:
+    !type:NanotrasenNameGenerator
+    prefixCreator: '14'
+  mapPath: /Maps/saltern.yml
+  minPlayers: 0
+  maxPlayers: 29
+  fallback: true
+  overflowJobs:
+    - Passenger
+  availableJobs:
+    CargoTechnician: [ 1, 2 ]
+    Passenger: [ -1, -1 ]
+    Bartender: [ 1, 1 ]
+    Botanist: [ 2, 2 ]
+    Chef: [ 1, 1 ]
+    Clown: [ 1, 1 ]
+    Janitor: [ 1, 1 ]
+    Mime: [ 1, 1 ]
+    Captain: [ 1, 1 ]
+    HeadOfPersonnel: [ 1, 1 ]
+    ChiefEngineer: [ 1, 1 ]
+    StationEngineer: [ 2, 3 ]
+    ChiefMedicalOfficer: [ 1, 1 ]
+    MedicalDoctor: [ 2, 3 ]
+    Chemist: [ 1, 1 ]
+    ResearchDirector: [ 1, 1 ]
+    Scientist: [ 2, 3 ]
+    HeadOfSecurity: [ 1, 1 ]
+    SecurityOfficer: [ 2, 3 ]
+    Chaplain: [ 1, 1 ]
+    Librarian: [ 1, 1 ]
+    Musician: [ 1, 1 ]
+    Lawyer: [ 1, 1 ]
+    SalvageSpecialist: [ 1, 2 ]
+    Quartermaster: [ 1, 1 ]
+    AtmosphericTechnician: [ 1, 2 ]
+
 - type: gameMap
   id: packedstation
   mapName: 'Packedstation'
@@ -14,10 +55,10 @@
       inverted: true
       holidays: [ "Christmas" ]
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 2, 3 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 2, 2 ]
     Chef: [ 1, 1 ]
@@ -52,9 +93,9 @@
   mapPath: /Maps/nss_pillar.yml
   minPlayers: 40
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     CargoTechnician: [ 4, 6 ]
     Bartender: [ 2, 2 ]
     Botanist: [ 2, 4 ]
@@ -94,10 +135,10 @@
   maxPlayers: 15
   votable: false
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 1, 1 ]
-    Assistant: [ 4, 8 ]
+    Passenger: [ 4, 8 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 1, 1 ]
     Chef: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/holiday.yml b/Resources/Prototypes/Maps/holiday.yml
index 5ec74809d3..8c06d241c1 100644
--- a/Resources/Prototypes/Maps/holiday.yml
+++ b/Resources/Prototypes/Maps/holiday.yml
@@ -11,10 +11,10 @@
     - !type:HolidayMapCondition
       holidays: [ "Christmas" ]
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 2, 3 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 2, 2 ]
     Chef: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
index 14676550d6..acf9f3717b 100644
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -9,10 +9,10 @@
   minPlayers: 35
   maxPlayers: 70
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 2, 3 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 2, 2 ]
     Botanist: [ 3, 3]
     Chef: [ 2, 2 ]
@@ -35,7 +35,7 @@
     Librarian: [ 1, 1 ]
     Lawyer: [ 2, 2 ]
     Quartermaster: [ 1, 1 ]
-    SalvageSpecialist: [ 3, 3 ] 
+    SalvageSpecialist: [ 3, 3 ]
     Musician: [ 1, 1 ]
     AtmosphericTechnician: [ 3, 3 ]
     TechnicalAssistant: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/moose.yml b/Resources/Prototypes/Maps/moose.yml
index 2699016aa4..879a3f43f2 100644
--- a/Resources/Prototypes/Maps/moose.yml
+++ b/Resources/Prototypes/Maps/moose.yml
@@ -9,10 +9,10 @@
   minPlayers: 0
   maxPlayers: 35
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 2, 2 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 2, 2]
     Chef: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
index 281c165a8c..eb14ef775c 100644
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -10,10 +10,10 @@
   maxPlayers: 29
   fallback: true
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 2, 2 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 2, 2 ]
     Chef: [ 1, 1 ]
@@ -41,4 +41,4 @@
     TechnicalAssistant: [ 2, 2 ]
     MedicalIntern: [ 2, 2 ]
     ServiceWorker: [ 2, 2 ]
-    SecurityCadet: [ 2, 2 ]
\ No newline at end of file
+    SecurityCadet: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/splitstation.yml b/Resources/Prototypes/Maps/splitstation.yml
index e0513150bd..7b3beff9f3 100644
--- a/Resources/Prototypes/Maps/splitstation.yml
+++ b/Resources/Prototypes/Maps/splitstation.yml
@@ -8,10 +8,10 @@
   mapPath: /Maps/splitstation.yml
   minPlayers: 60
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 3, 6 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 2, 3 ]
     Botanist: [ 3, 6]
     Chef: [ 2, 4 ]
@@ -34,7 +34,7 @@
     Librarian: [ 1, 1 ]
     Lawyer: [ 2, 2 ]
     Quartermaster: [ 1, 1 ]
-    SalvageSpecialist: [ 4, 6 ] 
+    SalvageSpecialist: [ 4, 6 ]
     Musician: [ 1, 1 ]
     AtmosphericTechnician: [ 1, 2 ]
     TechnicalAssistant: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/test.yml b/Resources/Prototypes/Maps/test.yml
index 1d2dc7c471..2e9c01f2f3 100644
--- a/Resources/Prototypes/Maps/test.yml
+++ b/Resources/Prototypes/Maps/test.yml
@@ -5,7 +5,7 @@
   minPlayers: 0
   votable: false
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
 
diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index 86576c1b3e..bde7f8b5d6 100644
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -1,7 +1,7 @@
 
 
 - type: latheRecipe
-  id: ClothingUniformJumpsuitColorGrey #Assistant
+  id: ClothingUniformJumpsuitColorGrey # Tide
   icon:
     sprite: Clothing/Uniforms/Jumpsuit/Color/grey.rsi
     state: icon
@@ -551,7 +551,7 @@
   completetime: 4
   materials:
     Cloth: 300
-    
+
 - type: latheRecipe
   id: ClothingOuterWinterCap
   icon:
@@ -562,7 +562,7 @@
   materials:
     Cloth: 300
     Durathread: 300
-    
+
 - type: latheRecipe
   id: ClothingOuterWinterCE
   icon:
@@ -573,7 +573,7 @@
   materials:
     Cloth: 300
     Durathread: 300
-    
+
 - type: latheRecipe
   id: ClothingOuterWinterCMO
   icon:
@@ -584,7 +584,7 @@
   materials:
     Cloth: 300
     Durathread: 300
-    
+
 - type: latheRecipe
   id: ClothingOuterWinterHoP
   icon:
@@ -595,7 +595,7 @@
   materials:
     Cloth: 300
     Durathread: 300
-    
+
 - type: latheRecipe
   id: ClothingOuterWinterHoS
   icon:
@@ -606,7 +606,7 @@
   materials:
     Cloth: 300
     Durathread: 300
-    
+
 - type: latheRecipe
   id: ClothingOuterWinterQM
   icon:
@@ -617,7 +617,7 @@
   materials:
     Cloth: 300
     Durathread: 300
-    
+
 - type: latheRecipe
   id: ClothingOuterWinterRD
   icon:
@@ -628,4 +628,4 @@
   materials:
     Cloth: 300
     Durathread: 300
-     
+
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
index 4c1a4df096..e61c5f3ffc 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
@@ -1,21 +1,21 @@
 - type: job
-  id: Assistant
-  name: "assistant"
-  startingGear: AssistantGear
+  id: Passenger
+  name: "passenger"
+  startingGear: PassengerGear
   departments:
   - Civilian
-  icon: "Assistant"
+  icon: "Passenger"
   supervisors: "absolutely everyone"
   access:
   - Maintenance
 
 - type: startingGear
-  id: AssistantGear
+  id: PassengerGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorGrey
     back: ClothingBackpackFilled
     shoes: ClothingShoesColorBlack
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorGrey
   satchel: ClothingBackpackSatchelFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
index 380ea49900..e0b008b4fd 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
@@ -8,7 +8,7 @@
     neck: BedsheetCult
     outerClothing: ClothingOuterArmorCult
     shoes: ClothingShoesCult
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
@@ -22,7 +22,7 @@
     head: ClothingHeadHatHoodCulthood
     outerClothing: ClothingOuterRobesCult
     shoes: ClothingShoesColorRed
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 29eabf370a..327f3bdff4 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -10,7 +10,7 @@
     gloves: ClothingHandsGlovesIhscombat
     outerClothing: IHSVoidsuit
     shoes: ClothingShoesBootsJack
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
@@ -25,7 +25,7 @@
     head: ClothingHeadHatPirate
     outerClothing: ClothingOuterCoatPirate
     shoes: ClothingShoesBootsWork
-    id: AssistantPDA
+    id: PassengerPDA
     belt: ClothingBeltUtility
   innerclothingskirt: ClothingUniformJumpskirtColorLightBrown
   satchel: ClothingBackpackSatchelEngineering
@@ -41,7 +41,7 @@
     gloves: ClothingHandsGlovesSpaceNinja
     outerClothing: ClothingOuterSuitSpaceninja
     shoes: ClothingShoesSpaceNinja
-    id: AssistantPDA
+    id: PassengerPDA
   innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled
@@ -87,7 +87,7 @@
     back: ClothingBackpackDuffelSyndicateOperative
     mask: ClothingMaskGasSyndicate
   # eyes: Night Vision Goggles whenever they're made
-    eyes: ClothingEyesGlassesMeson 
+    eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitSyndie
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
index c4e26651ba..a72ea59547 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
@@ -7,7 +7,7 @@
     head: ClothingHeadHatWizard
     outerClothing: ClothingOuterWizard
     shoes: ClothingShoesWizard
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorDarkBlue
   satchel: ClothingBackpackSatchelFilled
@@ -21,7 +21,7 @@
     head: ClothingHeadHatRedwizard
     outerClothing: ClothingOuterWizardRed
     shoes: ClothingShoesWizard
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorRed
   satchel: ClothingBackpackSatchelFilled
@@ -35,7 +35,7 @@
     head: ClothingHeadHatVioletwizard
     outerClothing: ClothingOuterWizardViolet
     shoes: ClothingShoesWizard
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorPurple
   satchel: ClothingBackpackSatchelFilled
@@ -48,7 +48,7 @@
     back: ClothingBackpackFilled
     outerClothing: ClothingOuterHardsuitWizard
     shoes: ClothingShoesWizard
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorPurple
   satchel: ClothingBackpackSatchelFilled
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Assistant.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Assistant.png
deleted file mode 100644
index 6d67220af5..0000000000
Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Assistant.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png
new file mode 100644
index 0000000000..6dcde3e252
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index d07a834eb2..de4ba7caf8 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -83,7 +83,7 @@
             "name": "ShaftMiner"
         },
         {
-            "name": "Assistant"
+            "name": "Passenger"
         },
         {
             "name": "ChiefEngineer"
diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json
index 9d9b7b3c03..2ba5d82717 100644
--- a/Resources/Textures/Markers/jobs.rsi/meta.json
+++ b/Resources/Textures/Markers/jobs.rsi/meta.json
@@ -14,7 +14,7 @@
       "name": "ai"
     },
     {
-      "name": "assistant"
+      "name": "passenger"
     },
     {
       "name": "atmospherics"
diff --git a/Resources/Textures/Markers/jobs.rsi/assistant.png b/Resources/Textures/Markers/jobs.rsi/passenger.png
similarity index 100%
rename from Resources/Textures/Markers/jobs.rsi/assistant.png
rename to Resources/Textures/Markers/jobs.rsi/passenger.png
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idassistant.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idassistant.png
deleted file mode 100644
index 397b416a59..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idassistant.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png
new file mode 100644
index 0000000000..bb13533c0c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
index 383e0b8584..49ae5369fa 100644
--- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -35,7 +35,7 @@
       "name": "gold"
     },
     {
-      "name": "idassistant"
+      "name": "idpassenger"
     },
     {
       "name": "idatmospherictechnician"