6 files changed, 17 insertions, 17 deletions
diff --git a/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java
index f1e84f439f..9afccfb0f4 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java
@@ -14,7 +14,7 @@ import gtPlusPlus.core.slots.SlotIntegratedCircuit;
 import gtPlusPlus.core.slots.SlotNoInput;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 
-public class Container_CircuitProgrammer extends Container {
+public class ContainerCircuitProgrammer extends Container {
 
     protected TileEntityCircuitProgrammer tile_entity;
     public final InventoryCircuitProgrammer inventoryChest;
@@ -32,7 +32,7 @@ public class Container_CircuitProgrammer extends Container {
     public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
     // slots
 
-    public Container_CircuitProgrammer(final InventoryPlayer inventory, final TileEntityCircuitProgrammer te) {
+    public ContainerCircuitProgrammer(final InventoryPlayer inventory, final TileEntityCircuitProgrammer te) {
         this.tile_entity = te;
         this.inventoryChest = te.getInventory();
 
diff --git a/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java b/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java
index 881311897f..1a9344c08c 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java
@@ -12,7 +12,7 @@ import gtPlusPlus.core.inventories.InventoryFishTrap;
 import gtPlusPlus.core.slots.SlotNoInput;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
 
-public class Container_FishTrap extends Container {
+public class ContainerFishTrap extends Container {
 
     protected TileEntityFishTrap tile_entity;
     public final InventoryFishTrap inventoryChest;
@@ -30,7 +30,7 @@ public class Container_FishTrap extends Container {
 
     private final int[] slotStorage = new int[15];
 
-    public Container_FishTrap(final InventoryPlayer inventory, final TileEntityFishTrap te) {
+    public ContainerFishTrap(final InventoryPlayer inventory, final TileEntityFishTrap te) {
         this.tile_entity = te;
         this.inventoryChest = te.getInventory();
 
diff --git a/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java b/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java
index 315f34595e..6f63a1d04e 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java
@@ -18,7 +18,7 @@ import gtPlusPlus.core.slots.SlotGeneric;
 import gtPlusPlus.core.slots.SlotNoInput;
 import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
 
-public class Container_PestKiller extends Container {
+public class ContainerPestKiller extends Container {
 
     public TileEntityPestKiller tile_entity;
     public final InventoryPestKiller inventoryChest;
@@ -34,7 +34,7 @@ public class Container_PestKiller extends Container {
     public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
     // slots
 
-    public Container_PestKiller(final InventoryPlayer inventory, final TileEntityPestKiller te) {
+    public ContainerPestKiller(final InventoryPlayer inventory, final TileEntityPestKiller te) {
         this.tile_entity = te;
         this.inventoryChest = te.getInventory();
         te.openInventory();
diff --git a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java b/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java
index 1702be19ab..306c6f0026 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java
@@ -20,7 +20,7 @@ import gtPlusPlus.core.slots.SlotDataStick;
 import gtPlusPlus.core.slots.SlotNoInput;
 import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
 
-public class Container_ProjectTable extends Container {
+public class ContainerProjectTable extends Container {
 
     /** The crafting matrix inventory (3x3). */
     public InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3);
@@ -39,7 +39,7 @@ public class Container_ProjectTable extends Container {
     private final int[] slotOutputs = new int[2];
     private final int[] slotGrid = new int[9];
 
-    public Container_ProjectTable(final InventoryPlayer inventory, final TileEntityProjectTable tile) {
+    public ContainerProjectTable(final InventoryPlayer inventory, final TileEntityProjectTable tile) {
         this.tile_entity = tile;
         this.inventoryGrid = tile.inventoryGrid;
         this.inventoryOutputs = tile.inventoryOutputs;
diff --git a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java b/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java
index ab7525c897..45782f1384 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java
@@ -12,15 +12,15 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
-import gtPlusPlus.core.inventories.Inventory_SuperJukebox;
+import gtPlusPlus.core.block.machine.BlockSuperJukebox.TileEntitySuperJukebox;
+import gtPlusPlus.core.inventories.InventorySuperJukebox;
 import gtPlusPlus.core.slots.SlotJukebox;
 import gtPlusPlus.core.slots.SlotNoInput;
 
-public class Container_SuperJukebox extends Container {
+public class ContainerSuperJukebox extends Container {
 
     protected TileEntitySuperJukebox tile_entity;
-    public final Inventory_SuperJukebox inventoryChest;
+    public final InventorySuperJukebox inventoryChest;
 
     private final World worldObj;
     private final int posX;
@@ -37,7 +37,7 @@ public class Container_SuperJukebox extends Container {
     public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
     // slots
 
-    public Container_SuperJukebox(final InventoryPlayer inventory, final TileEntitySuperJukebox te) {
+    public ContainerSuperJukebox(final InventoryPlayer inventory, final TileEntitySuperJukebox te) {
         this.tile_entity = te;
         this.inventoryChest = te.getInventory();
 
diff --git a/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java
index 0315967263..bf1f8c4133 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java
@@ -12,16 +12,16 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.Inventory_VolumetricFlaskSetter;
+import gtPlusPlus.core.inventories.InventoryVolumetricFlaskSetter;
 import gtPlusPlus.core.slots.SlotNoInput;
 import gtPlusPlus.core.slots.SlotVolumetricFlask;
 import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
 import gtPlusPlus.core.util.Utils;
 
-public class Container_VolumetricFlaskSetter extends Container {
+public class ContainerVolumetricFlaskSetter extends Container {
 
     public TileEntityVolumetricFlaskSetter mTileEntity;
-    public final Inventory_VolumetricFlaskSetter inventoryChest;
+    public final InventoryVolumetricFlaskSetter inventoryChest;
 
     public int mCustomValue;
     private int oCustomValue;
@@ -40,7 +40,7 @@ public class Container_VolumetricFlaskSetter extends Container {
     public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
     // slots
 
-    public Container_VolumetricFlaskSetter(final InventoryPlayer inventory, final TileEntityVolumetricFlaskSetter te) {
+    public ContainerVolumetricFlaskSetter(final InventoryPlayer inventory, final TileEntityVolumetricFlaskSetter te) {
         this.mTileEntity = te;
         this.inventoryChest = te.getInventory();