diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang
index 68aef59c1..9fa64316e 100644
--- a/src/main/resources/assets/opencomputers/lang/en_US.lang
+++ b/src/main/resources/assets/opencomputers/lang/en_US.lang
@@ -67,7 +67,7 @@ item.oc.DataCard1.name=Data Card (Tier 2)
 item.oc.DataCard2.name=Data Card (Tier 3)
 item.oc.DebugCard.name=Debug Card
 item.oc.Debugger.name=Network Debugger
-item.oc.DiamondNugget.name=Diamond Nugget
+item.oc.DiamondChip.name=Diamond Chip
 item.oc.Disk.name=Disk Platter
 item.oc.DiskDriveMountable.name=Disk Drive
 item.oc.Drone.name=Drone
@@ -278,7 +278,7 @@ oc:tooltip.DataCard1=Provides a couple of advanced algorithms such as hashing, A
 oc:tooltip.DataCard2=Provides a couple of advanced algorithms such as hashing, AES encryption, elliptic curve cryptography and deflate/inflate.
 oc:tooltip.DebugCard=Creative mode item, allows manipulating the world to make testing easier. Use at your own peril.
 oc:tooltip.Debugger=Can be used to output debug information on OC's internal network grid. Only use if so instructed by a dev.
-oc:tooltip.DiamondNugget=A small piece of a once radiant diamond. The pieces fit together flawlessly.
+oc:tooltip.DiamondChip=A small piece of a once radiant diamond. It will never be the same again.
 oc:tooltip.Disassembler=Separates items into their original components. §lWarning§7: returned items have a %s%% chance of breaking in the process!
 oc:tooltip.Disk=Primitive medium that can be used to build persistent storage devices.
 oc:tooltip.DiskDrive.CC=ComputerCraft floppies are §asupported§7.
diff --git a/src/main/resources/assets/opencomputers/recipes/default.recipes b/src/main/resources/assets/opencomputers/recipes/default.recipes
index a009ef9d6..d006c6b61 100644
--- a/src/main/resources/assets/opencomputers/recipes/default.recipes
+++ b/src/main/resources/assets/opencomputers/recipes/default.recipes
@@ -169,7 +169,7 @@ dataCard2 {
           ["", "oc:materialCard", ""]]
 }
 dataCard3 {
-  input: [[nuggetDiamond, "oc:cpu2", "oc:ram5"]
+  input: [[chipDiamond, "oc:cpu2", "oc:ram5"]
           ["", "oc:materialCard", ""]]
 }
 graphicsCard1 {
@@ -237,7 +237,7 @@ batteryUpgrade2 {
 }
 batteryUpgrade3 {
   input: [[nuggetIron, "oc:capacitor", nuggetIron]
-          ["oc:capacitor", nuggetDiamond, "oc:capacitor"]
+          ["oc:capacitor", chipDiamond, "oc:capacitor"]
           [nuggetIron, "oc:capacitor", nuggetIron]]
 }
 chunkloaderUpgrade {
@@ -380,20 +380,17 @@ nuggetIron {
   output: 9
 }
 ingotIron {
-  input: [[nuggetIron, nuggetIron, nuggetIron],
-          [nuggetIron, nuggetIron, nuggetIron],
-          [nuggetIron, nuggetIron, nuggetIron]]
+  type: shapeless
+  input: [nuggetIron, nuggetIron, nuggetIron,
+          nuggetIron, nuggetIron, nuggetIron,
+          nuggetIron, nuggetIron, nuggetIron]
 }
-nuggetDiamond {
+chipDiamond {
   type: shapeless
   input: gemDiamond
-  output: 9
-}
-gemDiamond {
-  input: [[nuggetDiamond, nuggetDiamond, nuggetDiamond],
-          [nuggetDiamond, nuggetDiamond, nuggetDiamond],
-          [nuggetDiamond, nuggetDiamond, nuggetDiamond]]
+  output: 6
 }
+gemDiamond = false
 
 cuttingWire = false
 acid {
@@ -465,9 +462,9 @@ chip2 {
   output: 4
 }
 chip3 {
-  input: [[nuggetDiamond, nuggetDiamond, nuggetDiamond]
+  input: [[chipDiamond, chipDiamond, chipDiamond]
           [redstone, "oc:materialTransistor", redstone]
-          [nuggetDiamond, nuggetDiamond, nuggetDiamond]]
+          [chipDiamond, chipDiamond, chipDiamond]]
   output: 2
 }
 alu {
@@ -481,9 +478,9 @@ apu1 {
           [nuggetGold, "oc:circuitChip1", nuggetGold]]
 }
 apu2 {
-  input: [[nuggetDiamond, "oc:circuitChip2", nuggetDiamond]
+  input: [[chipDiamond, "oc:circuitChip2", chipDiamond]
           ["oc:cpu3", "oc:componentBus2", "oc:graphicsCard2"]
-          [nuggetDiamond, "oc:circuitChip2", nuggetDiamond]]
+          [chipDiamond, "oc:circuitChip2", chipDiamond]]
 }
 componentBus1 {
   input: [[nuggetIron, redstone, nuggetIron]
@@ -496,9 +493,9 @@ componentBus2 {
           [nuggetGold, "oc:materialCircuitBoardPrinted", nuggetGold]]
 }
 componentBus3 {
-  input: [[nuggetDiamond, redstone, nuggetDiamond]
+  input: [[chipDiamond, redstone, chipDiamond]
           ["oc:circuitChip3", "oc:materialCU", ""]
-          [nuggetDiamond, "oc:materialCircuitBoardPrinted", nuggetDiamond]]
+          [chipDiamond, "oc:materialCircuitBoardPrinted", chipDiamond]]
 }
 cpu1 {
   input: [[nuggetIron, redstone, nuggetIron]
@@ -511,9 +508,9 @@ cpu2 {
           [nuggetGold, "oc:materialALU", nuggetGold]]
 }
 cpu3 {
-  input: [[nuggetDiamond, redstone, nuggetDiamond]
+  input: [[chipDiamond, redstone, chipDiamond]
           ["oc:circuitChip3", "oc:materialCU", "oc:circuitChip3"]
-          [nuggetDiamond, "oc:materialALU", nuggetDiamond]]
+          [chipDiamond, "oc:materialALU", chipDiamond]]
 }
 cu {
   input: [[nuggetGold, redstone, nuggetGold]
@@ -601,7 +598,7 @@ geolyzer {
 }
 hologram1 {
   input: [["oc:circuitChip2", paneGlass, "oc:circuitChip2"]
-          ["oc:materialCircuitBoardPrinted", nuggetDiamond, "oc:materialCircuitBoardPrinted"]
+          ["oc:materialCircuitBoardPrinted", chipDiamond, "oc:materialCircuitBoardPrinted"]
           [obsidian, yellowDust, obsidian]]
 }
 hologram2 {
diff --git a/src/main/resources/assets/opencomputers/recipes/hardmode.recipes b/src/main/resources/assets/opencomputers/recipes/hardmode.recipes
index eee57616c..a7485dcb1 100644
--- a/src/main/resources/assets/opencomputers/recipes/hardmode.recipes
+++ b/src/main/resources/assets/opencomputers/recipes/hardmode.recipes
@@ -187,11 +187,6 @@ tradingUpgrade {
           [dropper, "oc:materialCircuitBoardPrinted", craftingPiston]]
 }
 
-nuggetIron {
-  type: shapeless
-  input: ingotIron
-  output: 9
-}
 cuttingWire {
   input: [[stickWood, nuggetIron, stickWood]]
 }
diff --git a/src/main/resources/assets/opencomputers/textures/items/DiamondChip.png b/src/main/resources/assets/opencomputers/textures/items/DiamondChip.png
new file mode 100644
index 000000000..addf41793
Binary files /dev/null and b/src/main/resources/assets/opencomputers/textures/items/DiamondChip.png differ
diff --git a/src/main/resources/assets/opencomputers/textures/items/DiamondNugget.png b/src/main/resources/assets/opencomputers/textures/items/DiamondNugget.png
deleted file mode 100644
index 447b8190a..000000000
Binary files a/src/main/resources/assets/opencomputers/textures/items/DiamondNugget.png and /dev/null differ
diff --git a/src/main/scala/li/cil/oc/Constants.scala b/src/main/scala/li/cil/oc/Constants.scala
index 929f8ffa6..d43386194 100644
--- a/src/main/scala/li/cil/oc/Constants.scala
+++ b/src/main/scala/li/cil/oc/Constants.scala
@@ -87,7 +87,7 @@ object Constants {
     final val DataCardTier3 = "dataCard3"
     final val DebugCard = "debugCard"
     final val Debugger = "debugger"
-    final val DiamondNugget = "nuggetDiamond"
+    final val DiamondChip = "chipDiamond"
     final val Disk = "disk"
     final val DiskDriveMountable = "diskDriveMountable"
     final val Drone = "drone"
diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala
index 620adef7f..4bc1e260a 100644
--- a/src/main/scala/li/cil/oc/common/Proxy.scala
+++ b/src/main/scala/li/cil/oc/common/Proxy.scala
@@ -47,7 +47,7 @@ class Proxy {
     OreDictionary.registerOre("chest", net.minecraft.init.Blocks.trapped_chest)
 
     tryRegisterNugget[item.IronNugget](Constants.ItemName.IronNugget, "nuggetIron", net.minecraft.init.Items.iron_ingot, "ingotIron")
-    tryRegisterNugget[item.DiamondNugget](Constants.ItemName.DiamondNugget, "nuggetDiamond", net.minecraft.init.Items.diamond, "gemDiamond")
+    tryRegisterNugget[item.DiamondChip](Constants.ItemName.DiamondChip, "chipDiamond", net.minecraft.init.Items.diamond, "gemDiamond")
 
     // Avoid issues with Extra Utilities registering colored obsidian as `obsidian`
     // oredict entry, but not normal obsidian, breaking some recipes.
diff --git a/src/main/scala/li/cil/oc/common/init/Items.scala b/src/main/scala/li/cil/oc/common/init/Items.scala
index 8fc33bd8b..52c038f1b 100644
--- a/src/main/scala/li/cil/oc/common/init/Items.scala
+++ b/src/main/scala/li/cil/oc/common/init/Items.scala
@@ -533,7 +533,7 @@ object Items extends ItemAPI {
     Recipes.addSubItem(new item.TerminalServer(multi), Constants.ItemName.TerminalServer, "oc:terminalServer")
     Recipes.addSubItem(new item.DiskDriveMountable(multi), Constants.ItemName.DiskDriveMountable, "oc:diskDriveMountable")
     Recipes.addSubItem(new item.UpgradeTrading(multi), Constants.ItemName.TradingUpgrade, "oc:tradingUpgrade")
-    registerItem(new item.DiamondNugget(multi), Constants.ItemName.DiamondNugget)
+    registerItem(new item.DiamondChip(multi), Constants.ItemName.DiamondChip)
 
     // Register aliases.
     for ((k, v) <- aliases) {
diff --git a/src/main/scala/li/cil/oc/common/item/DiamondChip.scala b/src/main/scala/li/cil/oc/common/item/DiamondChip.scala
new file mode 100644
index 000000000..813d7cae4
--- /dev/null
+++ b/src/main/scala/li/cil/oc/common/item/DiamondChip.scala
@@ -0,0 +1,3 @@
+package li.cil.oc.common.item
+
+class DiamondChip(val parent: Delegator) extends traits.Delegate
diff --git a/src/main/scala/li/cil/oc/common/item/DiamondNugget.scala b/src/main/scala/li/cil/oc/common/item/DiamondNugget.scala
deleted file mode 100644
index 821a05834..000000000
--- a/src/main/scala/li/cil/oc/common/item/DiamondNugget.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-package li.cil.oc.common.item
-
-class DiamondNugget(val parent: Delegator) extends traits.Delegate
diff --git a/src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala b/src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
index 966fe9f13..d415189a9 100644
--- a/src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
+++ b/src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
@@ -351,7 +351,9 @@ object ModOpenComputers extends ModProxy {
   object DefinitionPathProvider extends PathProvider {
     private final val Blacklist = Set(
       Constants.ItemName.Debugger,
-      Constants.BlockName.Endstone
+      Constants.ItemName.DiamondChip,
+      Constants.BlockName.Endstone,
+      Constants.ItemName.IronNugget
     )
 
     override def pathFor(stack: ItemStack): String = Option(api.Items.get(stack)) match {