diff --git a/src/main/java/refinedstorage/container/ContainerConstructor.java b/src/main/java/refinedstorage/container/ContainerConstructor.java
index 8694124b0..aabef3ce6 100755
--- a/src/main/java/refinedstorage/container/ContainerConstructor.java
+++ b/src/main/java/refinedstorage/container/ContainerConstructor.java
@@ -1,12 +1,9 @@
 package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.container.slot.IItemValidator;
 import refinedstorage.container.slot.SlotFiltered;
 import refinedstorage.container.slot.SlotSpecimenItemBlock;
-import refinedstorage.container.slot.SlotUpgrade;
+import refinedstorage.container.slot.UpgradeItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.TileConstructor;
 
@@ -18,7 +15,7 @@ public class ContainerConstructor extends ContainerBase {
         addSlotToContainer(new SlotSpecimenItemBlock(constructor.getInventory(), 0, 80, 20));
 
         for (int i = 0; i < 4; ++i) {
-            addSlotToContainer(new SlotFiltered(constructor.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING)));
+            addSlotToContainer(new SlotFiltered(constructor.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING)));
         }
 
         addPlayerInventory(8, 55);
diff --git a/src/main/java/refinedstorage/container/ContainerCrafter.java b/src/main/java/refinedstorage/container/ContainerCrafter.java
index 135e829e0..c7d387b3f 100755
--- a/src/main/java/refinedstorage/container/ContainerCrafter.java
+++ b/src/main/java/refinedstorage/container/ContainerCrafter.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.container.slot.IItemValidator;
 import refinedstorage.container.slot.SlotFiltered;
-import refinedstorage.container.slot.SlotUpgrade;
+import refinedstorage.container.slot.UpgradeItemValidator;
 import refinedstorage.item.ItemPattern;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.autocrafting.TileCrafter;
@@ -25,7 +25,7 @@ public class ContainerCrafter extends ContainerStorage {
         }
 
         for (int i = 0; i < 4; ++i) {
-            addSlotToContainer(new SlotFiltered(crafter, 6 + i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED)));
+            addSlotToContainer(new SlotFiltered(crafter, 6 + i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED)));
         }
 
         addPlayerInventory(8, 144);
diff --git a/src/main/java/refinedstorage/container/ContainerDestructor.java b/src/main/java/refinedstorage/container/ContainerDestructor.java
index 28db3380c..cd57b7abd 100755
--- a/src/main/java/refinedstorage/container/ContainerDestructor.java
+++ b/src/main/java/refinedstorage/container/ContainerDestructor.java
@@ -1,12 +1,9 @@
 package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.container.slot.IItemValidator;
 import refinedstorage.container.slot.SlotFiltered;
 import refinedstorage.container.slot.SlotSpecimenItemBlock;
-import refinedstorage.container.slot.SlotUpgrade;
+import refinedstorage.container.slot.UpgradeItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.TileDestructor;
 
@@ -19,7 +16,7 @@ public class ContainerDestructor extends ContainerBase {
         }
 
         for (int i = 0; i < 4; ++i) {
-            addSlotToContainer(new SlotFiltered(destructor.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED)));
+            addSlotToContainer(new SlotFiltered(destructor.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED)));
         }
 
         addPlayerInventory(8, 55);
diff --git a/src/main/java/refinedstorage/container/ContainerExporter.java b/src/main/java/refinedstorage/container/ContainerExporter.java
index 151fe1cfb..b306778d6 100755
--- a/src/main/java/refinedstorage/container/ContainerExporter.java
+++ b/src/main/java/refinedstorage/container/ContainerExporter.java
@@ -1,12 +1,9 @@
 package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.container.slot.IItemValidator;
 import refinedstorage.container.slot.SlotFiltered;
 import refinedstorage.container.slot.SlotSpecimen;
-import refinedstorage.container.slot.SlotUpgrade;
+import refinedstorage.container.slot.UpgradeItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.TileExporter;
 
@@ -19,7 +16,7 @@ public class ContainerExporter extends ContainerBase {
         }
 
         for (int i = 0; i < 4; ++i) {
-            addSlotToContainer(new SlotFiltered(exporter.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING)));
+            addSlotToContainer(new SlotFiltered(exporter.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING)));
         }
 
         addPlayerInventory(8, 55);
diff --git a/src/main/java/refinedstorage/container/ContainerImporter.java b/src/main/java/refinedstorage/container/ContainerImporter.java
index 4ec7cd809..eaee8a9c5 100755
--- a/src/main/java/refinedstorage/container/ContainerImporter.java
+++ b/src/main/java/refinedstorage/container/ContainerImporter.java
@@ -1,12 +1,9 @@
 package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.container.slot.IItemValidator;
 import refinedstorage.container.slot.SlotFiltered;
 import refinedstorage.container.slot.SlotSpecimen;
-import refinedstorage.container.slot.SlotUpgrade;
+import refinedstorage.container.slot.UpgradeItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.TileImporter;
 
@@ -19,7 +16,7 @@ public class ContainerImporter extends ContainerBase {
         }
 
         for (int i = 0; i < 4; ++i) {
-            addSlotToContainer(new SlotFiltered(importer.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED)));
+            addSlotToContainer(new SlotFiltered(importer.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED)));
         }
 
         addPlayerInventory(8, 55);
diff --git a/src/main/java/refinedstorage/container/ContainerInterface.java b/src/main/java/refinedstorage/container/ContainerInterface.java
index 91674cf41..7960cafea 100755
--- a/src/main/java/refinedstorage/container/ContainerInterface.java
+++ b/src/main/java/refinedstorage/container/ContainerInterface.java
@@ -3,9 +3,7 @@ package refinedstorage.container;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
 import refinedstorage.container.slot.*;
-import refinedstorage.item.ItemPattern;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.TileInterface;
 
@@ -26,7 +24,7 @@ public class ContainerInterface extends ContainerBase {
         }
 
         for (int i = 0; i < 4; ++i) {
-            addSlotToContainer(new SlotFiltered(tile.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING)));
+            addSlotToContainer(new SlotFiltered(tile.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING)));
         }
 
         addPlayerInventory(8, 134);
diff --git a/src/main/java/refinedstorage/container/ContainerSolderer.java b/src/main/java/refinedstorage/container/ContainerSolderer.java
index 6d3cceadc..a50a3bde1 100755
--- a/src/main/java/refinedstorage/container/ContainerSolderer.java
+++ b/src/main/java/refinedstorage/container/ContainerSolderer.java
@@ -2,13 +2,10 @@ package refinedstorage.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.container.slot.IItemValidator;
 import refinedstorage.container.slot.SlotFiltered;
 import refinedstorage.container.slot.SlotOutput;
-import refinedstorage.container.slot.SlotUpgrade;
+import refinedstorage.container.slot.UpgradeItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.TileSolderer;
 
@@ -28,7 +25,7 @@ public class ContainerSolderer extends ContainerBase {
         addSlotToContainer(new SlotOutput(solderer, 3, 134, 38));
 
         for (int i = 0; i < 4; ++i) {
-            addSlotToContainer(new SlotFiltered(solderer.getUpgradesInventory(), i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_SPEED)));
+            addSlotToContainer(new SlotFiltered(solderer.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED)));
         }
 
         addPlayerInventory(8, 95);
diff --git a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java
index d9b9c7644..d6af2240a 100755
--- a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java
+++ b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java
@@ -3,10 +3,8 @@ package refinedstorage.container;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.container.slot.IItemValidator;
 import refinedstorage.container.slot.SlotFiltered;
-import refinedstorage.container.slot.SlotUpgrade;
+import refinedstorage.container.slot.UpgradeItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.TileWirelessTransmitter;
 
@@ -15,7 +13,7 @@ public class ContainerWirelessTransmitter extends ContainerBase {
         super(player);
 
         for (int i = 0; i < 4; ++i) {
-            addSlotToContainer(new SlotFiltered(wirelessTransmitter, i, 187, 6 + (i * 18), new SlotUpgrade(ItemUpgrade.TYPE_RANGE)));
+            addSlotToContainer(new SlotFiltered(wirelessTransmitter, i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_RANGE)));
         }
 
         addPlayerInventory(8, 55);
diff --git a/src/main/java/refinedstorage/container/slot/SlotUpgrade.java b/src/main/java/refinedstorage/container/slot/UpgradeItemValidator.java
similarity index 78%
rename from src/main/java/refinedstorage/container/slot/SlotUpgrade.java
rename to src/main/java/refinedstorage/container/slot/UpgradeItemValidator.java
index 5b66cbc5e..357f6ee3b 100755
--- a/src/main/java/refinedstorage/container/slot/SlotUpgrade.java
+++ b/src/main/java/refinedstorage/container/slot/UpgradeItemValidator.java
@@ -5,10 +5,10 @@ import refinedstorage.RefinedStorageItems;
 
 import java.util.Arrays;
 
-public class SlotUpgrade implements IItemValidator {
+public class UpgradeItemValidator implements IItemValidator {
     private int[] allowedUpgrades;
 
-    public SlotUpgrade(int... allowedUpgrades) {
+    public UpgradeItemValidator(int... allowedUpgrades) {
         this.allowedUpgrades = allowedUpgrades;
     }