The Great Renaming (#3014)

* move kekztech to a single root dir

* move detrav to a single root dir

* move gtnh-lanthanides to a single root dir

* move tectech and delete some gross reflection in gt++

* remove more reflection inside gt5u

* delete more reflection in gt++

* fix imports

* move bartworks and bwcrossmod

* fix proxies

* move galactigreg and ggfab

* move gtneioreplugin

* try to fix gt++ bee loader

* apply the rename rules to BW

* apply rename rules to bwcrossmod

* apply rename rules to detrav scanner mod

* apply rename rules to galacticgreg

* apply rename rules to ggfab

* apply rename rules to goodgenerator

* apply rename rules to gtnh-lanthanides

* apply rename rules to gt++

* apply rename rules to kekztech

* apply rename rules to kubatech

* apply rename rules to tectech

* apply rename rules to gt

apply the rename rules to gt

* fix tt import

* fix mui hopefully

* fix coremod except intergalactic

* rename assline recipe class

* fix a class name i stumbled on

* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib

* temporary rename of GTTooltipDataCache to old name

* fix gt client/server proxy names

18 files changed, 191 insertions, 193 deletions

diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
index f5cf261be1..f1f4b8591a 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
@@ -1,11 +1,11 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.api.enums.GT_Values.OFFX;
-import static gregtech.api.enums.GT_Values.OFFY;
-import static gregtech.api.enums.GT_Values.OFFZ;
-import static gregtech.api.util.GT_Util.LAST_BROKEN_TILEENTITY;
-import static gregtech.api.util.GT_Util.getTileEntity;
-import static gregtech.api.util.GT_Util.setTileEntity;
+import static gregtech.api.enums.GTValues.OFFX;
+import static gregtech.api.enums.GTValues.OFFY;
+import static gregtech.api.enums.GTValues.OFFZ;
+import static gregtech.api.util.GTUtil.LAST_BROKEN_TILEENTITY;
+import static gregtech.api.util.GTUtil.getTileEntity;
+import static gregtech.api.util.GTUtil.setTileEntity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +44,7 @@ import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IDebugableBlock;
@@ -53,10 +53,10 @@ import gregtech.api.metatileentity.BaseTileEntity;
 import gregtech.api.metatileentity.CoverableTileEntity;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtil;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.render.GT_MultiTile_Renderer;
+import gregtech.common.render.MultiTileRenderer;
 
 /*
  * MultiTileEntityBlock ported from GT6
@@ -85,7 +85,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     public MultiTileEntityBlock(Material material) {
         super(material);
-        if (GregTech_API.sPreloadFinished)
+        if (GregTechAPI.sPreloadFinished)
             throw new IllegalStateException("Blocks can only be initialized within preInit!");
     }
 
@@ -121,7 +121,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     public MultiTileEntityBlock register() {
         if (registered) throw new IllegalStateException("Block already registered " + internalName);
-        if (GregTech_API.sPreloadFinished)
+        if (GregTechAPI.sPreloadFinished)
             throw new IllegalStateException("Blocks can only be initialized within preInit!");
 
         registered = true;
@@ -141,7 +141,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
         // spotless:off
         // if (aTileEntity instanceof IMTE_HasMultiBlockMachineRelevantData
         //     && ((IMTE_HasMultiBlockMachineRelevantData) aTileEntity).hasMultiBlockMachineRelevantData())
-        //     GregTech_API.causeMachineUpdate(world, x, y, z);
+        //     GregTechAPI.causeMachineUpdate(world, x, y, z);
         // spotless:on
 
         world.removeTileEntity(x, y, z);
@@ -160,8 +160,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     @Override
     public int getRenderType() {
-        return GT_MultiTile_Renderer.INSTANCE == null ? super.getRenderType()
-            : GT_MultiTile_Renderer.INSTANCE.getRenderId();
+        return MultiTileRenderer.INSTANCE == null ? super.getRenderType() : MultiTileRenderer.INSTANCE.getRenderId();
     }
 
     @Override
@@ -455,7 +454,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     @Override
     public boolean removedByPlayer(World world, EntityPlayer aPlayer, int x, int y, int z, boolean aWillHarvest) {
-        final TileEntity tileEntity = GT_Util.getTileEntity(world, x, y, z, true);
+        final TileEntity tileEntity = GTUtil.getTileEntity(world, x, y, z, true);
         if (tileEntity != null) LAST_BROKEN_TILEENTITY.set(tileEntity);
         return super.removedByPlayer(world, aPlayer, x, y, z, aWillHarvest);
     }
@@ -467,7 +466,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     @Override
     public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
-        return GregTech_API.sMachineFlammable && (world.getBlockMetadata(x, y, z) == 0) ? 100 : 0;
+        return GregTechAPI.sMachineFlammable && (world.getBlockMetadata(x, y, z) == 0) ? 100 : 0;
     }
 
     @Override
@@ -502,7 +501,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
         final TileEntity tileEntity = getTileEntity(world, x, y, z, true);
         if (tileEntity != null) LAST_BROKEN_TILEENTITY.set(tileEntity);
         if (tileEntity instanceof IMultiTileEntity mute) {
-            GT_Log.exp.printf(
+            GTLog.exp.printf(
                 "Explosion at : %d | %d | %d DIMID: %s due to near explosion!%n",
                 x,
                 y,
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java
index 325f583149..ca265e529e 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.api.enums.GT_Values.NBT;
+import static gregtech.api.enums.GTValues.NBT;
 
 import java.lang.ref.WeakReference;
 
@@ -11,7 +11,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.multitileentity.base.MultiTileEntity;
 import gregtech.api.multitileentity.multiblock.casing.FunctionalCasing;
 import gregtech.api.multitileentity.multiblock.casing.UpgradeCasing;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTUtil;
 import gregtech.common.tileentities.casings.upgrade.Inventory;
 import gregtech.common.tileentities.casings.upgrade.Tank;
 
@@ -43,7 +43,7 @@ public class MultiTileEntityClassContainer {
 
         if (parameters.hasKey(NBT.MATERIAL) && !parameters.hasKey(NBT.COLOR)) parameters.setInteger(
             NBT.COLOR,
-            GT_Util.getRGBInt(
+            GTUtil.getRGBInt(
                 Materials.get(parameters.getString(NBT.MATERIAL))
                     .getRGBA()));
 
@@ -80,7 +80,7 @@ public class MultiTileEntityClassContainer {
     public MultiTileEntityClassContainer material(Materials material) {
         // Sets the material, and the color from the material, if not already set
         parameters.setString(NBT.MATERIAL, material.toString());
-        if (!parameters.hasKey(NBT.COLOR)) parameters.setInteger(NBT.COLOR, GT_Util.getRGBInt(material.getRGBA()));
+        if (!parameters.hasKey(NBT.COLOR)) parameters.setInteger(NBT.COLOR, GTUtil.getRGBInt(material.getRGBA()));
         return this;
     }
 
@@ -90,7 +90,7 @@ public class MultiTileEntityClassContainer {
     }
 
     public MultiTileEntityClassContainer color(short[] rgba) {
-        parameters.setInteger(NBT.COLOR, GT_Util.getRGBInt(rgba));
+        parameters.setInteger(NBT.COLOR, GTUtil.getRGBInt(rgba));
         return this;
     }
 
@@ -154,7 +154,7 @@ public class MultiTileEntityClassContainer {
          * Merge in arbitrary NBT tuples of (key, value). Useful for anything for which a custom method has not yet been
          * exposed
          */
-        parameters = GT_Util.fuseNBT(parameters, GT_Util.makeNBT(aTags));
+        parameters = GTUtil.fuseNBT(parameters, GTUtil.makeNBT(aTags));
         return this;
     }
 
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
index e67ab61e96..bf7259626f 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
@@ -1,7 +1,7 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.SIDE_TOP;
+import static gregtech.GTMod.GT_FML_LOGGER;
+import static gregtech.api.enums.GTValues.SIDE_TOP;
 
 import java.util.List;
 
@@ -132,7 +132,7 @@ public class MultiTileEntityItem extends ItemBlock {
              *    Add back if needed
              */
             // try {
-            //     GregTech_API.causeMachineUpdate(world, x, y, z);
+            //     GregTechAPI.causeMachineUpdate(world, x, y, z);
             // } catch (Throwable e) {
             //     GT_FML_LOGGER.error("causeMachineUpdate", e);
             // }
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
index 0b5afbb043..186110abb7 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,12 +21,12 @@ import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap;
 import appeng.core.CreativeTab;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.LoaderState;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.multitileentity.base.MultiTileEntity;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
 
@@ -61,7 +61,7 @@ public class MultiTileEntityRegistry {
         this.block = block;
         GT_FML_LOGGER.info(internalName + " " + Block.getIdFromBlock(block) + " This is the answer");
         this.block.setRegistry(this);
-        REGISTRIES.put(new ItemStack(Item.getItemById(Block.getIdFromBlock(block)), 1, GT_Values.W), this);
+        REGISTRIES.put(new ItemStack(Item.getItemById(Block.getIdFromBlock(block)), 1, GTValues.W), this);
         NAMED_REGISTRIES.put(internalName, this);
     }
 
@@ -84,7 +84,7 @@ public class MultiTileEntityRegistry {
     }
 
     public static MultiTileEntityRegistry getRegistry(int aRegistryID) {
-        return REGISTRIES.get(new ItemStack(Item.getItemById(aRegistryID), 1, GT_Values.W));
+        return REGISTRIES.get(new ItemStack(Item.getItemById(aRegistryID), 1, GTValues.W));
     }
 
     public static MultiTileEntityRegistry getRegistry(String aRegistryName) {
@@ -101,7 +101,7 @@ public class MultiTileEntityRegistry {
      */
     public ItemStack add(String aLocalised, MultiTileEntityClassContainer aClassContainer) {
         boolean tFailed = false;
-        if (GT_Utility.isStringInvalid(aLocalised)) {
+        if (GTUtility.isStringInvalid(aLocalised)) {
             GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Localisation Missing!");
             tFailed = true;
         }
@@ -113,7 +113,7 @@ public class MultiTileEntityRegistry {
                 GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Class inside Class Container is null!");
                 tFailed = true;
             }
-            if (aClassContainer.getMuteID() == GT_Values.W) {
+            if (aClassContainer.getMuteID() == GTValues.W) {
                 GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Class Container uses Wildcard MetaData!");
                 tFailed = true;
             }
@@ -138,8 +138,7 @@ public class MultiTileEntityRegistry {
             return null;
         }
 
-        GT_LanguageManager
-            .addStringLocalization(internalName + "." + aClassContainer.getMuteID() + ".name", aLocalised);
+        GTLanguageManager.addStringLocalization(internalName + "." + aClassContainer.getMuteID() + ".name", aLocalised);
         registry.put(aClassContainer.getMuteID(), aClassContainer);
         mLastRegisteredID = aClassContainer.getMuteID();
         registrations.add(aClassContainer);
@@ -154,7 +153,7 @@ public class MultiTileEntityRegistry {
         return getItem(aClassContainer.getMuteID());
     }
 
-    public short mLastRegisteredID = GT_Values.W;
+    public short mLastRegisteredID = GTValues.W;
 
     public ItemStack getItem() {
         return getItem(mLastRegisteredID, 1, null);
@@ -206,14 +205,14 @@ public class MultiTileEntityRegistry {
     public TileEntity getNewTileEntity(World aWorld, int x, int y, int z, int metaID, NBTTagCompound nbt) {
         final MultiTileEntityClassContainer container = registry.get((short) metaID);
         if (container == null) return null;
-        final MultiTileEntity te = (MultiTileEntity) GT_Utility
+        final MultiTileEntity te = (MultiTileEntity) GTUtility
             .callConstructor(container.getMuteClass(), -1, null, true);
         te.setWorldObj(aWorld);
         te.xCoord = x;
         te.yCoord = y;
         te.zCoord = z;
         nbt = (nbt == null || nbt.hasNoTags()) ? container.getParameters()
-            : GT_Util.fuseNBT(nbt, container.getParameters());
+            : GTUtil.fuseNBT(nbt, container.getParameters());
         te.initFromNBT(nbt, (short) metaID, (short) Block.getIdFromBlock(block));
         return te;
     }
diff --git a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
index eeadfe7602..24163f9c20 100644
--- a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
@@ -1,7 +1,7 @@
 package gregtech.api.multitileentity.base;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.VALID_SIDES;
+import static gregtech.GTMod.GT_FML_LOGGER;
+import static gregtech.api.enums.GTValues.VALID_SIDES;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,15 +35,15 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.common.internal.network.NetworkUtils;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
+import gregtech.api.enums.GTValues.NBT;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.CoverableTileEntity;
 import gregtech.api.metatileentity.GregTechTileClientEvents;
@@ -52,18 +52,18 @@ import gregtech.api.multitileentity.MultiTileEntityClassContainer;
 import gregtech.api.multitileentity.MultiTileEntityRegistry;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
 import gregtech.api.multitileentity.interfaces.SyncedMultiTileEntity;
-import gregtech.api.net.GT_Packet_MultiTileEntity;
-import gregtech.api.net.GT_Packet_New;
+import gregtech.api.net.GTPacketMultiTileEntity;
+import gregtech.api.net.GTPacketNew;
 import gregtech.api.net.data.CommonData;
 import gregtech.api.net.data.CoordinateData;
 import gregtech.api.net.data.MultiTileEntityData;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.XSTR;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 import gregtech.common.render.MultiTileBasicRender;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -98,16 +98,16 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     protected ForgeDirection facing = ForgeDirection.WEST; // Default to WEST, so it renders facing Left in the
                                                            // inventory
     protected byte color;
-    protected int rgba = GT_Values.UNCOLORED;
-    private short mteID = GT_Values.W, mteRegistry = GT_Values.W;
+    protected int rgba = GTValues.UNCOLORED;
+    private short mteID = GTValues.W, mteRegistry = GTValues.W;
     private String customName = null;
     private String ownerName = "";
-    private UUID ownerUUID = GT_Utility.defaultUuid;
+    private UUID ownerUUID = GTUtility.defaultUuid;
     private boolean lockUpgrade = false;
 
-    private final GT_Packet_MultiTileEntity fullPacket = new GT_Packet_MultiTileEntity(false);
-    private final GT_Packet_MultiTileEntity timedPacket = new GT_Packet_MultiTileEntity(false);
-    private final GT_Packet_MultiTileEntity graphicPacket = new GT_Packet_MultiTileEntity(false);
+    private final GTPacketMultiTileEntity fullPacket = new GTPacketMultiTileEntity(false);
+    private final GTPacketMultiTileEntity timedPacket = new GTPacketMultiTileEntity(false);
+    private final GTPacketMultiTileEntity graphicPacket = new GTPacketMultiTileEntity(false);
 
     public MultiTileEntity(boolean isTicking) {
         this.isTicking = isTicking;
@@ -213,7 +213,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     @Override
     public void readFromNBT(NBTTagCompound nbt) {
         // Check if it is a World/Chunk-Loading Process calling readFromNBT
-        if (mteID == GT_Values.W || mteRegistry == GT_Values.W) {
+        if (mteID == GTValues.W || mteRegistry == GTValues.W) {
             // Read the ID Tags first
             mteID = nbt.getShort(NBT.MTE_ID);
             mteRegistry = nbt.getShort(NBT.MTE_REG);
@@ -224,7 +224,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                 if (tClass != null) {
                     // Add the Default Parameters. Useful for things that differ between different tiers/types of the
                     // same machine
-                    nbt = GT_Util.fuseNBT(nbt, tClass.getParameters());
+                    nbt = GTUtil.fuseNBT(nbt, tClass.getParameters());
                 }
             }
         }
@@ -255,7 +255,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             readMultiTileNBT(nbt);
 
             if (NetworkUtils.isDedicatedClient()) {
-                if (GregTech_API.sBlockIcons == null && nbt.hasKey(NBT.TEXTURE_FOLDER)) {
+                if (GregTechAPI.sBlockIcons == null && nbt.hasKey(NBT.TEXTURE_FOLDER)) {
                     loadTextures(nbt.getString(NBT.TEXTURE_FOLDER));
                 } else {
                     copyTextures();
@@ -284,7 +284,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
         nbt.setShort(NBT.MTE_ID, mteID);
         nbt.setShort(NBT.MTE_REG, mteRegistry);
         // write the Custom Name
-        if (GT_Utility.isStringValid(customName)) {
+        if (GTUtility.isStringValid(customName)) {
             final NBTTagCompound displayNBT;
             if (nbt.hasKey(NBT.DISPLAY)) {
                 displayNBT = nbt.getCompoundTag(NBT.DISPLAY);
@@ -349,7 +349,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     public TileEntity getTileEntity(int aX, int aY, int aZ) {
         if (worldObj == null
             || (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ))) return null;
-        return GT_Util.getTileEntity(worldObj, aX, aY, aZ, true);
+        return GTUtil.getTileEntity(worldObj, aX, aY, aZ, true);
     }
 
     @Override
@@ -410,7 +410,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
 
     @Override
     public String getCustomName() {
-        return GT_Utility.isStringValid(customName) ? customName : null;
+        return GTUtility.isStringValid(customName) ? customName : null;
     }
 
     @Override
@@ -468,7 +468,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
 
         if (shouldTriggerBlockUpdate()) {
             // If we're triggering a block update this will call onMachineBlockUpdate()
-            GregTech_API.causeMachineUpdate(worldObj, xCoord, yCoord, zCoord);
+            GregTechAPI.causeMachineUpdate(worldObj, xCoord, yCoord, zCoord);
         } else {
             // If we're not trigger a cascading one, call the update here.
             onMachineBlockUpdate();
@@ -653,7 +653,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         return true;
     }
 
@@ -696,13 +696,13 @@ public abstract class MultiTileEntity extends CoverableTileEntity
 
     @Override
     public String getOwnerName() {
-        if (GT_Utility.isStringInvalid(ownerName)) return "Player";
+        if (GTUtility.isStringInvalid(ownerName)) return "Player";
         return ownerName;
     }
 
     @Override
     public String setOwnerName(String aName) {
-        if (GT_Utility.isStringInvalid(aName)) return ownerName = "Player";
+        if (GTUtility.isStringInvalid(aName)) return ownerName = "Player";
         return ownerName = aName;
     }
 
@@ -741,7 +741,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             return allowRightclick(aPlayer) && onRightClick(aPlayer, side, aX, aY, aZ);
         } catch (Throwable e) {
             GT_FML_LOGGER.error("onBlockActivated Failed", e);
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
             return true;
         }
     }
@@ -752,7 +752,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             // Configure Cover, sneak can also be: screwdriver, wrench, side cutter, soldering iron
             if (aPlayer.isSneaking()) {
                 final ForgeDirection tSide = (getCoverIDAtSide(side) == 0)
-                    ? GT_Utility.determineWrenchingSide(side, aX, aY, aZ)
+                    ? GTUtility.determineWrenchingSide(side, aX, aY, aZ)
                     : side;
                 return (getCoverBehaviorAtSideNew(tSide).hasCoverGUI());
             } else if (getCoverBehaviorAtSideNew(side).onCoverRightclickClient(side, this, aPlayer, aX, aY, aZ)) {
@@ -764,37 +764,37 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             if (!privateAccess() || aPlayer.getDisplayName()
                 .equalsIgnoreCase(getOwnerName())) {
                 final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
-                final ForgeDirection wrenchSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
+                final ForgeDirection wrenchSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
 
                 if (tCurrentItem != null) {
                     if (getColorization() >= 0
-                        && GT_Utility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
+                        && GTUtility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
                         // TODO (Colorization)
                     }
 
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList))
                         return onWrenchRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sScrewdriverList))
                         return onScrewdriverRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sHardHammerList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sHardHammerList))
                         return onHammerRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSoftHammerList))
                         return onMalletRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList))
                         return onSolderingRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWireCutterList))
                         return onWireCutterRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
 
                     final ForgeDirection coverSide = getCoverIDAtSide(side) == 0 ? wrenchSide : side;
 
                     if (getCoverIDAtSide(coverSide) == 0) {
-                        if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCovers.keySet())) {
-                            if (GregTech_API.getCoverBehaviorNew(tCurrentItem)
+                        if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCovers.keySet())) {
+                            if (GregTechAPI.getCoverBehaviorNew(tCurrentItem)
                                 .isCoverPlaceable(coverSide, tCurrentItem, this)
-                                && allowCoverOnSide(coverSide, new GT_ItemStack(tCurrentItem))) {
+                                && allowCoverOnSide(coverSide, new GTItemStack(tCurrentItem))) {
                                 setCoverItemAtSide(coverSide, tCurrentItem);
                                 if (!aPlayer.capabilities.isCreativeMode) tCurrentItem.stackSize--;
-                                GT_Utility.sendSoundToPlayers(
+                                GTUtility.sendSoundToPlayers(
                                     worldObj,
                                     SoundResource.IC2_TOOLS_WRENCH,
                                     1.0F,
@@ -808,9 +808,9 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                             return true;
                         }
                     } else {
-                        if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList)) {
-                            if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
-                                GT_Utility.sendSoundToPlayers(
+                        if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCrowbarList)) {
+                            if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                                GTUtility.sendSoundToPlayers(
                                     worldObj,
                                     SoundResource.RANDOM_BREAK,
                                     1.0F,
@@ -825,7 +825,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                         }
                     }
                 } else if (aPlayer.isSneaking()) { // Sneak click, no tool -> open cover config if possible.
-                    side = (getCoverIDAtSide(side) == 0) ? GT_Utility.determineWrenchingSide(side, aX, aY, aZ) : side;
+                    side = (getCoverIDAtSide(side) == 0) ? GTUtility.determineWrenchingSide(side, aX, aY, aZ) : side;
                     return getCoverIDAtSide(side) > 0 && getCoverBehaviorAtSideNew(side).onCoverShiftRightClick(
                         side,
                         getCoverIDAtSide(side),
@@ -867,7 +867,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             return false;
         }
 
-        GT_UIInfos.openGTTileEntityUI(this, aPlayer);
+        GTUIInfos.openGTTileEntityUI(this, aPlayer);
         System.out.println("Trying to open a UI");
         return true;
     }
@@ -875,15 +875,15 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     public boolean onWrenchRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
         float aY, float aZ, ItemStack aTool) {
         if (setMainFacing(wrenchSide)) {
-            GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
-            GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
+            GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
+            GTUtility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
         }
         return onWrenchRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
     }
 
     public boolean onScrewdriverRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide,
         float aX, float aY, float aZ, ItemStack aTool) {
-        if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
+        if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
             setCoverDataAtSide(
                 wrenchSide,
                 getCoverBehaviorAtSideNew(wrenchSide).onCoverScrewdriverClick(
@@ -896,7 +896,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                     aY,
                     aZ));
             // TODO: Update connections!
-            GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
+            GTUtility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
         }
         return onScrewdriverRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
     }
@@ -1033,20 +1033,20 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     /**
      * @return a Packet containing all Data which has to be synchronised to the Client - Override as needed
      */
-    public GT_Packet_MultiTileEntity getClientDataPacket() {
+    public GTPacketMultiTileEntity getClientDataPacket() {
 
-        final GT_Packet_MultiTileEntity packet = new GT_Packet_MultiTileEntity(false);
+        final GTPacketMultiTileEntity packet = new GTPacketMultiTileEntity(false);
         return packet;
     }
 
     @Override
     public void sendClientData(EntityPlayerMP aPlayer) {
         if (worldObj == null || worldObj.isRemote) return;
-        final GT_Packet_New tPacket = getClientDataPacket();
+        final GTPacketNew tPacket = getClientDataPacket();
         if (aPlayer == null) {
-            GT_Values.NW.sendPacketToAllPlayersInRange(worldObj, tPacket, getXCoord(), getZCoord());
+            GTValues.NW.sendPacketToAllPlayersInRange(worldObj, tPacket, getXCoord(), getZCoord());
         } else {
-            GT_Values.NW.sendToPlayer(tPacket, aPlayer);
+            GTValues.NW.sendToPlayer(tPacket, aPlayer);
         }
         sendCoverDataIfNeeded();
     }
@@ -1339,20 +1339,20 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     }
 
     @Override
-    public void getFullPacketData(GT_Packet_MultiTileEntity packet) {
+    public void getFullPacketData(GTPacketMultiTileEntity packet) {
         packet.addData(new CoordinateData(getCoords()));
         packet.addData(new CommonData(mStrongRedstone, color, (byte) 0));
         packet.addData(new MultiTileEntityData(mteRegistry, mteID));
     }
 
     @Override
-    public void getGraphicPacketData(GT_Packet_MultiTileEntity packet) {
+    public void getGraphicPacketData(GTPacketMultiTileEntity packet) {
         packet.addData(new CoordinateData(getCoords()));
         packet.addData(new MultiTileEntityData(mteRegistry, mteID));
     }
 
     @Override
-    public void getTimedPacketData(GT_Packet_MultiTileEntity packet) {
+    public void getTimedPacketData(GTPacketMultiTileEntity packet) {
         packet.addData(new CoordinateData(getCoords()));
         packet.addData(new MultiTileEntityData(mteRegistry, mteID));
     }
@@ -1361,21 +1361,21 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     public void sendFullPacket(@Nonnull EntityPlayerMP player) {
         fullPacket.clearData();
         getFullPacketData(fullPacket);
-        GT_Values.NW.sendToPlayer(fullPacket, player);
+        GTValues.NW.sendToPlayer(fullPacket, player);
     }
 
     @Override
     public void sendGraphicPacket() {
         graphicPacket.clearData();
         getGraphicPacketData(graphicPacket);
-        GT_Values.NW.sendPacketToAllPlayersInRange(worldObj, graphicPacket, getXCoord(), getZCoord());
+        GTValues.NW.sendPacketToAllPlayersInRange(worldObj, graphicPacket, getXCoord(), getZCoord());
     }
 
     @Override
     public void sendTimedPacket() {
         timedPacket.clearData();
         getTimedPacketData(timedPacket);
-        GT_Values.NW.sendPacketToAllPlayersInRange(worldObj, timedPacket, getXCoord(), getZCoord());
+        GTValues.NW.sendPacketToAllPlayersInRange(worldObj, timedPacket, getXCoord(), getZCoord());
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/multitileentity/base/NonTickableMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/NonTickableMultiTileEntity.java
index 2837a88180..7866ad69dc 100644
--- a/src/main/java/gregtech/api/multitileentity/base/NonTickableMultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/NonTickableMultiTileEntity.java
@@ -1,12 +1,12 @@
 package gregtech.api.multitileentity.base;
 
-import static gregtech.api.enums.GT_Values.NW;
+import static gregtech.api.enums.GTValues.NW;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.Packet;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.net.GT_Packet_SendCoverData;
+import gregtech.api.net.GTPacketSendCoverData;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.covers.CoverInfo;
 
@@ -45,7 +45,7 @@ public abstract class NonTickableMultiTileEntity extends MultiTileEntity {
         } else {
             // Otherwise, send the data right away
             final CoverInfo coverInfo = getCoverInfoAtSide(side);
-            NW.sendPacketToAllPlayersInRange(worldObj, new GT_Packet_SendCoverData(coverInfo, this), xCoord, zCoord);
+            NW.sendPacketToAllPlayersInRange(worldObj, new GTPacketSendCoverData(coverInfo, this), xCoord, zCoord);
 
             // Just in case
             coverInfo.setNeedsUpdate(false);
diff --git a/src/main/java/gregtech/api/multitileentity/base/TickableMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/TickableMultiTileEntity.java
index 987a4c18b3..dfc600483b 100644
--- a/src/main/java/gregtech/api/multitileentity/base/TickableMultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/TickableMultiTileEntity.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity.base;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -14,11 +14,11 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.task.TaskHost;
 import gregtech.api.task.TickableTask;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtil;
 
 public abstract class TickableMultiTileEntity extends MultiTileEntity implements TaskHost {
 
@@ -57,7 +57,7 @@ public abstract class TickableMultiTileEntity extends MultiTileEntity implements
         try {
             if (timer++ == 0) {
                 markDirty();
-                GT_Util.markChunkDirty(this);
+                GTUtil.markChunkDirty(this);
                 onFirstTick(isServerSide);
             }
             if (isDead()) {
@@ -80,7 +80,7 @@ public abstract class TickableMultiTileEntity extends MultiTileEntity implements
 
         } catch (Throwable e) {
             GT_FML_LOGGER.error("UpdateEntity Failed", e);
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
             try {
                 onTickFailed(timer, isServerSide);
             } catch (Throwable e2) {
@@ -133,8 +133,8 @@ public abstract class TickableMultiTileEntity extends MultiTileEntity implements
 
     @Override
     protected final void readTasksNBT(NBTTagCompound nbt) {
-        if (nbt.hasKey(GT_Values.NBT.TASKS)) {
-            NBTTagCompound tasksTag = nbt.getCompoundTag(GT_Values.NBT.TASKS);
+        if (nbt.hasKey(GTValues.NBT.TASKS)) {
+            NBTTagCompound tasksTag = nbt.getCompoundTag(GTValues.NBT.TASKS);
             for (TickableTask<?> task : tasks.values()) {
                 if (tasksTag.hasKey(task.getName())) {
                     task.readFromNBT(tasksTag.getCompoundTag(task.getName()));
@@ -151,7 +151,7 @@ public abstract class TickableMultiTileEntity extends MultiTileEntity implements
             task.writeToNBT(tag);
             tasksTag.setTag(task.getName(), tag);
         }
-        aNBT.setTag(GT_Values.NBT.TASKS, tasksTag);
+        aNBT.setTag(GTValues.NBT.TASKS, tasksTag);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileCasing.java b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileCasing.java
index 73bd55738a..4efaff34d7 100644
--- a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileCasing.java
+++ b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileCasing.java
@@ -3,7 +3,7 @@ package gregtech.api.multitileentity.enums;
 import static gregtech.api.util.GT_StructureUtilityMuTE.createMuTEStructureCasing;
 import static gregtech.loaders.preload.GT_Loader_MultiTileEntities.CASING_REGISTRY_NAME;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.util.GT_StructureUtilityMuTE;
 
 public enum GT_MultiTileCasing {
@@ -19,7 +19,7 @@ public enum GT_MultiTileCasing {
     LaserEngraverUpgrade2(8),
     LaserEngraverUpgrade3(9),
     LaserEngraverUpgrade4(10),
-    NONE(GT_Values.W);
+    NONE(GTValues.W);
 
     private final int meta;
     private final GT_StructureUtilityMuTE.MuTEStructureCasing casing;
diff --git a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileComponentCasing.java b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileComponentCasing.java
index e062ecc705..431da32353 100644
--- a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileComponentCasing.java
+++ b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileComponentCasing.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity.enums;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 
 public enum GT_MultiTileComponentCasing {
 
@@ -116,7 +116,7 @@ public enum GT_MultiTileComponentCasing {
     UMV_FieldGenerator(109),
     UXV_FieldGenerator(110),
     MAX_FieldGenerator(111),
-    NONE(GT_Values.W);
+    NONE(GTValues.W);
 
     private final int meta;
 
diff --git a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileMachine.java b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileMachine.java
index 7cdde78986..6787ab00d7 100644
--- a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileMachine.java
+++ b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileMachine.java
@@ -1,11 +1,11 @@
 package gregtech.api.multitileentity.enums;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 
 public enum GT_MultiTileMachine {
 
     CokeOven(0),
-    NONE(GT_Values.W);
+    NONE(GTValues.W);
 
     private final int meta;
 
diff --git a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileUpgradeCasing.java b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileUpgradeCasing.java
index 296bae546d..5acdd5aeef 100644
--- a/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileUpgradeCasing.java
+++ b/src/main/java/gregtech/api/multitileentity/enums/GT_MultiTileUpgradeCasing.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity.enums;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 
 public enum GT_MultiTileUpgradeCasing {
 
@@ -57,7 +57,7 @@ public enum GT_MultiTileUpgradeCasing {
     Insulator_NextGen(107),
     Insulator_Omnipotent(108),
     Insulator_OmegaType(109),
-    NONE(GT_Values.W);
+    NONE(GTValues.W);
 
     private final int meta;
 
diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java
index 2045f28d67..0f959c6bce 100644
--- a/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java
@@ -4,7 +4,7 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 
-import gregtech.api.net.GT_Packet_MultiTileEntity;
+import gregtech.api.net.GTPacketMultiTileEntity;
 
 public interface SyncedMultiTileEntity {
 
@@ -19,10 +19,10 @@ public interface SyncedMultiTileEntity {
     /**
      * Should always collect all the data that the controller or casing has and should send
      * Called by {@link #sendFullPacket()}
-     * 
+     *
      * @param packet The packet which will be sent
      */
-    void getFullPacketData(GT_Packet_MultiTileEntity packet);
+    void getFullPacketData(GTPacketMultiTileEntity packet);
 
     /**
      * Will send a packet at a certain period of time, defined by {@link #getTimedPacketPeriod()}, to all players around
@@ -35,10 +35,10 @@ public interface SyncedMultiTileEntity {
      * Collects all the data that should be sent out at a certain period of time defined by
      * {@link #getTimedPacketPeriod()}
      * Called by {@link #sendTimedPacket()}
-     * 
+     *
      * @param packet The packet which will be sent
      */
-    void getTimedPacketData(GT_Packet_MultiTileEntity packet);
+    void getTimedPacketData(GTPacketMultiTileEntity packet);
 
     /**
      * Defines the period of time at which a timed packet should be sent out. Default 20 ticks
@@ -56,8 +56,8 @@ public interface SyncedMultiTileEntity {
     /**
      * Collects all the data that is needed to be send every single tick
      * Called by {@link #sendGraphicPacket()}
-     * 
+     *
      * @param packet The packet which will be sent
      */
-    void getGraphicPacketData(GT_Packet_MultiTileEntity packet);
+    void getGraphicPacketData(GTPacketMultiTileEntity packet);
 }
diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
index 0953b4905c..32b87126ca 100644
--- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
+++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity.machine;
 
-import static gregtech.api.enums.GT_Values.*;
+import static gregtech.api.enums.GTValues.*;
 import static gregtech.api.enums.TickTime.MINUTE;
 
 import java.io.IOException;
@@ -30,8 +30,8 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.enums.GTValues;
+import gregtech.api.enums.GTValues.NBT;
 import gregtech.api.enums.InventoryType;
 import gregtech.api.enums.Mods;
 import gregtech.api.enums.SoundResource;
@@ -55,8 +55,8 @@ import gregtech.api.multitileentity.base.TickableMultiTileEntity;
 import gregtech.api.multitileentity.interfaces.IMultiTileMachine;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.task.tasks.ProcessingTask;
-import gregtech.api.util.GT_Utility;
-import gregtech.client.GT_SoundLoop;
+import gregtech.api.util.GTUtility;
+import gregtech.client.GTSoundLoop;
 import gregtech.common.gui.MachineGUIProvider;
 
 public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> extends TickableMultiTileEntity
@@ -106,7 +106,7 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
     protected GUIProvider<?> guiProvider = createGUIProvider();
 
     @SideOnly(Side.CLIENT)
-    protected GT_SoundLoop activitySoundLoop;
+    protected GTSoundLoop activitySoundLoop;
 
     public MultiTileBasicMachine() {
         new ProcessingTask<>(this);
@@ -388,16 +388,16 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
         switch (aIndex) {
             case PROCESS_START_SOUND_INDEX -> {
                 if (getProcessStartSound() != null)
-                    GT_Utility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
+                    GTUtility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
             }
-            case INTERRUPT_SOUND_INDEX -> GT_Utility
+            case INTERRUPT_SOUND_INDEX -> GTUtility
                 .doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ);
         }
     }
 
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         if (aIndex == PROCESS_START_SOUND_INDEX && getProcessStartSound() != null) {
-            GT_Utility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
         }
     }
 
@@ -412,7 +412,7 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
     @SideOnly(Side.CLIENT)
     protected void doActivitySound(ResourceLocation activitySound) {
         if (isActive() && activitySound != null && activitySoundLoop == null) {
-            activitySoundLoop = new GT_SoundLoop(activitySound, this, false, true);
+            activitySoundLoop = new GTSoundLoop(activitySound, this, false, true);
             Minecraft.getMinecraft()
                 .getSoundHandler()
                 .playSound(activitySoundLoop);
@@ -549,7 +549,7 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
     @Override
     protected void addDebugInfo(EntityPlayer player, int logLevel, ArrayList<String> list) {
         list.add(
-            GT_Utility.trans("186", "Owned by: ") + EnumChatFormatting.BLUE
+            GTUtility.trans("186", "Owned by: ") + EnumChatFormatting.BLUE
                 + getOwnerName()
                 + EnumChatFormatting.RESET
                 + " ("
@@ -567,30 +567,30 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
             list.add(
                 StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
                     + EnumChatFormatting.GREEN
-                    + GT_Utility.formatNumbers(logic.getStoredEnergy())
+                    + GTUtility.formatNumbers(logic.getStoredEnergy())
                     + EnumChatFormatting.RESET
                     + " EU / "
                     + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(logic.getCapacity())
+                    + GTUtility.formatNumbers(logic.getCapacity())
                     + EnumChatFormatting.RESET
                     + " EU");
             list.add(
                 StatCollector.translateToLocal("GT5U.multiblock.usage") + ": "
                     + EnumChatFormatting.RED
-                    + GT_Utility.formatNumbers(getProcessingLogic().getCalculatedEut())
+                    + GTUtility.formatNumbers(getProcessingLogic().getCalculatedEut())
                     + EnumChatFormatting.RESET
                     + " EU/t");
             list.add(
                 StatCollector.translateToLocal("GT5U.multiblock.mei") + ": "
                     + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(logic.getVoltage())
+                    + GTUtility.formatNumbers(logic.getVoltage())
                     + EnumChatFormatting.RESET
                     // TODO: Put ampere getter here, once that's variable
                     + " EU/t(*2A) "
                     + StatCollector.translateToLocal("GT5U.machines.tier")
                     + ": "
                     + EnumChatFormatting.YELLOW
-                    + VN[GT_Utility.getTier(logic.getVoltage())]
+                    + VN[GTUtility.getTier(logic.getVoltage())]
                     + EnumChatFormatting.RESET);
         }
 
@@ -598,11 +598,11 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
 
         // TODO: Add CPU load calculator
         list.add(
-            "Average CPU load of ~" + GT_Utility.formatNumbers(0)
+            "Average CPU load of ~" + GTUtility.formatNumbers(0)
                 + "ns over "
-                + GT_Utility.formatNumbers(0)
+                + GTUtility.formatNumbers(0)
                 + " ticks with worst time of "
-                + GT_Utility.formatNumbers(0)
+                + GTUtility.formatNumbers(0)
                 + "ns.");
     }
 
@@ -613,11 +613,11 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
         list.add(
             StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(progressTime > 20 ? progressTime / 20 : progressTime)
+                + GTUtility.formatNumbers(progressTime > 20 ? progressTime / 20 : progressTime)
                 + EnumChatFormatting.RESET
                 + (progressTime > 20 ? " s / " : " ticks / ")
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxProgressTime > 20 ? maxProgressTime / 20 : maxProgressTime)
+                + GTUtility.formatNumbers(maxProgressTime > 20 ? maxProgressTime / 20 : maxProgressTime)
                 + EnumChatFormatting.RESET
                 + (maxProgressTime > 20 ? " s" : " ticks"));
     }
@@ -678,7 +678,7 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
 
         switch (soundEventValue) {
             case PROCESS_START_SOUND_INDEX -> {
-                if (getProcessStartSound() != null) GT_Utility.doSoundAtClient(
+                if (getProcessStartSound() != null) GTUtility.doSoundAtClient(
                     getProcessStartSound(),
                     getTimeBetweenProcessSounds(),
                     1.0F,
@@ -686,7 +686,7 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
                     getYCoord(),
                     getZCoord());
             }
-            case INTERRUPT_SOUND_INDEX -> GT_Utility.doSoundAtClient(
+            case INTERRUPT_SOUND_INDEX -> GTUtility.doSoundAtClient(
                 SoundResource.IC2_MACHINES_INTERRUPT_ONE,
                 100,
                 1.0F,
@@ -765,8 +765,8 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
     }
 
     protected void updatePowerLogic() {
-        power.setEnergyCapacity(GT_Values.V[tier] * power.getMaxAmperage() * 2 * MINUTE);
-        power.setMaxVoltage(GT_Values.V[tier]);
+        power.setEnergyCapacity(GTValues.V[tier] * power.getMaxAmperage() * 2 * MINUTE);
+        power.setMaxVoltage(GTValues.V[tier]);
         power.setMaxAmperage(1);
     }
 
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/ComplexParallelController.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/ComplexParallelController.java
index cdcb77d6e5..3abb69dd51 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/ComplexParallelController.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/ComplexParallelController.java
@@ -15,8 +15,8 @@ import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import gregtech.api.logic.ComplexParallelProcessingLogic;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.GT_Waila;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.GTWaila;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
@@ -56,12 +56,12 @@ public abstract class ComplexParallelController<C extends ComplexParallelControl
                     + (i + 1)
                     + ": "
                     + EnumChatFormatting.GREEN
-                    + GT_Utility.formatNumbers(
+                    + GTUtility.formatNumbers(
                         processing.getProgress(i) > 20 ? processing.getProgress(i) / 20 : processing.getProgress(i))
                     + EnumChatFormatting.RESET
                     + (processing.getProgress(i) > 20 ? " s / " : " ticks / ")
                     + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(
+                    + GTUtility.formatNumbers(
                         processing.getDuration(i) > 20 ? processing.getDuration(i) / 20 : processing.getDuration(i))
                     + EnumChatFormatting.RESET
                     + (processing.getDuration(i) > 20 ? " s" : " ticks"));
@@ -92,7 +92,7 @@ public abstract class ComplexParallelController<C extends ComplexParallelControl
             currentTip.add(
                 "Process " + (i + 1)
                     + ": "
-                    + GT_Waila
+                    + GTWaila
                         .getMachineProgressString(maxProgress > 0 && maxProgress >= progress, maxProgress, progress));
         }
     }
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
index 552cf6d94e..1eaae5997d 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity.multiblock.base;
 
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 import static gregtech.common.misc.WirelessNetworkManager.strongCheckOrAddUser;
 import static mcp.mobius.waila.api.SpecialChars.*;
 
@@ -46,7 +46,7 @@ import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 
 import cpw.mods.fml.common.network.NetworkRegistry;
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.enums.GTValues.NBT;
 import gregtech.api.enums.InventoryType;
 import gregtech.api.enums.VoidingMode;
 import gregtech.api.interfaces.IDescribable;
@@ -64,11 +64,11 @@ import gregtech.api.multitileentity.interfaces.IMultiBlockPart;
 import gregtech.api.multitileentity.machine.MultiTileBasicMachine;
 import gregtech.api.multitileentity.multiblock.casing.FunctionalCasing;
 import gregtech.api.multitileentity.multiblock.casing.UpgradeCasing;
-import gregtech.api.net.GT_Packet_MultiTileEntity;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.GT_Waila;
+import gregtech.api.net.GTPacketMultiTileEntity;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.GTWaila;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
@@ -81,7 +81,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
     public static final String ALL_INVENTORIES_NAME = "all";
     protected static final int AUTO_OUTPUT_FREQUENCY_TICK = 20;
 
-    private static final Map<Integer, GT_Multiblock_Tooltip_Builder> tooltip = new ConcurrentHashMap<>();
+    private static final Map<Integer, MultiblockTooltipBuilder> tooltip = new ConcurrentHashMap<>();
     private final List<WeakTargetRef<UpgradeCasing>> upgradeCasings = new ArrayList<>();
     private final List<WeakTargetRef<FunctionalCasing>> functionalCasings = new ArrayList<>();
     protected BuildState buildState = new BuildState();
@@ -131,7 +131,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
     /**
      * Create the tooltip for this multi block controller.
      */
-    protected abstract GT_Multiblock_Tooltip_Builder createTooltip();
+    protected abstract MultiblockTooltipBuilder createTooltip();
 
     /**
      * @return The starting offset for the structure builder
@@ -269,8 +269,8 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
         return getMultiTileEntityRegistryID() << 16 + getMultiTileEntityID();
     }
 
-    protected GT_Multiblock_Tooltip_Builder getTooltip() {
-        GT_Multiblock_Tooltip_Builder builder = tooltip.get(getToolTipID());
+    protected MultiblockTooltipBuilder getTooltip() {
+        MultiblockTooltipBuilder builder = tooltip.get(getToolTipID());
         if (builder == null) {
             builder = createTooltip();
             tooltip.put(getToolTipID(), builder);
@@ -423,7 +423,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
         if (aPlayer.isSneaking()) {
             // we won't be allowing horizontal flips, as it can be perfectly emulated by rotating twice and flipping
             // horizontally allowing an extra round of flip make it hard to draw meaningful flip markers in
-            // GT_Proxy#drawGrid
+            // GTProxy#drawGrid
             toolSetFlip(getFlip().isHorizontallyFlipped() ? Flip.NONE : Flip.HORIZONTAL);
         } else {
             toolSetRotation(null);
@@ -615,7 +615,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         return side != facing;
     }
 
@@ -992,7 +992,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
         if (isSimpleMachine) {
             boolean isActive = tag.getBoolean("isActive");
             currentTip.add(
-                GT_Waila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
+                GTWaila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
         }
         boolean isActive = tag.getBoolean("isActive");
         if (isActive) {
@@ -1002,23 +1002,23 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
                 currentTip.add(
                     StatCollector.translateToLocalFormatted(
                         "GT5U.waila.energy.use_with_amperage",
-                        GT_Utility.formatNumbers(actualEnergyUsage),
-                        GT_Utility.getAmperageForTier(actualEnergyUsage, (byte) energyTier),
-                        GT_Utility.getColoredTierNameFromTier((byte) energyTier)));
+                        GTUtility.formatNumbers(actualEnergyUsage),
+                        GTUtility.getAmperageForTier(actualEnergyUsage, (byte) energyTier),
+                        GTUtility.getColoredTierNameFromTier((byte) energyTier)));
             } else if (actualEnergyUsage < 0) {
                 currentTip.add(
                     StatCollector.translateToLocalFormatted(
                         "GT5U.waila.energy.produce_with_amperage",
-                        GT_Utility.formatNumbers(-actualEnergyUsage),
-                        GT_Utility.getAmperageForTier(-actualEnergyUsage, (byte) energyTier),
-                        GT_Utility.getColoredTierNameFromTier((byte) energyTier)));
+                        GTUtility.formatNumbers(-actualEnergyUsage),
+                        GTUtility.getAmperageForTier(-actualEnergyUsage, (byte) energyTier),
+                        GTUtility.getColoredTierNameFromTier((byte) energyTier)));
             }
         }
     }
 
     @Override
-    public GT_Packet_MultiTileEntity getClientDataPacket() {
-        final GT_Packet_MultiTileEntity packet = super.getClientDataPacket();
+    public GTPacketMultiTileEntity getClientDataPacket() {
+        final GTPacketMultiTileEntity packet = super.getClientDataPacket();
 
         return packet;
 
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
index 5a16ed4b38..2c3cafc67d 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
@@ -1,7 +1,7 @@
 package gregtech.api.multitileentity.multiblock.base;
 
 import static com.google.common.math.LongMath.log2;
-import static gregtech.api.enums.GT_Values.B;
+import static gregtech.api.enums.GTValues.B;
 import static gregtech.api.enums.Textures.BlockIcons.FLUID_IN_SIGN;
 import static gregtech.api.enums.Textures.BlockIcons.FLUID_OUT_SIGN;
 import static gregtech.api.enums.Textures.BlockIcons.ITEM_IN_SIGN;
@@ -36,9 +36,9 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow.Builder;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.enums.GTValues.NBT;
 import gregtech.api.enums.InventoryType;
-import gregtech.api.fluid.FluidTankGT;
+import gregtech.api.fluid.GTFluidTank;
 import gregtech.api.gui.GUIHost;
 import gregtech.api.gui.GUIProvider;
 import gregtech.api.interfaces.ITexture;
@@ -54,7 +54,7 @@ import gregtech.api.multitileentity.enums.MultiTileCasingPurpose;
 import gregtech.api.multitileentity.interfaces.IMultiBlockController;
 import gregtech.api.multitileentity.interfaces.IMultiBlockPart;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.common.covers.CoverInfo;
 import gregtech.common.gui.PartGUIProvider;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -80,7 +80,7 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity
 
     protected UUID lockedInventory;
     protected int mLockedInventoryIndex = 0;
-    protected FluidTankGT configurationTank = new FluidTankGT();
+    protected GTFluidTank configurationTank = new GTFluidTank();
 
     @Nonnull
     protected final GUIProvider<?> guiProvider = createGUIProvider();
@@ -436,7 +436,7 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity
         if (aPlayer.isSneaking()) {
             facing = wrenchSide;
         }
-        GT_Utility.sendChatToPlayer(aPlayer, "Mode set to `" + getModeName(mode) + "' (" + mode + ")");
+        GTUtility.sendChatToPlayer(aPlayer, "Mode set to `" + getModeName(mode) + "' (" + mode + ")");
         sendClientData((EntityPlayerMP) aPlayer);
         return true;
     }
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/casing/FunctionalCasing.java b/src/main/java/gregtech/api/multitileentity/multiblock/casing/FunctionalCasing.java
index bc3c857fd6..d48bbd03fd 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/casing/FunctionalCasing.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/casing/FunctionalCasing.java
@@ -2,7 +2,7 @@ package gregtech.api.multitileentity.multiblock.casing;
 
 import net.minecraft.nbt.NBTTagCompound;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.multitileentity.multiblock.base.MultiBlockPart;
 
 public abstract class FunctionalCasing extends MultiBlockPart {
@@ -19,7 +19,7 @@ public abstract class FunctionalCasing extends MultiBlockPart {
     @Override
     public void readMultiTileNBT(NBTTagCompound nbt) {
         super.readMultiTileNBT(nbt);
-        tier = nbt.getInteger(GT_Values.NBT.TIER);
+        tier = nbt.getInteger(GTValues.NBT.TIER);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/casing/UpgradeCasing.java b/src/main/java/gregtech/api/multitileentity/multiblock/casing/UpgradeCasing.java
index 566afcd770..ae5b36c1e0 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/casing/UpgradeCasing.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/casing/UpgradeCasing.java
@@ -2,7 +2,7 @@ package gregtech.api.multitileentity.multiblock.casing;
 
 import net.minecraft.nbt.NBTTagCompound;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.multitileentity.interfaces.IMultiBlockController;
 import gregtech.api.multitileentity.multiblock.base.MultiBlockPart;
 
@@ -27,7 +27,7 @@ public abstract class UpgradeCasing extends MultiBlockPart {
     @Override
     public void readMultiTileNBT(NBTTagCompound aNBT) {
         super.readMultiTileNBT(aNBT);
-        tier = aNBT.getInteger(GT_Values.NBT.TIER);
+        tier = aNBT.getInteger(GTValues.NBT.TIER);
     }
 
     protected abstract void customWork(IMultiBlockController aTarget);