diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml
index f5efc056d19..c045b38dfbd 100644
--- a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml
@@ -103,7 +103,7 @@
 - type: cargoProduct
   id: ArmoryUnstableCore
   icon:
-    sprite: _DV/Objects/Misc/unstablereactorcore.rsi
+    sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
     state: icon
   product: CrateArmoryUnstableCore
   cost: 10000
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/specialized_weapon_parts.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/specialized_weapon_parts.yml
index c9aa7874400..3af42d1b74a 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/specialized_weapon_parts.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/specialized_weapon_parts.yml
@@ -5,7 +5,7 @@
   description: A compact, circular-shaped reactor, incapable of fully containing its energy. It's quite the fancy paperweight.
   components:
   - type: Sprite
-    sprite: _DV/Objects/Misc/unstablereactorcore.rsi
+    sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
     state: icon
   - type: RadiationSource
     intensity: 4
@@ -66,6 +66,9 @@
     slots:
       ItemCabinet:
         startingItem: UnstableReactorCore
+        whitelist:
+          tags:
+          - UnstableReactorCore
 
 - type: entity
   parent: BaseItem
@@ -74,7 +77,7 @@
   description: A heavy housing engineered to contain the power output of an unstable reactor core and focus it into a dense, radioactive beam. It's missing its power source.
   components:
   - type: Sprite
-    sprite: _DV/Objects/Misc/unstablereactorhousing.rsi
+    sprite: _DV/Objects/Misc/unstable_reactor_housing.rsi
     state: icon
   - type: Item
     size: Ginormous
@@ -84,7 +87,7 @@
     sprintModifier: 0.75
   - type: HeldSpeedModifier
   - type: Construction
-    graph: UnstableCoreRefractor
+    graph: UnstableCoreRefractorConstruct
     node: start
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/_DV/Recipes/Construction/Graphs/unstable_core_refractor.yml b/Resources/Prototypes/_DV/Recipes/Construction/Graphs/unstable_core_refractor.yml
index 71a29c1d108..b9e9c08d560 100644
--- a/Resources/Prototypes/_DV/Recipes/Construction/Graphs/unstable_core_refractor.yml
+++ b/Resources/Prototypes/_DV/Recipes/Construction/Graphs/unstable_core_refractor.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: UnstableCoreRefractor
+  id: UnstableCoreRefractorConstruct
   start: start
   graph:
   - node: start
@@ -10,8 +10,31 @@
       - tag: UnstableReactorCore
         name: construction-graph-tag-unstable-reactor-core
         icon:
-          sprite: _DV/Objects/Misc/unstablereactorcore.rsi
+          sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
           state: icon
-        doAfter: 3
+        doAfter: 6
+  - node: UnstableRefractor
+    entity: WeaponUnstableCoreRefractor
+
+- type: constructionGraph
+  id: UnstableCoreRefractor
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: UnstableRefractor
+      steps:
+      - tag: UnstableReactorHousing
+        name: construction-graph-tag-unstable-reactor-housing
+        icon:
+          sprite: _DV/Objects/Misc/unstable_reactor_housing.rsi
+          state: icon
+        doAfter: 1
+      - tag: UnstableReactorCore
+        name: construction-graph-tag-unstable-reactor-core
+        icon:
+          sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
+          state: icon
+        doAfter: 6
   - node: UnstableRefractor
     entity: WeaponUnstableCoreRefractor
diff --git a/Resources/Textures/_DV/Objects/Misc/unstablereactorcore.rsi/icon.png b/Resources/Textures/_DV/Objects/Misc/unstable_reactor_core.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_DV/Objects/Misc/unstablereactorcore.rsi/icon.png
rename to Resources/Textures/_DV/Objects/Misc/unstable_reactor_core.rsi/icon.png
diff --git a/Resources/Textures/_DV/Objects/Misc/unstablereactorcore.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Misc/unstable_reactor_core.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_DV/Objects/Misc/unstablereactorcore.rsi/inhand-left.png
rename to Resources/Textures/_DV/Objects/Misc/unstable_reactor_core.rsi/inhand-left.png
diff --git a/Resources/Textures/_DV/Objects/Misc/unstablereactorcore.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Misc/unstable_reactor_core.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_DV/Objects/Misc/unstablereactorcore.rsi/inhand-right.png
rename to Resources/Textures/_DV/Objects/Misc/unstable_reactor_core.rsi/inhand-right.png
diff --git a/Resources/Textures/_DV/Objects/Misc/unstablereactorcore.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/unstable_reactor_core.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_DV/Objects/Misc/unstablereactorcore.rsi/meta.json
rename to Resources/Textures/_DV/Objects/Misc/unstable_reactor_core.rsi/meta.json
diff --git a/Resources/Textures/_DV/Objects/Misc/unstablereactorhousing.rsi/icon.png b/Resources/Textures/_DV/Objects/Misc/unstable_reactor_housing.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_DV/Objects/Misc/unstablereactorhousing.rsi/icon.png
rename to Resources/Textures/_DV/Objects/Misc/unstable_reactor_housing.rsi/icon.png
diff --git a/Resources/Textures/_DV/Objects/Misc/unstablereactorhousing.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/unstable_reactor_housing.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_DV/Objects/Misc/unstablereactorhousing.rsi/meta.json
rename to Resources/Textures/_DV/Objects/Misc/unstable_reactor_housing.rsi/meta.json