diff --git a/src/main/java/resonantinduction/core/resource/item/ItemDust.java b/src/main/java/resonantinduction/core/resource/item/ItemDust.java
index 3f742aba..3a2c4faa 100644
--- a/src/main/java/resonantinduction/core/resource/item/ItemDust.java
+++ b/src/main/java/resonantinduction/core/resource/item/ItemDust.java
@@ -38,7 +38,7 @@ public class ItemDust extends ItemBase
 		String dustName = getDustFromStack(is);
 		ItemStack type = OreDictionary.getOres("ingot" + dustName.substring(0, 1).toUpperCase() + dustName.substring(1)).get(0);
 
-		String name = type.getDisplayName().replace(LanguageUtility.getLocal("misc.resonantinduction.ingot"), "");
+		String name = type.getDisplayName().replace(LanguageUtility.getLocal("misc.resonantinduction.ingot"), "").replaceAll("^ ", "").replaceAll(" $", "");
 		return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", name).replace("  ", " ");
 	}
 
diff --git a/src/main/resources/assets/resonantinduction/languages/de_DE.properties b/src/main/resources/assets/resonantinduction/languages/de_DE.properties
index f575c4c4..bb012403 100644
--- a/src/main/resources/assets/resonantinduction/languages/de_DE.properties
+++ b/src/main/resources/assets/resonantinduction/languages/de_DE.properties
@@ -10,18 +10,26 @@ meta.resonantinduction.credits=Dank an Archadia f\u00FCr die tollen assets!
 fluid.mixture=Mixtur
 
 ### Archaic Module
+## Machines
+tile.resonantinduction\:imprinter.name=Pr\u00E4ger
+tile.resonantinduction\:engineeringTable.name=Konstruktionstisch
+
 ## Transport
 tile.resonantinduction\:crate.name=Kiste
+tile.resonantinduction\:fluidPipe.0.name=Holztrog
+tile.resonantinduction\:fluidPipe.1.name=Steintrog
 
 ### Mechanical Module
 ## Transport
 tile.resonantinduction\:pump.name=Pumpe
 tile.resonantinduction\:grate.name=Gitter
 tile.resonantinduction\:conveyorBelt.name=Flie\u00DFband
+tile.resonantinduction\:tank.0.name=Tank
+tile.resonantinduction\:detector.name=Detektor
+tile.resonantinduction\:manipulator.name=Manipulator
+tile.resonantinduction\:rejector.name=Rejektor
 
 # Fluid pipes
-tile.resonantinduction\:fluidPipe.0.name=Holztrog
-tile.resonantinduction\:fluidPipe.1.name=Schwarzer Holztrog
 tile.resonantinduction\:fluidPipe.2.name=Roter Holztrog
 tile.resonantinduction\:fluidPipe.3.name=Gr\u00FCner Holztrog
 tile.resonantinduction\:fluidPipe.4.name=Brauner Holztrog
@@ -48,6 +56,7 @@ tile.resonantinduction\:grindingWheel.name=Mahlwerkrad
 tile.resonantinduction\:purifier.name=Purifizierrotor
 tile.resonantinduction\:filter.name=Filter
 tile.resonantinduction\:solarPanel.name=Solarmodul
+tile.resonantinduction\:armbot.name=Roboterarm
 
 ## Items
 item.resonantinduction\:quantumEntangler.name=Quantenverschr\u00e4nker
@@ -101,7 +110,8 @@ message.tesla.pair=%v0 mit [%v1, %v2, %v3] verbunden
 message.tesla.mode=Tesla-Empfangsmodus ist nun %v
 
 ##  Misc. Stuff
-misc.resonantinduction.ingot=Barren
+# This is the term in an Ingot's name that will be replaced by item.resonantinduction\:dust.name
+misc.resonantinduction.ingot=barren
 
 
 
@@ -129,14 +139,10 @@ tile.crate.2.name=Elitekiste
 
 tile.DMHopper.0.name = [WIP]Trichter 2.0
 
-tile.imprinter.name=Pr\u00E4ger
-tile.encoder.name=Kodierer
+tile.encoder.name=[WIP]Kodierer
 tile.detector.name=Detektor
-tile.armbot.name=Roboterarm
 tile.craneController.name=Krankontroller
 tile.craneFrame.name=Krangestell
-tile.manipulator.name=Manipulator
-tile.rejector.name=Rejektor
 tile.turntable.name=Drehscheibe
 
 tile.OreProcessor.0.name = Erzzersto\u00DFer
@@ -347,7 +353,6 @@ item.al\:BronzeMolten.name =  Geschmolzene Bronze
 # Items
 item.leatherSeal.name=Lederdichtung
 item.gasSeal.name=Schleimdichtung
-item.unfinishedTank.name=Unvollendeter Tank
 item.valvePart.name=Ventil
 item.circuitBasic.name=Analoger Schaltkreis
 item.circuitAdvanced.name=Transistor-Schaltkreis
@@ -583,24 +588,6 @@ tile.FluidPipe.10014.name =Magentafarbenes H\u00F6llenrohr
 tile.FluidPipe.10015.name =Oranges H\u00F6llenrohr
 tile.FluidPipe.10016.name =Wei\u00DFes H\u00F6llenrohr
 
-tile.FluidTank.0.name =Holztank
-tile.FluidTank.1.name =Schwarzer Holztank
-tile.FluidTank.2.name =Roter Holztank
-tile.FluidTank.3.name =Gr\u00FCner Holztank
-tile.FluidTank.4.name =Brauner Holztank
-tile.FluidTank.5.name =Blauer Holztank
-tile.FluidTank.6.name =Violetter Holztank
-tile.FluidTank.7.name =T\u00FCrkiser Holztank
-tile.FluidTank.8.name =Hellgrauer Holztank
-tile.FluidTank.9.name =Grauer Holztank
-tile.FluidTank.10.name =Pinker Holztank
-tile.FluidTank.11.name =Hellgr\u00FCner Holztank
-tile.FluidTank.12.name =Gelber Holztank
-tile.FluidTank.13.name =Hellblauer Holztank
-tile.FluidTank.14.name =Magentafarbener Holztank
-tile.FluidTank.15.name =Oranger Holztank
-tile.FluidTank.16.name =Wei\u00DFer Holztank
-
 tile.FluidTank.1000.name =Glastank
 tile.FluidTank.1001.name =Schwarzer Glastank
 tile.FluidTank.1002.name =Roter Glastank
diff --git a/src/main/resources/assets/resonantinduction/languages/en_US.properties b/src/main/resources/assets/resonantinduction/languages/en_US.properties
index 2f43a1e4..13b22afa 100644
--- a/src/main/resources/assets/resonantinduction/languages/en_US.properties
+++ b/src/main/resources/assets/resonantinduction/languages/en_US.properties
@@ -110,6 +110,7 @@ message.tesla.pair=Linked %v0 with [%v1, %v2, %v3]
 message.tesla.mode=Tesla receive mode is now %v
 
 ##  Misc. Stuff
+# This is the term in an Ingot's name that will be replaced by item.resonantinduction\:dust.name
 misc.resonantinduction.ingot=Ingot