diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 93a5d8a4ef..108a43d7b9 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -16,8 +16,9 @@
         prob: 0.7
       - id: ClothingHeadHatQMsoft
         prob: 0.8
-      - id: SupplyRequestComputerCircuitboard
-      - id: SupplyComputerCircuitboard
+      - id: CargoRequestComputerCircuitboard
+      - id: CargoShuttleComputerCircuitboard
+      - id: CargoShuttleConsoleCircuitboard
       - id: CigPackGreen
         prob: 0.50
       - id: DoorRemoteCargo
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 57e60c0b7b..ee98d2a693 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -58,9 +58,9 @@
 
 - type: entity
   parent: BaseComputerCircuitboard
-  id: SupplyComputerCircuitboard
-  name: supply ordering computer board
-  description: A computer printed circuit board for a supply ordering console.
+  id: CargoRequestComputerCircuitboard
+  name: cargo request computer board
+  description: A computer printed circuit board for a cargo request computer.
   components:
     - type: Sprite
       state: cpu_supply
@@ -71,14 +71,23 @@
 
 - type: entity
   parent: BaseComputerCircuitboard
-  id: SupplyRequestComputerCircuitboard
-  name: supply request computer board
-  description: A computer printed circuit board for a supply request console.
+  id: CargoShuttleComputerCircuitboard
+  name: cargo shuttle computer board
+  description: A computer printed circuit board for a cargo shuttle computer.
   components:
     - type: Sprite
       state: cpu_supply
     - type: ComputerBoard
-      prototype: ComputerCargoOrders
+      prototype: ComputerCargoShuttle
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: CargoShuttleConsoleCircuitboard
+  name: supply shuttle console board
+  description: A computer printed circuit board for a cargo shuttle console.
+  components:
+    - type: ComputerBoard
+      prototype: ComputerShuttleCargo
 
 - type: entity
   parent: BaseComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 759990cdc6..376d0e200b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -115,6 +115,8 @@
       radius: 1.5
       energy: 1.6
       color: "#c94242"
+    - type: Computer
+      board: CargoShuttleConsoleCircuitboard
 
 - type: entity
   parent: BaseComputer
@@ -548,7 +550,7 @@
     - key: enum.CargoConsoleUiKey.Shuttle
       type: CargoShuttleConsoleBoundUserInterface
   - type: Computer
-    board: SupplyComputerCircuitboard
+    board: CargoShuttleComputerCircuitboard
   - type: PointLight
     radius: 1.5
     energy: 1.6
@@ -576,7 +578,7 @@
     - key: enum.CargoConsoleUiKey.Orders
       type: CargoOrderConsoleBoundUserInterface
   - type: Computer
-    board: SupplyComputerCircuitboard
+    board: CargoRequestComputerCircuitboard
   - type: PointLight
     radius: 1.5
     energy: 1.6
diff --git a/Resources/Prototypes/Objectives/traitorObjectives.yml b/Resources/Prototypes/Objectives/traitorObjectives.yml
index a31704e990..4e06a3fff8 100644
--- a/Resources/Prototypes/Objectives/traitorObjectives.yml
+++ b/Resources/Prototypes/Objectives/traitorObjectives.yml
@@ -170,7 +170,7 @@
       roleId: Quartermaster
   conditions:
     - !type:StealCondition
-      prototype: SupplyComputerCircuitboard
+      prototype: CargoRequestComputerCircuitboard
       owner: job-name-qm
 
 - type: objective