diff --git a/src/common/mekanism/common/Mekanism.java b/src/common/mekanism/common/Mekanism.java
index e36b210eb..eede63290 100644
--- a/src/common/mekanism/common/Mekanism.java
+++ b/src/common/mekanism/common/Mekanism.java
@@ -313,8 +313,8 @@ public class Mekanism
 		LanguageRegistry.addName(SpeedUpgrade, "Speed Upgrade");
 		LanguageRegistry.addName(EnergyUpgrade, "Energy Upgrade");
 		LanguageRegistry.addName(UltimateUpgrade, "Ultimate Upgrade");
-		LanguageRegistry.addName(AtomicDisassembler, "Nuclear Disassembler");
-		LanguageRegistry.addName(AtomicCore, "Nuclear Core");
+		LanguageRegistry.addName(AtomicDisassembler, "Atomic Disassembler");
+		LanguageRegistry.addName(AtomicCore, "Atomic Core");
 		LanguageRegistry.addName(ElectricBow, "Electric Bow");
 		LanguageRegistry.addName(StorageTank, "Hydrogen Tank");
 		LanguageRegistry.addName(NullRender, "Null Render");
diff --git a/src/minecraft/mekanism/client/GuiEnergyCube.java b/src/minecraft/mekanism/client/GuiEnergyCube.java
index 6cbe676d3..0ee4ff9c7 100644
--- a/src/minecraft/mekanism/client/GuiEnergyCube.java
+++ b/src/minecraft/mekanism/client/GuiEnergyCube.java
@@ -44,7 +44,7 @@ public class GuiEnergyCube extends GuiContainer
         guiWidth = (width - xSize) / 2;
         guiHeight = (height - ySize) / 2;
         drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize);
-        int scale = (int)(((double)tileEntity.electricityStored / tileEntity.MAX_ELECTRICITY) * 72);
+        int scale = (int)(((double)tileEntity.electricityStored / tileEntity.tier.MAX_ELECTRICITY) * 72);
         drawTexturedModalRect(guiWidth + 65, guiHeight + 17, 176, 0, scale, 20);
     }
 }