diff --git a/src/main/java/crazypants/enderio/machine/alloy/TileAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/TileAlloySmelter.java
index fa343ab1..902a8fe8 100644
--- a/src/main/java/crazypants/enderio/machine/alloy/TileAlloySmelter.java
+++ b/src/main/java/crazypants/enderio/machine/alloy/TileAlloySmelter.java
@@ -41,7 +41,7 @@ public class TileAlloySmelter extends AbstractPoweredTaskEntity {
 
     @Override
     public String getInventoryName() {
-        return "Alloy Smelter";
+        return "tile.blockAlloySmelter.name";
     }
 
     public Mode getMode() {
diff --git a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java
index b353178c..9336ee67 100644
--- a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java
+++ b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java
@@ -33,6 +33,12 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl
         super(new SlotDefinition(9, 0, 0));
     }
 
+    @Override
+    public String getInventoryName() {
+        // getMachineName will return the key without the suffix ".name"
+        return getMachineName() + ".name";
+    }
+
     @Override
     public String getMachineName() {
         return BlockItemBuffer.Type.get(this).getUnlocalizedName();
diff --git a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java
index 2f3bf8e1..3b96b7ec 100644
--- a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java
+++ b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java
@@ -54,6 +54,11 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf
         setCapacitor(new BasicCapacitor(0, io * 4, refCap.getMaxEnergyStored(), io));
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockCrafter.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockCrafter.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java
index 1bc5d5ca..1f1008da 100644
--- a/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java
+++ b/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java
@@ -28,7 +28,7 @@ public class TileCrusher extends AbstractPoweredTaskEntity {
 
     @Override
     public String getInventoryName() {
-        return ModObject.blockSagMill.unlocalisedName;
+        return "tile.blockSagMill.name";
     }
 
     @Override
diff --git a/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java
index 6c994e99..b1c10179 100644
--- a/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java
+++ b/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java
@@ -16,7 +16,6 @@ import com.gtnewhorizon.gtnhlib.geometry.CubeIterator;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import crazypants.enderio.Log;
-import crazypants.enderio.ModObject;
 import crazypants.enderio.TileEntityEio;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.obelisk.xp.TileExperienceObelisk;
@@ -300,7 +299,7 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory {
 
     @Override
     public String getInventoryName() {
-        return ModObject.blockEnchanter.unlocalisedName;
+        return "tile.blockEnchanter.name";
     }
 
     @Override
diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java
index aab05486..c0937bd5 100644
--- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java
+++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java
@@ -822,7 +822,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
 
     @Override
     public String getInventoryName() {
-        return EnderIO.blockFarmStation.getLocalizedName();
+        return "tile.blockFarmStation.name";
     }
 
     @Override
diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java
index f15df66b..91777cca 100644
--- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java
+++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java
@@ -90,6 +90,11 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements
         return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL;
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockCombustionGenerator.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockCombustionGenerator.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java
index da841868..4e953524 100644
--- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java
+++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java
@@ -42,7 +42,7 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme
 
     @Override
     public String getInventoryName() {
-        return "Stirling Generator";
+        return "tile.blockStirlingGenerator.name";
     }
 
     @Override
diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java
index 5a96cd7e..38960f27 100644
--- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java
+++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java
@@ -93,6 +93,11 @@ public class TileZombieGenerator extends AbstractGeneratorEntity
         minimumTankLevel = (int) (fuelTank.getCapacity() * 0.7F);
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockZombieGenerator.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockZombieGenerator.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java
index f85fd922..be686863 100644
--- a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java
+++ b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java
@@ -11,8 +11,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.InventoryWrapper;
 
-import crazypants.enderio.ModObject;
-
 public class CompositeInventory implements ISidedInventory {
 
     private final List<InvEntry> inventories = new ArrayList<>();
@@ -157,7 +155,7 @@ public class CompositeInventory implements ISidedInventory {
 
     @Override
     public String getInventoryName() {
-        return ModObject.blockHyperCube.unlocalisedName;
+        return "tile.blockHyperCube.name";
     }
 
     @Override
diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java
index 60d6bf11..e9fc8d17 100644
--- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java
+++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java
@@ -26,7 +26,6 @@ import com.enderio.core.common.util.PlayerUtil;
 import com.enderio.core.common.vecmath.VecmathUtil;
 
 import crazypants.enderio.EnderIO;
-import crazypants.enderio.ModObject;
 import crazypants.enderio.TileEntityEio;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.machine.IRedstoneModeControlable;
@@ -769,7 +768,7 @@ public class TileHyperCube extends TileEntityEio
 
     @Override
     public String getInventoryName() {
-        return ModObject.blockHyperCube.unlocalisedName;
+        return "tile.blockHyperCube.name";
     }
 
     @Override
diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java
index 4eb5003c..de7a215e 100644
--- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java
+++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java
@@ -369,6 +369,11 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH
         nbtRoot.setBoolean("active", active);
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockInventoryPanel.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockInventoryPanel.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java
index 9e11e4b3..2a54d9bc 100644
--- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java
+++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java
@@ -157,6 +157,11 @@ public class TileKillerJoe extends AbstractMachineEntity
         }
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockKillerJoe.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockKillerJoe.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java
index 45091f1b..499dae08 100644
--- a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java
+++ b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java
@@ -101,7 +101,7 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn
 
     @Override
     public String getInventoryName() {
-        return EnderIO.blockPowerMonitor.getUnlocalizedName();
+        return "tile.blockPowerMonitor.name";
     }
 
     @Override
diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java
index 3c83c5b3..ca12583b 100644
--- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java
+++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java
@@ -126,6 +126,11 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange
         setCapacitor(new BasicCapacitor(powerPerTick * 8, getCapacitor().getMaxEnergyStored(), powerPerTick));
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockAttractor.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockAttractor.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java
index 4f9fae47..bf04a8d6 100644
--- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java
+++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java
@@ -106,6 +106,11 @@ public class TileAversionObelisk extends AbstractPowerConsumerEntity implements
         bounds = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ);
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockSpawnGuard.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockSpawnGuard.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/TileInhibitorObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/TileInhibitorObelisk.java
index 863b33a4..e4f90e78 100644
--- a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/TileInhibitorObelisk.java
+++ b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/TileInhibitorObelisk.java
@@ -19,6 +19,11 @@ public class TileInhibitorObelisk extends AbstractPowerConsumerEntity implements
         super(new SlotDefinition(0, 0, 1));
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockInhibitorObelisk.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockInhibitorObelisk.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java
index f58d5edf..214bee88 100644
--- a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java
+++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java
@@ -121,6 +121,11 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity
         setCapacitor(Capacitors.ACTIVATED_CAPACITOR);
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockWeatherObelisk.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockWeatherObelisk.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java
index 32309f80..ce690899 100644
--- a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java
+++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java
@@ -32,6 +32,11 @@ public class TileExperienceObelisk extends AbstractMachineEntity
         super(new SlotDefinition(0, 0, 0));
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockExperienceObelisk.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockExperienceObelisk.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java b/src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java
index 69d6f849..bc180ce6 100644
--- a/src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java
+++ b/src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java
@@ -32,7 +32,7 @@ public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISid
 
     @Override
     public String getInventoryName() {
-        return "Auto Painter";
+        return "tile.blockPainter.name";
     }
 
     @Override
diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java
index d7b17119..64b9e415 100644
--- a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java
+++ b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java
@@ -100,6 +100,11 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity {
         super(new SlotDefinition(8, 1));
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockSliceAndSplice.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockSliceAndSplice.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java
index c34a6b02..2582cb5d 100644
--- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java
+++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java
@@ -113,6 +113,11 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx
         return xpCont;
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockSoulBinder.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockSoulBinder.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java
index d2d5795a..d08ea3eb 100644
--- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java
+++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java
@@ -197,6 +197,11 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity implements IRa
         forceClientUpdate = true;
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockPoweredSpawner.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockPoweredSpawner.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java
index 5e1cd035..e71c69c0 100644
--- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java
+++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java
@@ -225,6 +225,11 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler, IT
         this.voidMode = mode;
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockTank.name";
+    }
+
     @Override
     public String getMachineName() {
         return "tank";
diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java
index 885d554c..9ffbd080 100644
--- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java
+++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java
@@ -157,6 +157,11 @@ public class TileTransceiver extends AbstractPoweredTaskEntity
         }
     }
 
+    @Override
+    public String getInventoryName() {
+        return "tile.blockTransceiver.name";
+    }
+
     @Override
     public String getMachineName() {
         return ModObject.blockTransceiver.unlocalisedName;
diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java
index 1c56f2dd..0b0710e3 100644
--- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java
+++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java
@@ -24,7 +24,6 @@ import com.enderio.core.common.vecmath.Vector3d;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
-import crazypants.enderio.ModObject;
 import crazypants.enderio.TileEntityEio;
 import crazypants.enderio.conduit.item.FilterRegister;
 import crazypants.enderio.conduit.item.filter.IItemFilter;
@@ -212,7 +211,7 @@ public class TileVacuumChest extends TileEntityEio
 
     @Override
     public String getInventoryName() {
-        return ModObject.blockVacuumChest.unlocalisedName;
+        return "tile.blockVacuumChest.name";
     }
 
     @Override
diff --git a/src/main/java/crazypants/enderio/machine/vat/TileVat.java b/src/main/java/crazypants/enderio/machine/vat/TileVat.java
index fb95afdb..94fdc3cf 100644
--- a/src/main/java/crazypants/enderio/machine/vat/TileVat.java
+++ b/src/main/java/crazypants/enderio/machine/vat/TileVat.java
@@ -42,7 +42,7 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler,
 
     @Override
     public String getInventoryName() {
-        return ModObject.blockVat.unlocalisedName;
+        return "tile.blockVat.name";
     }
 
     @Override
diff --git a/src/main/resources/assets/enderio/lang/en_US.lang b/src/main/resources/assets/enderio/lang/en_US.lang
index f30f9016..30242435 100644
--- a/src/main/resources/assets/enderio/lang/en_US.lang
+++ b/src/main/resources/assets/enderio/lang/en_US.lang
@@ -651,6 +651,8 @@ tile.blockWeatherObelisk.tooltip.detailed.line4=Liquid Sunshine: Sun
 tile.blockWeatherObelisk.tooltip.detailed.line5=Cloud Seed: Rain
 tile.blockWeatherObelisk.tooltip.detailed.line6=Concentrated Cloud Seed: Thunder
 
+tile.blockInhibitorObelisk.name=Inhibitor Obelisk
+
 tile.blockBuffer.name=Buffer 
 tile.blockBuffer.item.name=Item Buffer
 tile.blockBuffer.power.name=Power Buffer
diff --git a/src/main/resources/assets/enderio/lang/zh_CN.lang b/src/main/resources/assets/enderio/lang/zh_CN.lang
index 20548f97..444c10b5 100644
--- a/src/main/resources/assets/enderio/lang/zh_CN.lang
+++ b/src/main/resources/assets/enderio/lang/zh_CN.lang
@@ -608,6 +608,8 @@ tile.blockExperienceObelisk.tooltip.detailed.line3=至相邻的储罐中
 tile.blockWeatherObelisk.name=气象方尖碑
 tile.blockWeatherObelisk.tooltip.detailed.line1=改变当前天气
 
+tile.blockInhibitorObelisk.name=传送抑制方尖碑
+
 tile.blockBuffer.item.name=物品缓存器
 tile.blockBuffer.power.name=能量缓存器
 tile.blockBuffer.omni.name=多功能缓存器