diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
index 331934b22e..8002a8d936 100644
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -15,7 +15,7 @@ namespace Content.Shared.GameTicking
         // But this is easier, and at least it isn't hardcoded.
         //TODO: Move these, they really belong in StationJobsSystem or a cvar.
         [ValidatePrototypeId<JobPrototype>]
-        public const string FallbackOverflowJob = "CP14JobAdventurer";
+        public const string FallbackOverflowJob = "CP14Adventurer";
 
         public const string FallbackOverflowJobName = "cp14-job-name-adventurer";
 
diff --git a/Resources/Prototypes/Maps/arenas.yml b/Resources/Prototypes/Maps/arenas.yml
index 1a03589a1d..faa0f5dbba 100644
--- a/Resources/Prototypes/Maps/arenas.yml
+++ b/Resources/Prototypes/Maps/arenas.yml
@@ -11,6 +11,6 @@
           mapNameTemplate: "Meteor Arena"
         - type: StationJobs
           overflowJobs:
-            - CP14JobAdventurer #CrystallPunk Dev replacement
+            - CP14Adventurer #CrystallPunk Dev replacement
           availableJobs:
-            CP14JobAdventurer: [ -1, -1 ] #CrystallPunk Dev replacement
+            CP14Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement
diff --git a/Resources/Prototypes/Maps/debug.yml b/Resources/Prototypes/Maps/debug.yml
index 14e8cf04d2..41cfb24628 100644
--- a/Resources/Prototypes/Maps/debug.yml
+++ b/Resources/Prototypes/Maps/debug.yml
@@ -11,9 +11,9 @@
           mapNameTemplate: "Empty"
         - type: StationJobs
           overflowJobs:
-            - CP14JobAdventurer #CrystallPunk Dev replacement
+            - CP14Adventurer #CrystallPunk Dev replacement
           availableJobs:
-            CP14JobAdventurer: [ -1, -1 ] #CrystallPunk Dev replacement
+            CP14Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement
 
 - type: gameMap
   id: Dev
@@ -33,9 +33,9 @@
           mapNameTemplate: "Dev"
         - type: StationJobs
           overflowJobs:
-          - CP14JobAdventurer #CrystallPunk Dev replacement
+          - CP14Adventurer #CrystallPunk Dev replacement
           availableJobs:
-            CP14JobAdventurer: [ -1, -1 ] #CrystallPunk Dev replacement
+            CP14Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement
         - type: CP14StationDungeonMap
           biome: CP14CavesGeneric
 
diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml
index e15bd661e6..a42d794fee 100644
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml
@@ -6,7 +6,7 @@
   - Spawner
   components:
   - type: SpawnPoint
-    job_id: CP14JobAdventurer
+    job_id: JobAdventurerCP14
   - type: Sprite
     layers:
       - state: green
diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
index 318c812e6c..c2914e4e9c 100644
--- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
@@ -1,5 +1,5 @@
 - type: roleLoadout
-  id: CP14JobAdventurer
+  id: JobCP14Adventurer
   groups:
   - CP14TestHead
   - CP14TestEyes
@@ -11,7 +11,7 @@
   - CP14TestShoes
 
 - type: roleLoadout
-  id: CP14JobAlchemist
+  id: JobCP14Alchemist
   groups:
   - CP14TestHead
   - CP14TestEyes
diff --git a/Resources/Prototypes/_CP14/Maps/arenas.yml b/Resources/Prototypes/_CP14/Maps/arenas.yml
index c38f3036b1..76b8e39434 100644
--- a/Resources/Prototypes/_CP14/Maps/arenas.yml
+++ b/Resources/Prototypes/_CP14/Maps/arenas.yml
@@ -11,9 +11,9 @@
           mapNameTemplate: "Cave Arena"
         - type: StationJobs
           overflowJobs:
-            - CP14JobAdventurer
+            - CP14Adventurer
           availableJobs:
-            CP14JobAdventurer: [ -1, -1 ]
+            CP14Adventurer: [ -1, -1 ]
 
 - type: gameMap
   id: AlchemyTest
@@ -35,6 +35,6 @@
           mapNameTemplate: "Alchemy test"
         - type: StationJobs
           overflowJobs:
-            - CP14JobAdventurer
+            - CP14Adventurer
           availableJobs:
-            CP14JobAdventurer: [ -1, -1 ]
+            CP14Adventurer: [ -1, -1 ]
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml
index 171565413d..8e3c4cf59a 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml
@@ -1,5 +1,5 @@
 - type: job
-  id: CP14JobAdventurer
+  id: CP14Adventurer
   name: cp14-job-name-adventurer
   description: cp14-job-desc-adventurer
   playTimeTracker: CP14JobAdventurer
@@ -7,16 +7,16 @@
   icon: "CP14JobIconAdventurer"
   supervisors: cp14-job-supervisors-command
 
-- type: startingGear
-  id: CP14AdventurerGear
-  equipment:
-    belt1: CP14WalletFilledTest
-
 - type: job
-  id: CP14JobAlchemist
+  id: CP14Alchemist
   name: cp14-job-name-alchemist
   description: cp14-job-desc-alchemist
   playTimeTracker: CP14JobAlchemist
   startingGear: CP14AdventurerGear #TODO
   icon: "CP14JobIconAlchemist"
   supervisors: cp14-job-supervisors-command
+
+- type: startingGear
+  id: CP14AdventurerGear
+  equipment:
+    belt1: CP14WalletFilledTest
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml
index a8076725d8..28aa2a5fe4 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml
@@ -3,8 +3,8 @@
   description: department-CP14Free-desc
   color: "#429976"
   roles:
-  - CP14JobAdventurer
-  - CP14JobAlchemist
+  - CP14Adventurer
+  - CP14Alchemist
 
 - type: department
   id: CP14Command