diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml
index 356a0c26391..53304c0ee85 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml
@@ -2,6 +2,7 @@
 - type: entity
   parent: BaseStructureComputer
   id: BaseComputerTabletop
+  name: computer
   suffix: Tabletop
   abstract: true
   placement:
@@ -31,6 +32,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, BaseComputerShuttle ] # Shuttle
   id: BaseComputerTabletopShuttle
+  name: shuttle console
   abstract: true
   components:
   - type: Sprite
@@ -51,6 +53,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerShipyard ] # Shuttle
   id: ComputerTabletopShipyard
+  name: shipyard console
   components:
   - type: Sprite
     drawdepth: SmallObjects
@@ -77,6 +80,7 @@
 - type: entity
   parent: [ BaseMothershipComputer, ComputerTabletopShipyard ]
   id: BaseMothershipComputerTabletop
+  name: mothership console
   components:
   - type: Sprite
     drawdepth: SmallObjects
@@ -104,6 +108,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerAlert ]
   id: ComputerTabletopAlert
+  name: alerts computer
   components:
   - type: Sprite
     layers:
@@ -123,6 +128,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerEmergencyShuttle ]
   id: ComputerTabletopEmergencyShuttle
+  name: emergency shuttle console
   components:
   - type: Sprite
     drawdepth: SmallObjects
@@ -140,8 +146,9 @@
       state: generic_keys
 
 - type: entity
-  parent: [ BaseComputerTabletopShuttle, ComputerShuttle ] # Shuttle
+  parent: [ ComputerShuttle, BaseComputerTabletopShuttle ] # Shuttle
   id: ComputerTabletopShuttle
+  name: shuttle console
   components:
   - type: Sprite
     layers:
@@ -159,8 +166,9 @@
       state: generic_keys
 
 - type: entity
-  parent: [ BaseComputerTabletopShuttle, ComputerShuttleSyndie ] # Shuttle
+  parent: [ ComputerShuttleSyndie, BaseComputerTabletopShuttle ] # Shuttle
   id: ComputerTabletopShuttleSyndie
+  name: syndicate shuttle console
   components:
   - type: Sprite
     layers:
@@ -178,8 +186,9 @@
       state: syndie_key
 
 - type: entity
-  parent: [ BaseComputerTabletopShuttle, ComputerShuttleCargo ] # Shuttle
+  parent: [ ComputerShuttleCargo, BaseComputerTabletopShuttle ] # Shuttle
   id: ComputerTabletopShuttleCargo
+  name: cargo shuttle console
   components:
   - type: Sprite
     layers:
@@ -197,8 +206,9 @@
       state: generic_keys
 
 - type: entity
-  parent: [ BaseComputerTabletopShuttle, ComputerShuttleSalvage ] # Shuttle
+  parent: [ ComputerShuttleSalvage, BaseComputerTabletopShuttle ] # Shuttle
   id: ComputerTabletopShuttleSalvage
+  name: salvage shuttle console
   components:
   - type: Sprite
     layers:
@@ -218,6 +228,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerIFF ]
   id: ComputerTabletopIFF
+  name: IFF computer
   components:
   - type: Sprite
     layers:
@@ -235,8 +246,10 @@
       state: generic_keys
 
 - type: entity
-  parent: ComputerTabletopIFF
+  parent: [ ComputerTabletopIFF, ComputerIFFSyndicate ]
   id: ComputerTabletopIFFSyndicate
+  name: IFF computer
+  suffix: Syndicate, Tabletop
   components:
   - type: Sprite
     layers:
@@ -256,6 +269,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerPowerMonitoring ]
   id: ComputerTabletopPowerMonitoring
+  name: power monitoring computer
   components:
   - type: Sprite
     layers:
@@ -275,6 +289,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerMedicalRecords ]
   id: ComputerTabletopMedicalRecords
+  name: medical records computer
   components:
   - type: Sprite
     layers:
@@ -294,6 +309,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerCriminalRecords ]
   id: ComputerTabletopCriminalRecords
+  name: criminal records computer
   components:
   - type: Sprite
     layers:
@@ -313,6 +329,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerStationRecords ]
   id: ComputerTabletopStationRecords
+  name: station records computer
   components:
   - type: Sprite
     layers:
@@ -332,6 +349,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerCrewMonitoring ]
   id: ComputerTabletopCrewMonitoring
+  name: crew monitoring console
   components:
   - type: Sprite
     layers:
@@ -351,6 +369,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerResearchAndDevelopment ]
   id: ComputerTabletopResearchAndDevelopment
+  name: R&D computer
   components:
   - type: Sprite
     layers:
@@ -370,6 +389,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerAnalysisConsole ]
   id: ComputerTabletopAnalysisConsole
+  name: analysis console
   components:
   - type: Sprite
     layers:
@@ -389,6 +409,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerId ]
   id: ComputerTabletopId
+  name: ID card computer
   components:
   - type: Sprite
     layers:
@@ -408,6 +429,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, computerBodyScanner ]
   id: ComputerTabletopBodyScanner
+  name: body scanner computer
   components:
   - type: Sprite
     drawdepth: SmallObjects
@@ -427,6 +449,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerComms ]
   id: ComputerTabletopComms
+  name: communications computer
   components:
   - type: Sprite
     layers:
@@ -446,6 +469,7 @@
 - type: entity
   parent: ComputerTabletopComms
   id: SyndicateComputerTabletopComms
+  name: syndicate communications computer
   components:
   - type: Sprite
     layers:
@@ -465,6 +489,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerSolarControl ]
   id: ComputerTabletopSolarControl
+  name: solar control computer
   components:
   - type: Sprite
     layers:
@@ -484,6 +509,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerRadar ]
   id: ComputerTabletopRadar
+  name: mass scanner computer
   components:
   - type: Sprite
     layers:
@@ -503,6 +529,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerCargoShuttle ]
   id: ComputerTabletopCargoShuttle
+  name: cargo shuttle computer
   components:
   - type: Sprite
     layers:
@@ -522,6 +549,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerCargoOrders ]
   id: ComputerTabletopCargoOrders
+  name: cargo request computer
   components:
   - type: Sprite
     layers:
@@ -541,6 +569,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerCargoBounty ]
   id: ComputerTabletopCargoBounty
+  name: cargo bounty computer
   components:
   - type: Sprite
     layers:
@@ -560,6 +589,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerCloningConsole ]
   id: ComputerTabletopCloningConsole
+  name: cloning console computer
   components:
   - type: Sprite
     layers:
@@ -579,6 +609,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerSalvageExpedition ]
   id: ComputerTabletopSalvageExpedition
+  name: salvage expeditions computer
   components:
   - type: Sprite
     layers:
@@ -598,6 +629,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerSurveillanceCameraMonitor ]
   id: ComputerTabletopSurveillanceCameraMonitor
+  name: camera monitor
   components:
   - type: Sprite
     layers:
@@ -617,6 +649,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerSurveillanceWirelessCameraMonitor ]
   id: ComputerTabletopSurveillanceWirelessCameraMonitor
+  name: wireless camera monitor
   components:
   - type: Sprite
     layers:
@@ -636,6 +669,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerPalletConsole ]
   id: ComputerTabletopPalletConsole
+  name: cargo sale computer
   components:
   - type: Sprite
     layers:
@@ -655,6 +689,7 @@
 - type: entity
   parent: [ BaseComputerTabletop, ComputerMassMedia ]
   id: ComputerTabletopMassMedia
+  name: mass-media console
   components:
   - type: Sprite
     layers:
@@ -674,6 +709,7 @@
 - type: entity
   parent: [ BaseComputerTabletop,  ]
   id: ComputerTabletopSensorMonitoring
+  name: sensor monitoring computer
   # Putting this as "DO NOT MAP" until the performance issues are fixed.
   # And it's more fleshed out.
   suffix: Tabletop, TESTING, DO NOT MAP
@@ -698,6 +734,7 @@
 - type: entity
   parent: [ ComputerShipyardSecurity, ComputerTabletopShipyard ]
   id: ComputerTabletopShipyardSecurity
+  name: security shipyard console
   components:
   - type: Sprite
     layers:
@@ -717,6 +754,7 @@
 - type: entity
   parent: [ ComputerShipyardBlackMarket, ComputerTabletopShipyard ]
   id: ComputerTabletopShipyardBlackMarket
+  name: black market shipyard console
   components:
   - type: Sprite
     layers:
@@ -736,6 +774,7 @@
 - type: entity
   parent: [ ComputerShipyardExpedition, ComputerTabletopShipyard ]
   id: ComputerTabletopShipyardExpedition
+  name: expedition shipyard console
   components:
   - type: Sprite
     layers:
@@ -755,6 +794,7 @@
 - type: entity
   parent: [ ComputerShipyardScrap, ComputerTabletopShipyard ]
   id: ComputerTabletopShipyardScrap
+  name: scrapyard console
   components:
   - type: Sprite
     layers:
@@ -774,6 +814,7 @@
 - type: entity
   parent: [ ComputerPalletConsoleNFNormalMarket, BaseComputerTabletop ]
   id: ComputerTabletopPalletConsoleNFNormalMarket
+  name: cargo sale computer
   suffix: Normal, Tabletop
   components:
   - type: Sprite