diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt
index 730923d29..f0c14a863 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt
@@ -7,6 +7,7 @@ import ru.dbotthepony.mc.otm.block.matter.PatternStorageBlock
 import ru.dbotthepony.mc.otm.block.storage.DriveViewerBlock
 import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom
 import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateNorth
+import ru.dbotthepony.mc.otm.core.registryName
 import ru.dbotthepony.mc.otm.datagen.modLocation
 import ru.dbotthepony.mc.otm.registry.MBlocks
 
@@ -23,7 +24,7 @@ fun addComplexBlockStates(provider: MatteryBlockStateProvider) {
 
 				for (workState in WorkerState.SEMI_WORKER_STATE.possibleValues) {
 					part()
-						.modelFile(provider.models().getExistingFile(modLocation("block/drive_viewer_${workState.name.lowercase()}")))
+						.modelFile(provider.models().getExistingFile(modLocation("block/${block.registryName!!.path}_${workState.name.lowercase()}")))
 						.rotationY(facing.front.yRotationBlockstateNorth())
 						.addModel()
 						.condition(WorkerState.SEMI_WORKER_STATE, workState)
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
index cd6b384e7..f397d23fa 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
@@ -171,6 +171,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
 	provider.coloredWithBaseBlock(MItems.MATTER_BOTTLER, "matter_bottler", "_idle")
 	provider.coloredWithBaseBlock(MItems.MATTER_SCANNER, "matter_scanner", "_idle")
 	provider.coloredWithBaseBlock(MItems.MATTER_REPLICATOR, "matter_replicator", "_idle")
+	provider.coloredWithBaseBlock(MItems.DRIVE_VIEWER, "drive_viewer", "_idle")
 	provider.block(MItems.MATTER_CABLE, "matter_cable_core")
 	provider.coloredWithBaseBlock(MItems.MATTER_DECOMPOSER, "matter_decomposer", "_idle")
 	provider.block(MItems.ENERGY_SERVO, "energy_servo")
diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/drive_viewer.json b/src/main/resources/assets/overdrive_that_matters/models/item/drive_viewer.json
deleted file mode 100644
index 94fab8fd3..000000000
--- a/src/main/resources/assets/overdrive_that_matters/models/item/drive_viewer.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"parent": "overdrive_that_matters:block/drive_viewer_idle"
-}
\ No newline at end of file