diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/interrogator/interrogator.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/interrogator/interrogator.ftl
index e2abfc371c1..6c52f06f713 100644
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/interrogator/interrogator.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/interrogator/interrogator.ftl
@@ -1,4 +1,4 @@
 ent-Interrogator = Экстрактор имплантов
     .desc = Устройство предназначеное для извлечения имплантов из гуманоидов.
-ent-ImplantScaner = Микроволновой экстрактор имплантов
+ent-ImplantExtractor = Микроволновой экстрактор имплантов
     .desc =  Устройство предназначеное для извлечения имплантов из гуманоидов, разработанное для извлечени имплантов в условиях низкоквалифицированных врачей. 
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl
index b7805286da2..88c8d5b8b00 100644
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl
@@ -2,5 +2,7 @@ ent-PrinterDocMachineCircuitboard = принтер документов (маш
     .desc = Машинная плата принтера документов.
 ent-PacificatorCircuitboard = генератор пацифизма (машинная плата)
     .desc = { ent-BaseMachineCircuitboard.desc }
-ent-ImplantScanMachineCircuitboard = Микроволновой Сканер Тела (машинная плата)
-    .desc = Машинная плата Микроволнового Сканера Тела.
+ent-ImplantExtractorMachineCircuitboard = Микроволновой экстрактора имплантов (машинная плата)
+    .desc = Машинная плата Микроволнового экстрактора имплантов.
+ent-InterrogatorMachineCircuitboard = Микроволновой экстрактор имплантов "Interrogator" (машинная плата)
+    .desc = { ent-ImplantExtractorMachineCircuitboard.desc }
diff --git a/Resources/Prototypes/_Sunrise/Research/medical.yml b/Resources/Prototypes/_Sunrise/Research/medical.yml
index bcc7ddd0938..925e4889e22 100644
--- a/Resources/Prototypes/_Sunrise/Research/medical.yml
+++ b/Resources/Prototypes/_Sunrise/Research/medical.yml
@@ -111,7 +111,7 @@
     - HemostatAdvanced
 
 - type: technology
-  id: ImplantScan
+  id: ImplantExtract
   name: research-technology-inspector
   icon:
     sprite: _Sunrise/AssaultOperatives/interrogator.rsi
@@ -120,7 +120,7 @@
   tier: 3
   cost: 12500
   recipeUnlocks:
-    - ImplantScanMachineCircuitboard
+    - ImplantExtractorMachineCircuitboard
 
 - type: technology
   id: SyringeGunBluespace
diff --git a/Resources/Prototypes/_Sunrise/Structures/interrogator.yml b/Resources/Prototypes/_Sunrise/Structures/interrogator.yml
index 12d4e01e0a4..e87aae2a259 100644
--- a/Resources/Prototypes/_Sunrise/Structures/interrogator.yml
+++ b/Resources/Prototypes/_Sunrise/Structures/interrogator.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: Interrogator
+  id: ImplantExtractor
   parent: BaseMachinePowered
-  name: interrogator
-  description: apchy
+  name: microwave implant extractor
+  description: A high-tech device specifically designed for implant extraction in conditions with low-skilled medical personnel.
   components:
   - type: Interrogator
   - type: Sprite
@@ -48,7 +48,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Machine
-    board: InterrogatorMachineCircuitboard
+    board: ImplantExtractorMachineCircuitboard
   - type: WiresPanel
   - type: ApcPowerReceiver
     powerLoad: 200
@@ -60,72 +60,20 @@
       machine_parts: !type:Container
 
 - type: entity
-  id: ImplantScaner
-  parent: Interrogator
-  name: microwave implant Scanner
-  description: A high-tech device specifically designed for implant extraction in conditions with low-skilled medical personnel.
+  id: Interrogator
+  parent: ImplantExtractor
+  name: interrogator
+  description: apchy
   components:
   - type: Interrogator
-  - type: Sprite
-    sprite: _Sunrise/AssaultOperatives/interrogator.rsi
-    snapCardinals: true
-    layers:
-    - state: base
-      map: [ "enum.InterrogatorVisualLayers.Base" ]
-    - state: extraction-on
-      map: [ "enum.InterrogatorVisualLayers.Extract" ]
-      visible: false
-  - type: PointLight
-    color: "#3a807f"
-    radius: 2
-    energy: 10
-    enabled: false
-  - type: Physics
-    bodyType: Static
-  - type: Construction
-    graph: Machine
-    node: machine
-    containers:
-    - machine_board
-    - machine_parts
-    - body_container
-  - type: EmptyOnMachineDeconstruct
-    containers:
-    - body_container
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StrongMetallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalGlassBreak
-      - !type:ChangeConstructionNodeBehavior
-        node: machineFrame
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
   - type: Machine
-    board: ImplantScanMachineCircuitboard
-  - type: WiresPanel
-  - type: ApcPowerReceiver
-    powerLoad: 200
-  - type: Appearance
-  - type: ContainerContainer
-    containers:
-      body_container: !type:ContainerSlot
-      machine_board: !type:Container
-      machine_parts: !type:Container
-
+    board: InterrogatorMachineCircuitboard
 
 - type: entity
-  id: InterrogatorMachineCircuitboard
+  id: ImplantExtractorMachineCircuitboard
   parent: BaseMachineCircuitboard
-  name: interrogator machine board
-  description: A machine printed circuit board for a interrogator.
+  name: implant scan machine board
+  description: A machine printed circuit board for a implant extractor.
   components:
   - type: Sprite
     state: medical
@@ -138,17 +86,10 @@
       Cable: 1
 
 - type: entity
-  id: ImplantScanMachineCircuitboard
-  parent: InterrogatorMachineCircuitboard
-  name: implant scan machine board
-  description: A machine printed circuit board for a implant scan.
+  id: InterrogatorMachineCircuitboard
+  parent: ImplantExtractorMachineCircuitboard
+  name: interrogator machine board
+  description: A machine printed circuit board for a interrogator.
   components:
   - type: Sprite
     state: medical
-  - type: MachineBoard
-    prototype: Interrogator
-    stackRequirements:
-      MatterBin: 2
-      Manipulator: 2
-      Glass: 1
-      Cable: 1