diff --git a/src/main/resources/assets/opencomputers/lang/de_DE.lang b/src/main/resources/assets/opencomputers/lang/de_DE.lang
index 2cb61f900..e73fa7b8e 100644
--- a/src/main/resources/assets/opencomputers/lang/de_DE.lang
+++ b/src/main/resources/assets/opencomputers/lang/de_DE.lang
@@ -156,8 +156,8 @@ oc:container.AccessPoint=Access Point
 oc:container.Case=Computer
 oc:container.Disassembler=Recycler
 oc:container.DiskDrive=Diskettenlaufwerk
-oc:container.Rack=Serverschrank
 oc:container.Server=Server
+oc:container.ServerRack=Serverschrank
 oc:container.Switch=Switch
 
 # Keybinds
diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang
index 846746d93..6e5c0e4be 100644
--- a/src/main/resources/assets/opencomputers/lang/en_US.lang
+++ b/src/main/resources/assets/opencomputers/lang/en_US.lang
@@ -156,9 +156,9 @@ oc:container.AccessPoint=Access Point
 oc:container.Case=Computer
 oc:container.Disassembler=Disassembler
 oc:container.DiskDrive=Disk Drive
-oc:container.Rack=Server Rack
-oc:container.Switch=Switch
 oc:container.Server=Server
+oc:container.ServerRack=Server Rack
+oc:container.Switch=Switch
 
 # Keybinds
 key.materialCosts=Show Material Costs
diff --git a/src/main/resources/assets/opencomputers/lang/ru_RU.lang b/src/main/resources/assets/opencomputers/lang/ru_RU.lang
index d3eca0f6b..7c9b62657 100644
--- a/src/main/resources/assets/opencomputers/lang/ru_RU.lang
+++ b/src/main/resources/assets/opencomputers/lang/ru_RU.lang
@@ -154,8 +154,8 @@ oc:container.AccessPoint=Точка доступа
 oc:container.Case=Компьютер
 oc:container.Disassembler=Разборщик
 oc:container.DiskDrive=Дисковод
-oc:container.Rack=Серверная стойка
 oc:container.Server=Сервер
+oc:container.ServerRack=Серверная стойка
 oc:container.Switch=Коммутатор
 
 # Keybinds
diff --git a/src/main/resources/assets/opencomputers/lang/zh_TW.lang b/src/main/resources/assets/opencomputers/lang/zh_TW.lang
index 1a06eeb94..ccedd94e9 100644
--- a/src/main/resources/assets/opencomputers/lang/zh_TW.lang
+++ b/src/main/resources/assets/opencomputers/lang/zh_TW.lang
@@ -111,8 +111,8 @@ oc:gui.Terminal.OutOfRange=沒訊號.
 # Containers
 oc:container.Case=電腦
 oc:container.DiskDrive=硬碟
-oc:container.Rack=伺服器機架
 oc:container.Server=伺服器
+oc:container.ServerRack=伺服器機架
 oc:container.Switch=路由器
 
 # Item / Block Tooltips
diff --git a/src/main/scala/li/cil/oc/common/inventory/Inventory.scala b/src/main/scala/li/cil/oc/common/inventory/Inventory.scala
index b1e2e7c07..2b2c333c6 100644
--- a/src/main/scala/li/cil/oc/common/inventory/Inventory.scala
+++ b/src/main/scala/li/cil/oc/common/inventory/Inventory.scala
@@ -63,6 +63,10 @@ trait Inventory extends IInventory {
 
   override def isInvNameLocalized = false
 
+  override def getInvName = Settings.namespace + "container." + inventoryName
+
+  protected def inventoryName = getClass.getSimpleName
+
   // ----------------------------------------------------------------------- //
 
   def load(nbt: NBTTagCompound) {
diff --git a/src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala b/src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala
index 7cc911067..4bc0b0391 100644
--- a/src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala
+++ b/src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala
@@ -1,6 +1,5 @@
 package li.cil.oc.common.inventory
 
-import li.cil.oc.Settings
 import li.cil.oc.api.Driver
 import li.cil.oc.common.InventorySlots
 import net.minecraft.entity.player.EntityPlayer
@@ -15,7 +14,7 @@ trait ServerInventory extends ItemStackInventory {
     case _ => 8
   }
 
-  override def getInvName = Settings.namespace + "container.Server"
+  override protected def inventoryName = "Server"
 
   override def getInventoryStackLimit = 1
 
diff --git a/src/main/scala/li/cil/oc/common/item/Tablet.scala b/src/main/scala/li/cil/oc/common/item/Tablet.scala
index 40d5c61d3..ae8a1838c 100644
--- a/src/main/scala/li/cil/oc/common/item/Tablet.scala
+++ b/src/main/scala/li/cil/oc/common/item/Tablet.scala
@@ -121,8 +121,6 @@ class TabletWrapper(val stack: ItemStack, var holder: Entity) extends ComponentI
 
   override def getSizeInventory = items.length
 
-  override def getInvName = Settings.namespace + "container.Tablet"
-
   override def isItemValidForSlot(slot: Int, stack: ItemStack) = true
 
   override def isUseableByPlayer(player: EntityPlayer) = canInteract(player.getCommandSenderName)
diff --git a/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala b/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
index 5f3fae1d6..c468b4248 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
@@ -80,10 +80,6 @@ class AccessPoint extends Switch with WirelessEndpoint {
 
   // ----------------------------------------------------------------------- //
 
-  override def getInvName = Settings.namespace + "container.AccessPoint"
-
-  // ----------------------------------------------------------------------- //
-
   override def readFromNBT(nbt: NBTTagCompound) = {
     super.readFromNBT(nbt)
     if (nbt.hasKey(Settings.namespace + "strength")) {
diff --git a/src/main/scala/li/cil/oc/common/tileentity/Case.scala b/src/main/scala/li/cil/oc/common/tileentity/Case.scala
index 3bb99161a..570ea6b62 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/Case.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/Case.scala
@@ -97,8 +97,6 @@ class Case(var tier: Int, val isRemote: Boolean) extends traits.PowerAcceptor wi
     recomputeMaxComponents()
   }
 
-  override def getInvName = Settings.namespace + "container.Case"
-
   override def getSizeInventory = if (tier < 0 || tier >= InventorySlots.computer.length) 0 else InventorySlots.computer(tier).length
 
   override def isUseableByPlayer(player: EntityPlayer) =
diff --git a/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala b/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala
index 14c651f80..b8191237c 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala
@@ -194,7 +194,7 @@ class Disassembler extends traits.Environment with traits.PowerAcceptor with tra
     queue ++= nbt.getTagList(Settings.namespace + "queue").map(ItemStack.loadItemStackFromNBT)
     buffer = nbt.getDouble(Settings.namespace + "buffer")
     totalRequiredEnergy = nbt.getDouble(Settings.namespace + "total")
-    isActive = !queue.isEmpty
+    isActive = queue.nonEmpty
   }
 
   override def writeToNBT(nbt: NBTTagCompound) {
@@ -221,8 +221,6 @@ class Disassembler extends traits.Environment with traits.PowerAcceptor with tra
 
   override def getInventoryStackLimit = 64
 
-  override def getInvName = Settings.namespace + "container.Disassembler"
-
   override def isItemValidForSlot(i: Int, stack: ItemStack) =
     api.Items.get(stack) == api.Items.get("robot") ||
       ((Settings.get.disassembleAllTheThings || api.Items.get(stack) != null) && !getIngredients(stack).isEmpty)
diff --git a/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala b/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
index 720379d10..2c7eca012 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
@@ -1,10 +1,10 @@
 package li.cil.oc.common.tileentity
 
+import li.cil.oc.api
 import li.cil.oc.api.Driver
 import li.cil.oc.api.driver.Slot
 import li.cil.oc.api.network.{Analyzable, Component, Visibility}
 import li.cil.oc.common.Sound
-import li.cil.oc.{Settings, api}
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 
@@ -23,8 +23,6 @@ class DiskDrive extends traits.Environment with traits.ComponentInventory with t
 
   // ----------------------------------------------------------------------- //
 
-  override def getInvName = Settings.namespace + "container.DiskDrive"
-
   override def getSizeInventory = 1
 
   override def isItemValidForSlot(slot: Int, stack: ItemStack) = (slot, Option(Driver.driverFor(stack))) match {
diff --git a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
index ea5cfaa4e..27a154bce 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
@@ -593,8 +593,6 @@ class Robot(val isRemote: Boolean) extends traits.Computer with traits.PowerInfo
 
   // ----------------------------------------------------------------------- //
 
-  override def getInvName = Settings.namespace + "container.Robot"
-
   var getSizeInventory = actualInventorySize
 
   override def getInventoryStackLimit = 64
diff --git a/src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala b/src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala
index 54e86fa9a..ce91b924d 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala
@@ -141,8 +141,6 @@ class RobotAssembler extends traits.Environment with traits.PowerAcceptor with t
 
   // ----------------------------------------------------------------------- //
 
-  override def getInvName = Settings.namespace + "container.RobotAssembler"
-
   override def getSizeInventory = InventorySlots.assembler(0).length
 
   override def getInventoryStackLimit = 1
diff --git a/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala b/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
index a3641e71c..aac5ef33d 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
@@ -143,8 +143,6 @@ class ServerRack extends traits.PowerAcceptor with traits.Hub with traits.PowerB
 
   override def getSizeInventory = 4
 
-  override def getInvName = Settings.namespace + "container.Rack"
-
   override def getInventoryStackLimit = 1
 
   override def isItemValidForSlot(i: Int, stack: ItemStack) = {
diff --git a/src/main/scala/li/cil/oc/common/tileentity/Switch.scala b/src/main/scala/li/cil/oc/common/tileentity/Switch.scala
index 6d3ddd196..4a1fedf08 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/Switch.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/Switch.scala
@@ -178,8 +178,6 @@ class Switch extends traits.Hub with traits.NotAnalyzable with IPeripheral with
     }
   }
 
-  override def getInvName = Settings.namespace + "container.Switch"
-
   override def getSizeInventory = InventorySlots.switch.length
 
   override def isItemValidForSlot(slot: Int, stack: ItemStack) =