diff --git a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java
index 3a1a3a57..d1be7827 100644
--- a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java
+++ b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java
@@ -18,13 +18,13 @@ public final class ModItemModelProvider extends ItemModelProvider {
 
     @Override
     protected void registerModels() {
-        simple(Items.WRENCH, "item/wrench");
+        simple(Items.WRENCH);
 
-        simple(Items.NETWORK_CABLE, "item/network_cable");
+        simple(Items.NETWORK_CABLE);
 
-        simple(Items.MEMORY_SMALL, "item/memory_small");
-        simple(Items.MEMORY_MEDIUM, "item/memory_medium");
-        simple(Items.MEMORY_LARGE, "item/memory_large");
+        simple(Items.MEMORY_SMALL);
+        simple(Items.MEMORY_MEDIUM);
+        simple(Items.MEMORY_LARGE);
         simple(Items.HARD_DRIVE_SMALL, "item/hard_drive_base")
                 .texture("layer1", "item/hard_drive_tint");
         simple(Items.HARD_DRIVE_MEDIUM, "item/hard_drive_base")
@@ -33,37 +33,32 @@ public final class ModItemModelProvider extends ItemModelProvider {
                 .texture("layer1", "item/hard_drive_tint");
         simple(Items.HARD_DRIVE_CUSTOM, "item/hard_drive_base")
                 .texture("layer1", "item/hard_drive_tint");
-        simple(Items.FLASH_MEMORY, "item/flash_memory");
+        simple(Items.FLASH_MEMORY);
         simple(Items.FLASH_MEMORY_CUSTOM, "item/flash_memory");
         simple(Items.FLOPPY, "item/floppy_base")
                 .texture("layer1", "item/floppy_tint");
 
-        simple(Items.REDSTONE_INTERFACE_CARD, "item/redstone_interface_card");
-        simple(Items.NETWORK_INTERFACE_CARD, "item/network_interface_card");
-        simple(Items.FILE_IMPORT_EXPORT_CARD, "item/file_import_export_card");
+        simple(Items.REDSTONE_INTERFACE_CARD);
+        simple(Items.NETWORK_INTERFACE_CARD);
+        simple(Items.FILE_IMPORT_EXPORT_CARD);
 
-        simple(Items.INVENTORY_OPERATIONS_MODULE, "item/inventory_operations_module");
-        simple(Items.BLOCK_OPERATIONS_MODULE, "item/block_operations_module");
+        simple(Items.INVENTORY_OPERATIONS_MODULE);
+        simple(Items.BLOCK_OPERATIONS_MODULE);
 
-        simple(Items.TRANSISTOR, "item/transistor");
-        simple(Items.CIRCUIT_BOARD, "item/circuit_board");
+        simple(Items.TRANSISTOR);
+        simple(Items.CIRCUIT_BOARD);
 
         withExistingParent(Entities.ROBOT.getId().getPath(), "template_shulker_box");
     }
 
-    private <T extends Item> ItemModelBuilder simple(final RegistryObject<T> item, final String texturePath) {
-        return simple(item, texturePath, "");
+    private <T extends Item> void simple(final RegistryObject<T> item) {
+        simple(item, "item/" + item.getId().getPath());
     }
 
-    private <T extends Item> ItemModelBuilder simple(final RegistryObject<T> item, final String texturePath, final String nameSuffix) {
-        return singleTexture(item.getId().getPath() + nameSuffix,
+    private <T extends Item> ItemModelBuilder simple(final RegistryObject<T> item, final String texturePath) {
+        return singleTexture(item.getId().getPath(),
                 new ResourceLocation("item/generated"),
                 "layer0",
                 new ResourceLocation(API.MOD_ID, texturePath));
     }
-
-    private <T extends Item> ItemModelBuilder withExistingParent(final RegistryObject<T> item) {
-        return withExistingParent(item.getId().getPath(),
-                new ResourceLocation("item/generated"));
-    }
 }