diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang
index b835f192..b5d26810 100644
--- a/resources/assets/tinker/lang/en_US.lang
+++ b/resources/assets/tinker/lang/en_US.lang
@@ -500,32 +500,32 @@ parttype.steel=Steel
 parttype.blueslime=Slime
 parttype.thaumium=Thaumium
 
-toolpart.ToolRod=Tool Rod
-toolpart.PickHead=Pickaxe Head
-toolpart.ShovelHead=Shovel Head
-toolpart.AxeHead=Axe Head
-toolpart.Binding=Binding
-toolpart.ToughBind=Tough Binding
-toolpart.ToughRod=Tough Rod
-toolpart.LargePlate=Large Plate
-toolpart.SwordBlade=Sword Blade
-toolpart.LargeGuard=Wide Guard
-toolpart.MediumGuard=Hand Guard
-toolpart.Crossbar=Crossbar
-toolpart.KnifeBlade=Knife Blade
-toolpart.FullGuard=Full Guard
-toolpart.FrypanHead=Pan
-toolpart.SignHead=Sign Head
-toolpart.ChiselHead=Chisel Head
-toolpart.ScytheHead=Scythe Head
-toolpart.LumberHead=Broad Axe Head
-toolpart.ExcavatorHead=Excavator Head
-toolpart.ToolShard=Shard
-toolpart.LargeSwordBlade=Large Sword Blade
-toolpart.HammerHead=Hammer Head
-toolpart.Bowstring=Bowstring
-toolpart.ArrowHead=Arrowhead
-toolpart.Fletching=Fletching
+toolpart.ToolRod=%%material Tool Rod
+toolpart.PickHead=%%material Pickaxe Head
+toolpart.ShovelHead=%%material Shovel Head
+toolpart.AxeHead=%%material Axe Head
+toolpart.Binding=%%material Binding
+toolpart.ToughBind=%%material Tough Binding
+toolpart.ToughRod=%%material Tough Rod
+toolpart.LargePlate=%%material Large Plate
+toolpart.SwordBlade=%%material Sword Blade
+toolpart.LargeGuard=%%material Wide Guard
+toolpart.MediumGuard=%%material Hand Guard
+toolpart.Crossbar=%%material Crossbar
+toolpart.KnifeBlade=%%material Knife Blade
+toolpart.FullGuard=%%material Full Guard
+toolpart.FrypanHead=%%material Pan
+toolpart.SignHead=%%material Sign Head
+toolpart.ChiselHead=%%material Chisel Head
+toolpart.ScytheHead=%%material Scythe Head
+toolpart.LumberHead=%%material Broad Axe Head
+toolpart.ExcavatorHead=%%material Excavator Head
+toolpart.ToolShard=%%material Shard
+toolpart.LargeSwordBlade=%%material Large Sword Blade
+toolpart.HammerHead=%%material Hammer Head
+toolpart.Bowstring=%%material Bowstring
+toolpart.ArrowHead=%%material Arrowhead
+toolpart.Fletching=%%material Fletching
 
 fluid.iron.molten=Molten Iron
 fluid.gold.molten=Molten Gold
diff --git a/src/tconstruct/items/ToolPart.java b/src/tconstruct/items/ToolPart.java
index 81798fe1..8a9b84eb 100644
--- a/src/tconstruct/items/ToolPart.java
+++ b/src/tconstruct/items/ToolPart.java
@@ -24,10 +24,17 @@ public class ToolPart extends CraftingItem implements IToolPart
     @Override
     public String getItemDisplayName (ItemStack par1ItemStack)
     {
-        StringBuilder builder = new StringBuilder();
+        String material = StatCollector.translateToLocal("parttype." + toolTextureNames[par1ItemStack.getItemDamage()]);
+        String name = StatCollector.translateToLocal("toolpart." + partName);
+        name = name.replaceAll("%%material", material);
+
+        return name;
+    	
+        /*StringBuilder builder = new StringBuilder();
         builder.append(StatCollector.translateToLocal("parttype." + toolTextureNames[par1ItemStack.getItemDamage()])).append(" ").append(StatCollector.translateToLocal("toolpart." + partName));
         return builder.toString();
-        /*String s = ("" + StatCollector.translateToLocal("toolpart."+partName)).trim();
+        --
+        String s = ("" + StatCollector.translateToLocal("toolpart."+partName)).trim();
         String s1 = toolMaterialNames[par1ItemStack.getItemDamage()];
 
         if (s1 != null)