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

39 files changed, 1018 insertions, 1097 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicBatteryBuffer.java
index cff63caeb5..7ca8cce273 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicBatteryBuffer.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import java.util.List;
 
@@ -20,14 +20,14 @@ import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import ic2.api.item.IElectricItem;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -38,8 +38,7 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_TieredMachineBlock
-    implements IAddUIWidgets {
+public class MTEBasicBatteryBuffer extends MTETieredMachineBlock implements IAddUIWidgets {
 
     public boolean mCharge = false, mDecharge = false;
     public int mBatteryCount = 0, mChargeableCount = 0;
@@ -47,18 +46,18 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
     private long mStored = 0;
     private long mMax = 0;
 
-    public GT_MetaTileEntity_BasicBatteryBuffer(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription, int aSlotCount) {
+    public MTEBasicBatteryBuffer(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+        int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_BasicBatteryBuffer(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+    public MTEBasicBatteryBuffer(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
         int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicBatteryBuffer(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures, int aSlotCount) {
+    public MTEBasicBatteryBuffer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
+        int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
 
@@ -91,7 +90,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BasicBatteryBuffer(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
+        return new MTEBasicBatteryBuffer(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
     }
 
     @Override
@@ -216,7 +215,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -227,8 +226,8 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
             mDecharge = aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity() / 3;
             mBatteryCount = 0;
             mChargeableCount = 0;
-            for (ItemStack tStack : mInventory) if (GT_ModHandler.isElectricItem(tStack, mTier)) {
-                if (GT_ModHandler.isChargerItem(tStack)) mBatteryCount++;
+            for (ItemStack tStack : mInventory) if (GTModHandler.isElectricItem(tStack, mTier)) {
+                if (GTModHandler.isChargerItem(tStack)) mBatteryCount++;
                 mChargeableCount++;
             }
         }
@@ -238,7 +237,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
     @Override
     public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        if (GT_ModHandler.isElectricItem(aStack) && aStack.getUnlocalizedName()
+        if (GTModHandler.isElectricItem(aStack) && aStack.getUnlocalizedName()
             .startsWith("gt.metaitem.01.")) {
             String name = aStack.getUnlocalizedName();
             if (name.equals("gt.metaitem.01.32510") || name.equals("gt.metaitem.01.32511")
@@ -255,10 +254,10 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
     @Override
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        if (!GT_Utility.isStackValid(aStack)) {
+        if (!GTUtility.isStackValid(aStack)) {
             return false;
         }
-        return mInventory[aIndex] == null && GT_ModHandler.isElectricItem(aStack, this.mTier);
+        return mInventory[aIndex] == null && GTModHandler.isElectricItem(aStack, this.mTier);
     }
 
     @Override
@@ -274,16 +273,16 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
         long tStep = 0;
         if (mInventory != null) {
             for (ItemStack aStack : mInventory) {
-                if (GT_ModHandler.isElectricItem(aStack)) {
+                if (GTModHandler.isElectricItem(aStack)) {
 
-                    if (aStack.getItem() instanceof GT_MetaBase_Item) {
-                        Long[] stats = ((GT_MetaBase_Item) aStack.getItem()).getElectricStats(aStack);
+                    if (aStack.getItem() instanceof MetaBaseItem) {
+                        Long[] stats = ((MetaBaseItem) aStack.getItem()).getElectricStats(aStack);
                         if (stats != null) {
                             if (stats[0] > Long.MAX_VALUE / 2) {
                                 scaleOverflow = true;
                             }
                             tScale = tScale + stats[0];
-                            tStep = ((GT_MetaBase_Item) aStack.getItem()).getRealCharge(aStack);
+                            tStep = ((MetaBaseItem) aStack.getItem()).getRealCharge(aStack);
                             if (tStep > Long.MAX_VALUE / 2) {
                                 storedOverflow = true;
                             }
@@ -310,15 +309,15 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
         updateStorageInfo();
 
         return new String[] { EnumChatFormatting.BLUE + getLocalName() + EnumChatFormatting.RESET, "Stored Items:",
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mStored)
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(mStored)
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mMax)
+                + GTUtility.formatNumbers(mMax)
                 + EnumChatFormatting.RESET
                 + " EU",
-            "Average input:", GT_Utility.formatNumbers(getBaseMetaTileEntity().getAverageElectricInput()) + " EU/t",
-            "Average output:", GT_Utility.formatNumbers(getBaseMetaTileEntity().getAverageElectricOutput()) + " EU/t" };
+            "Average input:", GTUtility.formatNumbers(getBaseMetaTileEntity().getAverageElectricInput()) + " EU/t",
+            "Average output:", GTUtility.formatNumbers(getBaseMetaTileEntity().getAverageElectricOutput()) + " EU/t" };
     }
 
     private void updateStorageInfo() {
@@ -337,22 +336,22 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
         currenttip.add(
             StatCollector.translateToLocalFormatted(
                 "GT5U.waila.energy.stored",
-                GT_Utility.formatNumbers(tag.getLong("mStored")),
-                GT_Utility.formatNumbers(tag.getLong("mMax"))));
+                GTUtility.formatNumbers(tag.getLong("mStored")),
+                GTUtility.formatNumbers(tag.getLong("mMax"))));
         long avgIn = tag.getLong("AvgIn");
         long avgOut = tag.getLong("AvgOut");
         currenttip.add(
             StatCollector.translateToLocalFormatted(
                 "GT5U.waila.energy.avg_in_with_amperage",
-                GT_Utility.formatNumbers(avgIn),
-                GT_Utility.getAmperageForTier(avgIn, (byte) getInputTier()),
-                GT_Utility.getColoredTierNameFromTier((byte) getInputTier())));
+                GTUtility.formatNumbers(avgIn),
+                GTUtility.getAmperageForTier(avgIn, (byte) getInputTier()),
+                GTUtility.getColoredTierNameFromTier((byte) getInputTier())));
         currenttip.add(
             StatCollector.translateToLocalFormatted(
                 "GT5U.waila.energy.avg_out_with_amperage",
-                GT_Utility.formatNumbers(avgOut),
-                GT_Utility.getAmperageForTier(avgOut, (byte) getOutputTier()),
-                GT_Utility.getColoredTierNameFromTier((byte) getOutputTier())));
+                GTUtility.formatNumbers(avgOut),
+                GTUtility.getAmperageForTier(avgOut, (byte) getOutputTier()),
+                GTUtility.getColoredTierNameFromTier((byte) getOutputTier())));
         super.getWailaBody(itemStack, currenttip, accessor, config);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java
index 7a968afc4b..ac923bc699 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicGenerator.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -12,36 +12,35 @@ import net.minecraftforge.fluids.IFluidHandler;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.RecipeMapWorkable;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.maps.FuelBackend;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Pollution;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.common.Pollution;
 
-public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity_BasicTank
-    implements RecipeMapWorkable {
+public abstract class MTEBasicGenerator extends MTEBasicTank implements RecipeMapWorkable {
 
-    public GT_MetaTileEntity_BasicGenerator(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+    public MTEBasicGenerator(int aID, String aName, String aNameRegional, int aTier, String aDescription,
         ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicGenerator(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription, ITexture... aTextures) {
+    public MTEBasicGenerator(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+        ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEBasicGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBasicGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
@@ -81,7 +80,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -219,7 +218,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
                     if (tFluidAmountToUse > 0
                         && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) {
                         // divided by two because this is called every 10 ticks, not 20
-                        GT_Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2);
+                        Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2);
                         mFluid.amount -= tFluidAmountToUse * tConsumed;
                     }
                 }
@@ -227,7 +226,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
 
             if (mInventory[getInputSlot()] != null
                 && aBaseMetaTileEntity.getUniversalEnergyStored() < (maxEUOutput() * 20 + getMinimumStoredEU())
-                && ((GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true) != null)
+                && ((GTUtility.getFluidForFilledItem(mInventory[getInputSlot()], true) != null)
                     || solidFuelOverride(mInventory[getInputSlot()]))) {
                 long tFuelValue = getFuelValue(mInventory[getInputSlot()]);
                 if (tFuelValue <= 0) tFuelValue = getFuelValue(mInventory[getInputSlot()], true);
@@ -238,7 +237,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
                         aBaseMetaTileEntity.increaseStoredEnergyUnits(tFuelValue, true);
                         aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
                         // divided by two because this is called every 10 ticks, not 20
-                        GT_Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2);
+                        Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2);
                     }
                 }
             }
@@ -255,11 +254,11 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
      */
     public boolean solidFuelOverride(ItemStack stack) {
         // this could be used for a coal generator for example aswell...
-        ItemData association = GT_OreDictUnificator.getAssociation(stack);
+        ItemData association = GTOreDictUnificator.getAssociation(stack);
         // if it is a gregtech Item, make sure its not a VOLUMETRIC_FLASK or any type of cell, else do vanilla checks
         if (association != null) {
             return !OrePrefixes.CELL_TYPES.contains(association.mPrefix)
-                && !GT_Utility.areStacksEqual(ItemList.VOLUMETRIC_FLASK.get(1L), stack, true);
+                && !GTUtility.areStacksEqual(ItemList.VOLUMETRIC_FLASK.get(1L), stack, true);
         } else {
             return stack != null && // when the stack is null its not a solid
                 stack.getItem() != null && // when the item in the stack is null its not a solid
@@ -293,7 +292,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
     public long getFuelValue(FluidStack aLiquid, boolean aLong) {
         RecipeMap<?> tRecipes = getRecipeMap();
         if (aLiquid == null || !(tRecipes.getBackend() instanceof FuelBackend tFuels)) return 0;
-        GT_Recipe tFuel = tFuels.findFuel(aLiquid);
+        GTRecipe tFuel = tFuels.findFuel(aLiquid);
         if (tFuel == null) return 0;
 
         return (long) tFuel.mSpecialValue * getEfficiency() * consumedFluidPerOperation(aLiquid) / 100;
@@ -305,8 +304,8 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
     }
 
     public long getFuelValue(ItemStack aStack, boolean aLong) {
-        if (GT_Utility.isStackInvalid(aStack) || getRecipeMap() == null) return 0;
-        GT_Recipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+        if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return 0;
+        GTRecipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
         if (tFuel == null) return 0;
 
         long liters = 10L; // 1000mb/100
@@ -314,17 +313,17 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
     }
 
     public ItemStack getEmptyContainer(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack) || getRecipeMap() == null) return null;
-        GT_Recipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
-        if (tFuel != null) return GT_Utility.copyOrNull(tFuel.getOutput(0));
-        return GT_Utility.getContainerItem(aStack, true);
+        if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return null;
+        GTRecipe tFuel = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+        if (tFuel != null) return GTUtility.copyOrNull(tFuel.getOutput(0));
+        return GTUtility.getContainerItem(aStack, true);
     }
 
     @Override
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
         return super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack) && (getFuelValue(aStack, true) > 0
-            || getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true), true) > 0);
+            || getFuelValue(GTUtility.getFluidForFilledItem(aStack, true), true) > 0);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHull.java
index e5766eee39..35b6003c24 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHull.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -11,31 +11,29 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public class GT_MetaTileEntity_BasicHull extends GT_MetaTileEntity_BasicTank {
+public class MTEBasicHull extends MTEBasicTank {
 
-    public GT_MetaTileEntity_BasicHull(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+    public MTEBasicHull(int aID, String aName, String aNameRegional, int aTier, String aDescription,
         ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, 1, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String aDescription, ITexture... aTextures) {
+    public MTEBasicHull(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription,
+        ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHull(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHull(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BasicHull(mName, mTier, mInventory.length, mDescriptionArray, mTextures);
+        return new MTEBasicHull(mName, mTier, mInventory.length, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull_NonElectric.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHullNonElectric.java
index b6584b50ab..ec01af0408 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicHull_NonElectric.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicHullNonElectric.java
@@ -5,20 +5,17 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public abstract class GT_MetaTileEntity_BasicHull_NonElectric extends GT_MetaTileEntity_BasicHull {
+public abstract class MTEBasicHullNonElectric extends MTEBasicHull {
 
-    public GT_MetaTileEntity_BasicHull_NonElectric(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription) {
+    public MTEBasicHullNonElectric(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_BasicHull_NonElectric(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHullNonElectric(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull_NonElectric(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHullNonElectric(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
index 377646f85a..25dfb9b58b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
@@ -1,7 +1,7 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.debugCleanroom;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.enums.GTValues.debugCleanroom;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_OUT;
 import static gregtech.api.metatileentity.BaseTileEntity.FLUID_TRANSFER_TOOLTIP;
@@ -14,9 +14,9 @@ import static gregtech.api.metatileentity.BaseTileEntity.STALLED_STUTTERING_TOOL
 import static gregtech.api.metatileentity.BaseTileEntity.STALLED_VENT_TOOLTIP;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
 import static gregtech.api.metatileentity.BaseTileEntity.UNUSED_SLOT_TOOLTIP;
-import static gregtech.api.util.GT_RecipeConstants.EXPLODE;
-import static gregtech.api.util.GT_RecipeConstants.ON_FIRE;
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTRecipeConstants.EXPLODE;
+import static gregtech.api.util.GTRecipeConstants.ON_FIRE;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 import static net.minecraftforge.common.util.ForgeDirection.DOWN;
 import static net.minecraftforge.common.util.ForgeDirection.UNKNOWN;
 import static net.minecraftforge.common.util.ForgeDirection.UP;
@@ -56,11 +56,11 @@ import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
 import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.SteamTexture;
 import gregtech.api.interfaces.ICleanroom;
 import gregtech.api.interfaces.IConfigurationCircuitSupport;
@@ -70,21 +70,21 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IOverclockDescriptionProvider;
 import gregtech.api.interfaces.tileentity.RecipeMapWorkable;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.overclockdescriber.EUOverclockDescriber;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.recipe.BasicUIProperties;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ClientPreference;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTClientPreference;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.GTWaila;
 import gregtech.api.util.GT_TooltipDataCache;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.GT_Waila;
+import gregtech.api.util.OverclockCalculator;
 import gregtech.common.gui.modularui.UIHelper;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -95,8 +95,8 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_BasicTank implements RecipeMapWorkable,
-    IConfigurationCircuitSupport, IOverclockDescriptionProvider, IAddGregtechLogo, IAddUIWidgets {
+public abstract class MTEBasicMachine extends MTEBasicTank implements RecipeMapWorkable, IConfigurationCircuitSupport,
+    IOverclockDescriptionProvider, IAddGregtechLogo, IAddUIWidgets {
 
     /**
      * return values for checkRecipe()
@@ -120,7 +120,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
      * Contains the Recipe which has been previously used, or null if there was no previous Recipe, which could have
      * been buffered
      */
-    protected GT_Recipe mLastRecipe = null;
+    protected GTRecipe mLastRecipe = null;
 
     private FluidStack mFluidOut;
     protected final FluidStackTank fluidOutputTank = new FluidStackTank(
@@ -138,8 +138,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
      *                  TopFacingPipeActive 11 = TopFacingPipeInactive 12 = SideFacingPipeActive 13 =
      *                  SideFacingPipeInactive
      */
-    public GT_MetaTileEntity_BasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage,
-        String aDescription, int aInputSlotCount, int aOutputSlotCount, ITexture... aOverlays) {
+    public MTEBasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage, String aDescription,
+        int aInputSlotCount, int aOutputSlotCount, ITexture... aOverlays) {
         super(
             aID,
             aName,
@@ -157,8 +157,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     /**
      * Registers machine with multi-line descriptions.
      */
-    public GT_MetaTileEntity_BasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage,
-        String[] aDescription, int aInputSlotCount, int aOutputSlotCount, ITexture... aOverlays) {
+    public MTEBasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage, String[] aDescription,
+        int aInputSlotCount, int aOutputSlotCount, ITexture... aOverlays) {
         super(
             aID,
             aName,
@@ -176,8 +176,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     /**
      * For {@link #newMetaEntity}.
      */
-    public GT_MetaTileEntity_BasicMachine(String aName, int aTier, int aAmperage, String[] aDescription,
-        ITexture[][][] aTextures, int aInputSlotCount, int aOutputSlotCount) {
+    public MTEBasicMachine(String aName, int aTier, int aAmperage, String[] aDescription, ITexture[][][] aTextures,
+        int aInputSlotCount, int aOutputSlotCount) {
         super(aName, aTier, OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, aDescription, aTextures);
         mInputSlotCount = Math.max(0, aInputSlotCount);
         mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)];
@@ -494,17 +494,17 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (aBaseMetaTileEntity.isClientSide()) return true;
-        if (!GT_Mod.gregtechproxy.mForceFreeFace) {
-            GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        if (!GTMod.gregtechproxy.mForceFreeFace) {
+            GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             return true;
         }
         for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
             if (aBaseMetaTileEntity.getAirAtSide(side)) {
-                GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+                GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
                 return true;
             }
         }
-        GT_Utility.sendChatToPlayer(aPlayer, "No free Side!");
+        GTUtility.sendChatToPlayer(aPlayer, "No free Side!");
         return true;
     }
 
@@ -512,7 +512,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     public void initDefaultModes(NBTTagCompound aNBT) {
         mMainFacing = ForgeDirection.UNKNOWN;
         if (!getBaseMetaTileEntity().getWorld().isRemote) {
-            final GT_ClientPreference tPreference = GT_Mod.gregtechproxy
+            final GTClientPreference tPreference = GTMod.gregtechproxy
                 .getClientPreference(getBaseMetaTileEntity().getOwnerUuid());
             if (tPreference != null) {
                 mDisableFilter = !tPreference.isSingleBlockInitialFilterEnabled();
@@ -538,7 +538,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         if (mFluidOut != null) aNBT.setTag("mFluidOut", mFluidOut.writeToNBT(new NBTTagCompound()));
 
         for (int i = 0; i < mOutputItems.length; i++)
-            if (mOutputItems[i] != null) GT_Utility.saveItem(aNBT, "mOutputItem" + i, mOutputItems[i]);
+            if (mOutputItems[i] != null) GTUtility.saveItem(aNBT, "mOutputItem" + i, mOutputItems[i]);
     }
 
     @Override
@@ -557,7 +557,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         mOutputFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mOutputFluid"));
         mFluidOut = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluidOut"));
 
-        for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = GT_Utility.loadItem(aNBT, "mOutputItem" + i);
+        for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = GTUtility.loadItem(aNBT, "mOutputItem" + i);
     }
 
     @Override
@@ -663,14 +663,14 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
                         for (int i = getInputSlot(), j = i + mInputSlotCount; i < j; i++)
                             if (mInventory[i] != null && mInventory[i].stackSize <= 0) mInventory[i] = null;
                         for (int i = 0; i < mOutputItems.length; i++) {
-                            mOutputItems[i] = GT_Utility.copyOrNull(mOutputItems[i]);
+                            mOutputItems[i] = GTUtility.copyOrNull(mOutputItems[i]);
                             if (mOutputItems[i] != null && mOutputItems[i].stackSize > 64)
                                 mOutputItems[i].stackSize = 64;
-                            mOutputItems[i] = GT_OreDictUnificator.get(true, mOutputItems[i]);
+                            mOutputItems[i] = GTOreDictUnificator.get(true, mOutputItems[i]);
                         }
                         if (mFluid != null && mFluid.amount <= 0) mFluid = null;
                         mMaxProgresstime = Math.max(1, mMaxProgresstime);
-                        if (GT_Utility.isDebugItem(mInventory[dechargerSlotStartIndex()])) {
+                        if (GTUtility.isDebugItem(mInventory[dechargerSlotStartIndex()])) {
                             mEUt = mMaxProgresstime = 1;
                         }
                         startProcess();
@@ -717,9 +717,9 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     /**
      * Calculates overclock based on {@link #overclockDescriber}.
      */
-    protected void calculateCustomOverclock(GT_Recipe recipe) {
-        GT_OverclockCalculator calculator = overclockDescriber.createCalculator(
-            new GT_OverclockCalculator().setRecipeEUt(recipe.mEUt)
+    protected void calculateCustomOverclock(GTRecipe recipe) {
+        OverclockCalculator calculator = overclockDescriber.createCalculator(
+            new OverclockCalculator().setRecipeEUt(recipe.mEUt)
                 .setDuration(recipe.mDuration)
                 .setOneTickDiscount(true),
             recipe);
@@ -732,7 +732,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
      * Helper method for calculating simple overclock.
      */
     protected void calculateOverclockedNess(int eut, int duration) {
-        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(eut)
+        OverclockCalculator calculator = new OverclockCalculator().setRecipeEUt(eut)
             .setEUt(V[mTier] * mAmperage)
             .setDuration(duration)
             .setOneTickDiscount(true)
@@ -755,7 +755,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         return rOutputs;
     }
 
-    protected boolean canOutput(GT_Recipe aRecipe) {
+    protected boolean canOutput(GTRecipe aRecipe) {
         return aRecipe != null && (aRecipe.mNeedsEmptyOutput ? isOutputEmpty() && getDrainableStack() == null
             : canOutput(aRecipe.getFluidOutput(0)) && canOutput(aRecipe.mOutputs));
     }
@@ -765,7 +765,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         ItemStack[] tOutputSlots = getAllOutputs();
         for (int i = 0; i < tOutputSlots.length && i < aOutputs.length; i++)
             if (tOutputSlots[i] != null && aOutputs[i] != null
-                && (!GT_Utility.areStacksEqual(tOutputSlots[i], aOutputs[i], false)
+                && (!GTUtility.areStacksEqual(tOutputSlots[i], aOutputs[i], false)
                     || tOutputSlots[i].stackSize + aOutputs[i].stackSize > tOutputSlots[i].getMaxStackSize())) {
                         mOutputBlocked++;
                         return false;
@@ -814,7 +814,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     @Override
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         super.doSound(aIndex, aX, aY, aZ);
-        if (aIndex == 8) GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ);
+        if (aIndex == 8) GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ);
     }
 
     public boolean doesAutoOutput() {
@@ -875,27 +875,27 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     @Override
     public String[] getInfoData() {
         return new String[] { "Progress:",
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers((mProgresstime / 20))
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers((mProgresstime / 20))
                 + EnumChatFormatting.RESET
                 + " s / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mMaxProgresstime / 20)
+                + GTUtility.formatNumbers(mMaxProgresstime / 20)
                 + EnumChatFormatting.RESET
                 + " s",
             "Stored Energy:",
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(getBaseMetaTileEntity().getStoredEU())
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(getBaseMetaTileEntity().getStoredEU())
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(getBaseMetaTileEntity().getEUCapacity())
+                + GTUtility.formatNumbers(getBaseMetaTileEntity().getEUCapacity())
                 + EnumChatFormatting.RESET
                 + " EU",
             "Probably uses: " + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(mEUt)
+                + GTUtility.formatNumbers(mEUt)
                 + EnumChatFormatting.RESET
                 + " EU/t at "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(mEUt == 0 ? 0 : mAmperage)
+                + GTUtility.formatNumbers(mEUt == 0 ? 0 : mAmperage)
                 + EnumChatFormatting.RESET
                 + " A" };
     }
@@ -910,15 +910,15 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         if (side == getBaseMetaTileEntity().getFrontFacing() || side == mMainFacing) {
             if (aPlayer.isSneaking()) {
                 mDisableFilter = !mDisableFilter;
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
                     StatCollector.translateToLocal("GT5U.hatch.disableFilter." + mDisableFilter));
             } else {
                 mAllowInputFromOutputSide = !mAllowInputFromOutputSide;
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
-                    mAllowInputFromOutputSide ? GT_Utility.trans("095", "Input from Output Side allowed")
-                        : GT_Utility.trans("096", "Input from Output Side forbidden"));
+                    mAllowInputFromOutputSide ? GTUtility.trans("095", "Input from Output Side allowed")
+                        : GTUtility.trans("096", "Input from Output Side forbidden"));
             }
         }
     }
@@ -931,19 +931,19 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         if (click) return true;
         if (wrenchingSide != mMainFacing) return false;
         mDisableMultiStack = !mDisableMultiStack;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             entityPlayer,
             StatCollector.translateToLocal("GT5U.hatch.disableMultiStack." + mDisableMultiStack));
         return true;
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         if (side != mMainFacing) return true;
-        GT_CoverBehaviorBase<?> tBehavior = GregTech_API.getCoverBehaviorNew(aCoverID.toStack());
+        CoverBehaviorBase<?> tBehavior = GregTechAPI.getCoverBehaviorNew(aCoverID.toStack());
         return tBehavior.isGUIClickable(
             side,
-            GT_Utility.stackToInt(aCoverID.toStack()),
+            GTUtility.stackToInt(aCoverID.toStack()),
             tBehavior.createDataObject(),
             getBaseMetaTileEntity());
     }
@@ -961,7 +961,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
             || aIndex >= getInputSlot() + mInputSlotCount
             || (!mAllowInputFromOutputSide && side == aBaseMetaTileEntity.getFrontFacing())) return false;
         for (int i = getInputSlot(), j = i + mInputSlotCount; i < j; i++)
-            if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(aStack), mInventory[i]) && mDisableMultiStack)
+            if (GTUtility.areStacksEqual(GTOreDictUnificator.get(aStack), mInventory[i]) && mDisableMultiStack)
                 return i == aIndex;
         return mDisableFilter || allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack);
     }
@@ -1005,7 +1005,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
 
     @Override
     public List<ItemStack> getConfigurationCircuits() {
-        return GregTech_API.getConfigurationCircuitList(mTier);
+        return GregTechAPI.getConfigurationCircuitList(mTier);
     }
 
     @Override
@@ -1027,7 +1027,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         return checkRecipe(false);
     }
 
-    public static boolean isValidForLowGravity(GT_Recipe tRecipe, int dimId) {
+    public static boolean isValidForLowGravity(GTRecipe tRecipe, int dimId) {
         return // TODO check or get a better solution
         DimensionManager.getProvider(dimId)
             .getClass()
@@ -1060,7 +1060,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     public int checkRecipe(boolean skipOC) {
         RecipeMap<?> tMap = getRecipeMap();
         if (tMap == null) return DID_NOT_FIND_RECIPE;
-        GT_Recipe tRecipe = tMap.findRecipeQuery()
+        GTRecipe tRecipe = tMap.findRecipeQuery()
             .items(getAllInputs())
             .fluids(getFillableStack())
             .specialSlot(getSpecialSlot())
@@ -1079,7 +1079,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
             return DID_NOT_FIND_RECIPE;
         }
 
-        if (GT_Mod.gregtechproxy.mLowGravProcessing && (tRecipe.mSpecialValue == -100 || tRecipe.mSpecialValue == -300)
+        if (GTMod.gregtechproxy.mLowGravProcessing && (tRecipe.mSpecialValue == -100 || tRecipe.mSpecialValue == -300)
             && !isValidForLowGravity(tRecipe, getBaseMetaTileEntity().getWorld().provider.dimensionId))
             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
         if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;
@@ -1103,7 +1103,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
             for (int i = 0; i < mOutputItems.length; i++) if (mOutputItems[i] != null
                 && getBaseMetaTileEntity().getRandomNumber(10000) > cleanroom.getCleanness()) {
                     if (debugCleanroom) {
-                        GT_Log.out.println(
+                        GTLog.out.println(
                             "BasicMachine: Voiding output due to cleanness failure. Cleanness = "
                                 + cleanroom.getCleanness());
                     }
@@ -1192,35 +1192,35 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
                         currenttip.add(
                             StatCollector.translateToLocalFormatted(
                                 "GT5U.waila.energy.use_with_amperage",
-                                GT_Utility.formatNumbers(mEUt),
-                                GT_Utility.getAmperageForTier(mEUt, (byte) getInputTier()),
-                                GT_Utility.getColoredTierNameFromTier((byte) getInputTier())));
+                                GTUtility.formatNumbers(mEUt),
+                                GTUtility.getAmperageForTier(mEUt, (byte) getInputTier()),
+                                GTUtility.getColoredTierNameFromTier((byte) getInputTier())));
                     } else if (mEUt < 0) {
                         currenttip.add(
                             StatCollector.translateToLocalFormatted(
                                 "GT5U.waila.energy.produce_with_amperage",
-                                GT_Utility.formatNumbers(-mEUt),
-                                GT_Utility.getAmperageForTier(-mEUt, (byte) getOutputTier()),
-                                GT_Utility.getColoredTierNameFromTier((byte) getOutputTier())));
+                                GTUtility.formatNumbers(-mEUt),
+                                GTUtility.getAmperageForTier(-mEUt, (byte) getOutputTier()),
+                                GTUtility.getColoredTierNameFromTier((byte) getOutputTier())));
                     }
                 } else {
                     if (mEUt > 0) {
                         currenttip.add(
                             StatCollector.translateToLocalFormatted(
                                 "GT5U.waila.energy.use",
-                                GT_Utility.formatNumbers(mEUt),
-                                GT_Utility.getColoredTierNameFromVoltage(mEUt)));
+                                GTUtility.formatNumbers(mEUt),
+                                GTUtility.getColoredTierNameFromVoltage(mEUt)));
                     } else if (mEUt < 0) {
                         currenttip.add(
                             StatCollector.translateToLocalFormatted(
                                 "GT5U.waila.energy.produce",
-                                GT_Utility.formatNumbers(-mEUt),
-                                GT_Utility.getColoredTierNameFromVoltage(-mEUt)));
+                                GTUtility.formatNumbers(-mEUt),
+                                GTUtility.getColoredTierNameFromVoltage(-mEUt)));
                     }
                 }
             }
             currenttip.add(
-                GT_Waila.getMachineProgressString(
+                GTWaila.getMachineProgressString(
                     isActive,
                     tag.getInteger("maxProgressSingleBlock"),
                     tag.getInteger("progressSingleBlock")));
@@ -1308,7 +1308,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         builder.widget(
             createErrorStatusArea(
                 builder,
-                isSteampowered() ? GT_UITextures.PICTURE_STALLED_STEAM : GT_UITextures.PICTURE_STALLED_ELECTRICITY));
+                isSteampowered() ? GTUITextures.PICTURE_STALLED_STEAM : GTUITextures.PICTURE_STALLED_ELECTRICITY));
     }
 
     /**
@@ -1442,8 +1442,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
 
     protected CycleButtonWidget createItemAutoOutputButton() {
         return (CycleButtonWidget) new CycleButtonWidget().setToggle(() -> mItemTransfer, val -> mItemTransfer = val)
-            .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM)
-            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+            .setStaticTexture(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM)
+            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
             .setGTTooltip(() -> mTooltipCache.getData(ITEM_TRANSFER_TOOLTIP))
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(25, 62)
@@ -1452,8 +1452,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
 
     protected CycleButtonWidget createFluidAutoOutputButton() {
         return (CycleButtonWidget) new CycleButtonWidget().setToggle(() -> mFluidTransfer, val -> mFluidTransfer = val)
-            .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID)
-            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+            .setStaticTexture(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID)
+            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
             .setGTTooltip(() -> mTooltipCache.getData(FLUID_TRANSFER_TOOLTIP))
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(7, 62)
@@ -1461,7 +1461,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     }
 
     protected Widget setNEITransferRect(Widget widget, String transferRectID) {
-        if (GT_Utility.isStringInvalid(transferRectID)) {
+        if (GTUtility.isStringInvalid(transferRectID)) {
             return widget;
         }
         final String transferRectTooltip;
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java
index 5eb648d560..507a807a76 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.D1;
+import static gregtech.api.enums.GTValues.D1;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP;
@@ -25,7 +25,7 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.ParticleFX;
 import gregtech.api.enums.SoundResource;
@@ -34,13 +34,13 @@ import gregtech.api.enums.TierEU;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.objects.overclockdescriber.SteamOverclockDescriber;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
 
 /**
@@ -49,19 +49,19 @@ import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileEntity_BasicMachine {
+public abstract class MTEBasicMachineBronze extends MTEBasicMachine {
 
     private static final String TT_machineType = "GT5U.MBTT.MachineType";
     private static final int NEEDS_STEAM_VENTING = 64;
     public boolean mNeedsSteamVenting = false;
 
-    public GT_MetaTileEntity_BasicMachine_Bronze(int aID, String aName, String aNameRegional, String aDescription,
-        int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) {
+    public MTEBasicMachineBronze(int aID, String aName, String aNameRegional, String aDescription, int aInputSlotCount,
+        int aOutputSlotCount, boolean aHighPressure) {
         super(aID, aName, aNameRegional, aHighPressure ? 2 : 1, 0, aDescription, aInputSlotCount, aOutputSlotCount);
     }
 
-    public GT_MetaTileEntity_BasicMachine_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures,
-        int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) {
+    public MTEBasicMachineBronze(String aName, String[] aDescription, ITexture[][][] aTextures, int aInputSlotCount,
+        int aOutputSlotCount, boolean aHighPressure) {
         super(aName, aHighPressure ? 2 : 1, 0, aDescription, aTextures, aInputSlotCount, aOutputSlotCount);
     }
 
@@ -160,7 +160,7 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE
     public boolean allowToCheckRecipe() {
         if (mNeedsSteamVenting
             && getBaseMetaTileEntity().getCoverIDAtSide(getBaseMetaTileEntity().getFrontFacing()) == 0
-            && !GT_Utility.hasBlockHitBox(
+            && !GTUtility.hasBlockHitBox(
                 getBaseMetaTileEntity().getWorld(),
                 getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1),
                 getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1),
@@ -178,10 +178,10 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE
                             getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1) + 1,
                             getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1) + 1,
                             getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1) + 1))) {
-                    GT_Utility.applyHeatDamage(tLiving, getSteamDamage());
+                    GTUtility.applyHeatDamage(tLiving, getSteamDamage());
                 }
             } catch (Throwable e) {
-                if (D1) e.printStackTrace(GT_Log.err);
+                if (D1) e.printStackTrace(GTLog.err);
             }
         }
         return !mNeedsSteamVenting;
@@ -189,7 +189,7 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE
 
     @Override
     public int checkRecipe() {
-        GT_Recipe tRecipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, TierEU.LV, null, getAllInputs());
+        GTRecipe tRecipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, TierEU.LV, null, getAllInputs());
         if ((tRecipe != null) && (canOutput(tRecipe.mOutputs))
             && (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {
             this.mOutputItems[0] = tRecipe.getOutput(0);
@@ -215,7 +215,7 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         super.doSound(aIndex, aX, aY, aZ);
         if (aIndex == 9) {
-            GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 5, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 5, 1.0F, aX, aY, aZ);
 
             new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD)
                 .setWorld(getBaseMetaTileEntity().getWorld())
@@ -240,8 +240,8 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
-        return GregTech_API.getCoverBehaviorNew(aCoverID.toStack())
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
+        return GregTechAPI.getCoverBehaviorNew(aCoverID.toStack())
             .isSimpleCover() && super.allowCoverOnSide(side, aCoverID);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Steel.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineSteel.java
index d6ae385430..8d6f5568d5 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Steel.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineSteel.java
@@ -22,16 +22,15 @@ import gregtech.api.render.TextureFactory;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public abstract class GT_MetaTileEntity_BasicMachine_Steel extends GT_MetaTileEntity_BasicMachine_Bronze
-    implements IGetTitleColor {
+public abstract class MTEBasicMachineSteel extends MTEBasicMachineBronze implements IGetTitleColor {
 
-    public GT_MetaTileEntity_BasicMachine_Steel(int aID, String aName, String aNameRegional, String aDescription,
-        int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) {
+    public MTEBasicMachineSteel(int aID, String aName, String aNameRegional, String aDescription, int aInputSlotCount,
+        int aOutputSlotCount, boolean aHighPressure) {
         super(aID, aName, aNameRegional, aDescription, aInputSlotCount, aOutputSlotCount, aHighPressure);
     }
 
-    public GT_MetaTileEntity_BasicMachine_Steel(String aName, String[] aDescription, ITexture[][][] aTextures,
-        int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) {
+    public MTEBasicMachineSteel(String aName, String[] aDescription, ITexture[][][] aTextures, int aInputSlotCount,
+        int aOutputSlotCount, boolean aHighPressure) {
         super(aName, aDescription, aTextures, aInputSlotCount, aOutputSlotCount, aHighPressure);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineWithRecipe.java
index a10e735843..b5bd3d77e1 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineWithRecipe.java
@@ -1,9 +1,9 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.VN;
-import static gregtech.api.enums.GT_Values.W;
-import static gregtech.api.enums.GT_Values.ticksBetweenSounds;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.enums.GTValues.VN;
+import static gregtech.api.enums.GTValues.W;
+import static gregtech.api.enums.GTValues.ticksBetweenSounds;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 import static net.minecraftforge.common.util.ForgeDirection.UP;
 
@@ -29,7 +29,7 @@ import gregtech.api.enums.ParticleFX;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
 import gregtech.api.enums.Tier;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -38,8 +38,8 @@ import gregtech.api.recipe.BasicUIProperties;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.ExternalMaterials;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
 
 /**
@@ -48,7 +48,7 @@ import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_BasicMachine {
+public class MTEBasicMachineWithRecipe extends MTEBasicMachine {
 
     private final RecipeMap<?> mRecipes;
     private final int mTankCapacity;
@@ -60,9 +60,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with single-line description, specific tank capacity, and sound specified by ResourceLocation.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity,
-        ResourceLocation aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, ResourceLocation aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         this(
             aID,
             aName,
@@ -82,9 +82,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with multi-line descriptions, specific tank capacity, and sound specified by ResourceLocation.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity,
-        ResourceLocation aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, ResourceLocation aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         super(
             aID,
             aName,
@@ -422,11 +422,11 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
                 // spotless:on
             }
 
-            if (!GT_ModHandler.addCraftingRecipe(
+            if (!GTModHandler.addCraftingRecipe(
                 getStackForm(1),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.BUFFERED
-                    | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                    | GT_ModHandler.RecipeBits.REVERSIBLE,
+                GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.BUFFERED
+                    | GTModHandler.RecipeBits.NOT_REMOVABLE
+                    | GTModHandler.RecipeBits.REVERSIBLE,
                 aRecipe)) {
                 throw new IllegalArgumentException("INVALID CRAFTING RECIPE FOR: " + getStackForm(1).getDisplayName());
             }
@@ -436,9 +436,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with single-line description, auto-scaled fluid tank, and sound specified by SoundResource.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids,
-        SoundResource aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids, SoundResource aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         this(
             aID,
             aName,
@@ -458,9 +458,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with multi-line descriptions, auto-scaled fluid tank, and sound specified by SoundResource.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids,
-        SoundResource aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids, SoundResource aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         this(
             aID,
             aName,
@@ -480,9 +480,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with single-line description, specific tank capacity, and sound specified by SoundResource.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity,
-        SoundResource aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, SoundResource aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         this(
             aID,
             aName,
@@ -502,9 +502,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * Registers machine with multi-line descriptions, specific tank capacity, and sound specified by SoundResource.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription, RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity,
-        SoundResource aSound, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
+    public MTEBasicMachineWithRecipe(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, SoundResource aSound,
+        SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) {
         this(
             aID,
             aName,
@@ -524,9 +524,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     /**
      * For {@link #newMetaEntity}.
      */
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe(String aName, int aTier, String[] aDescription,
-        RecipeMap<?> aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage,
-        ITexture[][][] aTextures, ResourceLocation aSound, SpecialEffects aSpecialEffect) {
+    public MTEBasicMachineWithRecipe(String aName, int aTier, String[] aDescription, RecipeMap<?> aRecipes,
+        int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage, ITexture[][][] aTextures,
+        ResourceLocation aSound, SpecialEffects aSpecialEffect) {
         super(aName, aTier, aAmperage, aDescription, aTextures, aInputSlots, aOutputSlots);
         this.mTankCapacity = aTankCapacity;
         this.mSpecialEffect = aSpecialEffect;
@@ -536,7 +536,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+        return new MTEBasicMachineWithRecipe(
             this.mName,
             this.mTier,
             this.mDescriptionArray,
@@ -551,17 +551,17 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
                 .setRecipeCatalystPriority(this.recipeCatalystPriority);
     }
 
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe setProgressBarTexture(FallbackableUITexture progressBarTexture) {
+    public MTEBasicMachineWithRecipe setProgressBarTexture(FallbackableUITexture progressBarTexture) {
         this.progressBarTexture = progressBarTexture;
         return this;
     }
 
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe setProgressBarTextureName(String name, UITexture fallback) {
-        return setProgressBarTexture(GT_UITextures.fallbackableProgressbar(name, fallback));
+    public MTEBasicMachineWithRecipe setProgressBarTextureName(String name, UITexture fallback) {
+        return setProgressBarTexture(GTUITextures.fallbackableProgressbar(name, fallback));
     }
 
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe setProgressBarTextureName(String name) {
-        return setProgressBarTextureName(name, GT_UITextures.PROGRESSBAR_ARROW);
+    public MTEBasicMachineWithRecipe setProgressBarTextureName(String name) {
+        return setProgressBarTextureName(name, GTUITextures.PROGRESSBAR_ARROW);
     }
 
     @Override
@@ -617,7 +617,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
                     // uv;
                     // assemblers
                     // luv-uev
-                    if (GT_Utility.isStackValid(aStack)) for (int oreID : OreDictionary.getOreIDs(aStack)) {
+                    if (GTUtility.isStackValid(aStack)) for (int oreID : OreDictionary.getOreIDs(aStack)) {
                         if (OreDictionary.getOreName(oreID)
                             .startsWith("circuit")) return true;
                     }
@@ -734,7 +734,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
         return recipeCatalystPriority;
     }
 
-    public GT_MetaTileEntity_BasicMachine_GT_Recipe setRecipeCatalystPriority(int recipeCatalystPriority) {
+    public MTEBasicMachineWithRecipe setRecipeCatalystPriority(int recipeCatalystPriority) {
         this.recipeCatalystPriority = recipeCatalystPriority;
         return this;
     }
@@ -748,9 +748,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1 && this.mSoundResourceLocation != null
-            && GT_Utility.isStringValid(this.mSoundResourceLocation.getResourceDomain())
-            && GT_Utility.isStringValid(this.mSoundResourceLocation.getResourcePath()))
-            GT_Utility.doSoundAtClient(this.mSoundResourceLocation, 100, 1.0F, aX, aY, aZ);
+            && GTUtility.isStringValid(this.mSoundResourceLocation.getResourceDomain())
+            && GTUtility.isStringValid(this.mSoundResourceLocation.getResourcePath()))
+            GTUtility.doSoundAtClient(this.mSoundResourceLocation, 100, 1.0F, aX, aY, aZ);
     }
 
     @Override
@@ -759,9 +759,8 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
         // Added to throttle sounds. To reduce lag, this is on the server side so BlockUpdate packets aren't sent.
         if (myMetaTileEntity.mTickTimer > (myMetaTileEntity.mLastSoundTick + ticksBetweenSounds)) {
             if (this.mSoundResourceLocation != null
-                && GT_Utility.isStringValid(this.mSoundResourceLocation.getResourceDomain())
-                && GT_Utility.isStringValid(this.mSoundResourceLocation.getResourcePath()))
-                this.sendLoopStart((byte) 1);
+                && GTUtility.isStringValid(this.mSoundResourceLocation.getResourceDomain())
+                && GTUtility.isStringValid(this.mSoundResourceLocation.getResourcePath())) this.sendLoopStart((byte) 1);
             // Does not have overflow protection, but they are longs.
             myMetaTileEntity.mLastSoundTick = myMetaTileEntity.mTickTimer;
         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicTank.java
index 25fc7e7855..003b8c893e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicTank.java
@@ -15,19 +15,18 @@ import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
  * <p>
  * This is the main construct for my generic Tanks. Filling and emptying behavior have to be implemented manually
  */
-public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_TieredMachineBlock
-    implements IAddUIWidgets {
+public abstract class MTEBasicTank extends MTETieredMachineBlock implements IAddUIWidgets {
 
     public FluidStack mFluid;
     // Due to class initializing order, getCapacity might not work properly at this time.
@@ -40,23 +39,21 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier
     /**
      * @param aInvSlotCount should be 3
      */
-    public GT_MetaTileEntity_BasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String aDescription, ITexture... aTextures) {
+    public MTEBasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription,
+        ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEBasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicTank(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicTank(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicTank(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicTank(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -151,13 +148,13 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier
             final int inputSlot = getInputSlot();
 
             if (doesEmptyContainers()) {
-                FluidStack tFluid = GT_Utility.getFluidForFilledItem(mInventory[inputSlot], true);
+                FluidStack tFluid = GTUtility.getFluidForFilledItem(mInventory[inputSlot], true);
                 if (tFluid != null && isFluidInputAllowed(tFluid)) {
                     if (getFillableStack() == null) {
                         if (isFluidInputAllowed(tFluid) && tFluid.amount <= getCapacity()) {
                             if (aBaseMetaTileEntity.addStackToSlot(
                                 getOutputSlot(),
-                                GT_Utility.getContainerForFilledItem(mInventory[inputSlot], true),
+                                GTUtility.getContainerForFilledItem(mInventory[inputSlot], true),
                                 1)) {
                                 setFillableStack(tFluid.copy());
                                 this.onEmptyingContainerWhenEmpty();
@@ -169,7 +166,7 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier
                             && ((long) tFluid.amount + getFillableStack().amount) <= (long) getCapacity()) {
                             if (aBaseMetaTileEntity.addStackToSlot(
                                 getOutputSlot(),
-                                GT_Utility.getContainerForFilledItem(mInventory[inputSlot], true),
+                                GTUtility.getContainerForFilledItem(mInventory[inputSlot], true),
                                 1)) {
                                 getFillableStack().amount += tFluid.amount;
                                 aBaseMetaTileEntity.decrStackSize(inputSlot, 1);
@@ -180,10 +177,10 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier
             }
 
             if (doesFillContainers()) {
-                ItemStack tOutput = GT_Utility
+                ItemStack tOutput = GTUtility
                     .fillFluidContainer(getDrainableStack(), mInventory[inputSlot], false, true);
                 if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) {
-                    FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
+                    FluidStack tFluid = GTUtility.getFluidForFilledItem(tOutput, true);
                     aBaseMetaTileEntity.decrStackSize(inputSlot, 1);
                     if (tFluid != null) getDrainableStack().amount -= tFluid.amount;
                     if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) setDrainableStack(null);
@@ -298,23 +295,23 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setPos(7, 16)
                 .setSize(71, 45))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GAUGE)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_GAUGE)
                     .setPos(79, 34)
                     .setSize(18, 18))
             .widget(
                 new SlotWidget(inventoryHandler, getInputSlot())
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_IN)
                     .setPos(79, 16))
             .widget(
                 new SlotWidget(inventoryHandler, getOutputSlot()).setAccess(true, false)
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_OUT)
                     .setPos(79, 52))
             .widget(
-                createFluidSlot().setBackground(GT_UITextures.TRANSPARENT)
+                createFluidSlot().setBackground(GTUITextures.TRANSPARENT)
                     .setPos(58, 41))
             .widget(
                 new TextWidget("Liquid Amount").setDefaultColor(COLOR_TEXT_WHITE.get())
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBuffer.java
index ef64d99db8..c8b4e6bfca 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBuffer.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.ARROW_DOWN;
 import static gregtech.api.enums.Textures.BlockIcons.ARROW_DOWN_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.ARROW_LEFT;
@@ -35,16 +35,16 @@ import com.gtnewhorizons.modularui.api.widget.Widget;
 import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.GT_TooltipDataCache;
-import gregtech.api.util.GT_Utility;
 
-public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredMachineBlock implements IAddUIWidgets {
+public abstract class MTEBuffer extends MTETieredMachineBlock implements IAddUIWidgets {
 
     private static final int OUTPUT_INDEX = 0;
     private static final int ARROW_RIGHT_INDEX = 1;
@@ -67,23 +67,19 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
     public int mSuccess = 0, mTargetStackSize = 0;
     private int uiButtonCount = 0;
 
-    public GT_MetaTileEntity_Buffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String aDescription) {
+    public MTEBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_Buffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String[] aDescription) {
+    public MTEBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_Buffer(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBuffer(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Buffer(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBuffer(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -275,7 +271,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -314,11 +310,11 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
                 mTargetStackSize = mMaxStackSize;
             }
             if (mTargetStackSize == 0) {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("098", "Do not regulate Item Stack Size"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("098", "Do not regulate Item Stack Size"));
             } else {
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
-                    GT_Utility.trans("099", "Regulate Item Stack Size to: ") + mTargetStackSize);
+                    GTUtility.trans("099", "Regulate Item Stack Size to: ") + mTargetStackSize);
             }
         }
     }
@@ -374,7 +370,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
 
     protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long ignoredTimer, int stacks) {
         int tCost;
-        if (bStockingMode) tCost = GT_Utility.moveMultipleItemStacks(
+        if (bStockingMode) tCost = GTUtility.moveMultipleItemStacks(
             aBaseMetaTileEntity,
             aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()),
             aBaseMetaTileEntity.getBackFacing(),
@@ -386,7 +382,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             (byte) 64,
             (byte) 1,
             stacks);
-        else tCost = GT_Utility.moveMultipleItemStacks(
+        else tCost = GTUtility.moveMultipleItemStacks(
             aBaseMetaTileEntity,
             aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()),
             aBaseMetaTileEntity.getBackFacing(),
@@ -428,23 +424,23 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
     }
 
     protected void fillStacksIntoFirstSlots() {
-        HashMap<GT_Utility.ItemId, Integer> slots = new HashMap<>(mInventory.length);
-        HashMap<GT_Utility.ItemId, ItemStack> stacks = new HashMap<>(mInventory.length);
-        List<GT_Utility.ItemId> order = new ArrayList<>(mInventory.length);
+        HashMap<GTUtility.ItemId, Integer> slots = new HashMap<>(mInventory.length);
+        HashMap<GTUtility.ItemId, ItemStack> stacks = new HashMap<>(mInventory.length);
+        List<GTUtility.ItemId> order = new ArrayList<>(mInventory.length);
         List<Integer> validSlots = new ArrayList<>(mInventory.length);
         for (int i = 0; i < mInventory.length - 1; i++) {
             if (!isValidSlot(i)) continue;
             validSlots.add(i);
             ItemStack s = mInventory[i];
             if (s == null) continue;
-            GT_Utility.ItemId sID = GT_Utility.ItemId.createNoCopy(s);
+            GTUtility.ItemId sID = GTUtility.ItemId.createNoCopy(s);
             slots.merge(sID, s.stackSize, Integer::sum);
             if (!stacks.containsKey(sID)) stacks.put(sID, s);
             order.add(sID);
             mInventory[i] = null;
         }
         int slotindex = 0;
-        for (GT_Utility.ItemId sID : order) {
+        for (GTUtility.ItemId sID : order) {
             int toSet = slots.get(sID);
             if (toSet == 0) continue;
             int slot = validSlots.get(slotindex);
@@ -463,10 +459,10 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
         if (entityPlayer.isSneaking()) {
             // I was so proud of all this but I literally just copied code from OutputBus
             bSortStacks = !bSortStacks;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 entityPlayer,
-                GT_Utility.trans("200", "Sort mode: ")
-                    + (bSortStacks ? GT_Utility.trans("088", "Enabled") : GT_Utility.trans("087", "Disabled")));
+                GTUtility.trans("200", "Sort mode: ")
+                    + (bSortStacks ? GTUtility.trans("088", "Enabled") : GTUtility.trans("087", "Disabled")));
             return true;
         }
         return super.onSolderingToolRightClick(side, wrenchingSide, entityPlayer, aX, aY, aZ);
@@ -477,16 +473,16 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             createToggleButton(
                 () -> bOutput,
                 val -> bOutput = val,
-                GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY,
+                GTUITextures.OVERLAY_BUTTON_EMIT_ENERGY,
                 this::getEmitEnergyButtonTooltip));
     }
 
     private GT_TooltipDataCache.TooltipData getEmitEnergyButtonTooltip() {
         return mTooltipCache.getData(
             EMIT_ENERGY_TOOLTIP,
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(V[mTier])
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(V[mTier])
                 + " ("
-                + GT_Utility.getColoredTierNameFromTier(mTier)
+                + GTUtility.getColoredTierNameFromTier(mTier)
                 + EnumChatFormatting.GREEN
                 + ")"
                 + EnumChatFormatting.GRAY,
@@ -498,7 +494,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             createToggleButton(
                 () -> bRedstoneIfFull,
                 val -> bRedstoneIfFull = val,
-                GT_UITextures.OVERLAY_BUTTON_EMIT_REDSTONE,
+                GTUITextures.OVERLAY_BUTTON_EMIT_REDSTONE,
                 this::getEmitRedstoneIfFullButtonTooltip).setUpdateTooltipEveryTick(true));
     }
 
@@ -514,7 +510,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             createToggleButton(
                 () -> bInvert,
                 val -> bInvert = val,
-                GT_UITextures.OVERLAY_BUTTON_INVERT_REDSTONE,
+                GTUITextures.OVERLAY_BUTTON_INVERT_REDSTONE,
                 () -> mTooltipCache.getData(INVERT_REDSTONE_TOOLTIP)));
     }
 
@@ -523,7 +519,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             createToggleButton(
                 () -> bStockingMode,
                 val -> bStockingMode = val,
-                GT_UITextures.OVERLAY_BUTTON_STOCKING_MODE,
+                GTUITextures.OVERLAY_BUTTON_STOCKING_MODE,
                 () -> mTooltipCache.getData(STOCKING_MODE_TOOLTIP)));
     }
 
@@ -532,7 +528,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
             createToggleButton(
                 () -> bSortStacks,
                 val -> bSortStacks = val,
-                GT_UITextures.OVERLAY_BUTTON_SORTING_MODE,
+                GTUITextures.OVERLAY_BUTTON_SORTING_MODE,
                 () -> mTooltipCache.getData(SORTING_MODE_TOOLTIP)));
     }
 
@@ -546,7 +542,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
         Supplier<GT_TooltipDataCache.TooltipData> tooltipDataSupplier) {
         return new CycleButtonWidget().setToggle(getter, setter)
             .setStaticTexture(picture)
-            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(7 + (uiButtonCount++ * BUTTON_SIZE), 62)
             .setSize(BUTTON_SIZE, BUTTON_SIZE)
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java
index e44860963f..b56769c59b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java
@@ -25,8 +25,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cofh.api.energy.IEnergyReceiver;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
@@ -47,17 +47,17 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.interfaces.PowerLogicHost;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
-import gregtech.api.objects.GT_Cover_None;
+import gregtech.api.objects.GTCoverNone;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_GC_Compat;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTGCCompat;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.covers.GT_Cover_SolarPanel;
+import gregtech.common.covers.CoverSolarPanel;
 import ic2.api.energy.EnergyNet;
 import ic2.api.energy.tile.IEnergyEmitter;
 import ic2.api.energy.tile.IEnergySink;
@@ -67,7 +67,7 @@ import ic2.api.reactor.IReactorChamber;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTileEntityCable {
+public class MTECable extends MetaPipeEntity implements IMetaTileEntityCable {
 
     public final float mThickNess;
     public final Materials mMaterial;
@@ -76,7 +76,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
     public int mTransferredAmperage = 0;
 
-    public GT_MetaPipeEntity_Cable(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
+    public MTECable(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
         long aCableLossPerMeter, long aAmperage, long aVoltage, boolean aInsulated, boolean aCanShock) {
         super(aID, aName, aNameRegional, 0);
         mThickNess = aThickNess;
@@ -88,8 +88,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
         mCableLossPerMeter = aCableLossPerMeter;
     }
 
-    public GT_MetaPipeEntity_Cable(String aName, float aThickNess, Materials aMaterial, long aCableLossPerMeter,
-        long aAmperage, long aVoltage, boolean aInsulated, boolean aCanShock) {
+    public MTECable(String aName, float aThickNess, Materials aMaterial, long aCableLossPerMeter, long aAmperage,
+        long aVoltage, boolean aInsulated, boolean aCanShock) {
         super(aName, 0);
         mThickNess = aThickNess;
         mMaterial = aMaterial;
@@ -107,7 +107,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaPipeEntity_Cable(
+        return new MTECable(
             mName,
             mThickNess,
             mMaterial,
@@ -185,7 +185,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
         if (amperage == 0L) return;
 
-        GT_Utility.applyElectricityDamage(livingEntity, voltage, amperage);
+        GTUtility.applyElectricityDamage(livingEntity, voltage, amperage);
     }
 
     @Override
@@ -259,7 +259,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPostTick(aBaseMetaTileEntity, aTick);
         if (aTick % 20 == 0 && aBaseMetaTileEntity.isServerSide()
-            && (!GT_Mod.gregtechproxy.gt6Cable || mCheckConnections)) {
+            && (!GTMod.gregtechproxy.gt6Cable || mCheckConnections)) {
             checkConnections();
         }
     }
@@ -267,14 +267,14 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     @Override
     public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
         float aX, float aY, float aZ) {
-        if (GT_Mod.gregtechproxy.gt6Cable
-            && GT_ModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 500, aPlayer)) {
+        if (GTMod.gregtechproxy.gt6Cable
+            && GTModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 500, aPlayer)) {
             if (isConnectedAtSide(wrenchingSide)) {
                 disconnect(wrenchingSide);
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("215", "Disconnected"));
-            } else if (!GT_Mod.gregtechproxy.costlyCableConnection) {
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("215", "Disconnected"));
+            } else if (!GTMod.gregtechproxy.costlyCableConnection) {
                 if (connect(wrenchingSide) > 0)
-                    GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("214", "Connected"));
+                    GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("214", "Connected"));
             }
             return true;
         }
@@ -284,14 +284,14 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     @Override
     public boolean onSolderingToolRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
         float aX, float aY, float aZ) {
-        if (GT_Mod.gregtechproxy.gt6Cable
-            && GT_ModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 500, aPlayer)) {
+        if (GTMod.gregtechproxy.gt6Cable
+            && GTModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 500, aPlayer)) {
             if (isConnectedAtSide(wrenchingSide)) {
                 disconnect(wrenchingSide);
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("215", "Disconnected"));
-            } else if (!GT_Mod.gregtechproxy.costlyCableConnection || GT_ModHandler.consumeSolderingMaterial(aPlayer)) {
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("215", "Disconnected"));
+            } else if (!GTMod.gregtechproxy.costlyCableConnection || GTModHandler.consumeSolderingMaterial(aPlayer)) {
                 if (connect(wrenchingSide) > 0)
-                    GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("214", "Connected"));
+                    GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("214", "Connected"));
             }
             return true;
         }
@@ -299,25 +299,25 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsIn(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsEnergyIn(side, aCoverID, aCoverVariable, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsOut(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsEnergyOut(side, aCoverID, aCoverVariable, aTileEntity);
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsIn(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsEnergyIn(side, aCoverID, aCoverVariable, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsOut(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsEnergyOut(side, aCoverID, aCoverVariable, aTileEntity);
     }
@@ -335,7 +335,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     @Override
     public boolean canConnect(ForgeDirection side, TileEntity tileEntity) {
         final IGregTechTileEntity baseMetaTile = getBaseMetaTileEntity();
-        final GT_CoverBehaviorBase<?> coverBehavior = baseMetaTile.getCoverBehaviorAtSideNew(side);
+        final CoverBehaviorBase<?> coverBehavior = baseMetaTile.getCoverBehaviorAtSideNew(side);
         final ForgeDirection oppositeSide = side.getOpposite();
 
         // GT Machine handling
@@ -346,11 +346,11 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
             return true;
 
         // Solar Panel Compat
-        if (coverBehavior instanceof GT_Cover_SolarPanel) return true;
+        if (coverBehavior instanceof CoverSolarPanel) return true;
 
         // ((tIsGregTechTileEntity && tIsTileEntityCable) && (tAlwaysLookConnected || tLetEnergyIn || tLetEnergyOut) )
         // --> Not needed
-        if (GalacticraftCore.isModLoaded() && GT_GC_Compat.canConnect(tileEntity, oppositeSide)) return true;
+        if (GalacticraftCore.isModLoaded() && GTGCCompat.canConnect(tileEntity, oppositeSide)) return true;
 
         // AE2-p2p Compat
         if (tileEntity instanceof appeng.tile.powersink.IC2 ic2sink
@@ -372,25 +372,25 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
                 && ((IEnergySink) ic2Energy).acceptsEnergyFrom((TileEntity) baseMetaTile, oppositeSide)) return true;
 
             // IC2 Source Compat
-            if (GT_Mod.gregtechproxy.ic2EnergySourceCompat && (ic2Energy instanceof IEnergySource)) {
+            if (GTMod.gregtechproxy.ic2EnergySourceCompat && (ic2Energy instanceof IEnergySource)) {
                 if (((IEnergySource) ic2Energy).emitsEnergyTo((TileEntity) baseMetaTile, oppositeSide)) {
                     return true;
                 }
             }
         }
         // RF Output Compat
-        if (GregTech_API.mOutputRF && tileEntity instanceof IEnergyReceiver
+        if (GregTechAPI.mOutputRF && tileEntity instanceof IEnergyReceiver
             && ((IEnergyReceiver) tileEntity).canConnectEnergy(oppositeSide)) return true;
 
         // RF Input Compat
-        return GregTech_API.mInputRF && (tileEntity instanceof IEnergyEmitter
+        return GregTechAPI.mInputRF && (tileEntity instanceof IEnergyEmitter
             && ((IEnergyEmitter) tileEntity).emitsEnergyTo((TileEntity) baseMetaTile, oppositeSide));
     }
 
     @Override
     public boolean getGT6StyleConnection() {
         // Yes if GT6 Cables are enabled
-        return GT_Mod.gregtechproxy.gt6Cable;
+        return GTMod.gregtechproxy.gt6Cable;
     }
 
     @Override
@@ -410,19 +410,19 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
         return new String[] {
             StatCollector.translateToLocal("GT5U.item.cable.max_voltage") + ": %%%"
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mVoltage)
+                + GTUtility.formatNumbers(mVoltage)
                 + " ("
-                + GT_Utility.getColoredTierNameFromVoltage(mVoltage)
+                + GTUtility.getColoredTierNameFromVoltage(mVoltage)
                 + EnumChatFormatting.GREEN
                 + ")"
                 + EnumChatFormatting.GRAY,
             StatCollector.translateToLocal("GT5U.item.cable.max_amperage") + ": %%%"
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mAmperage)
+                + GTUtility.formatNumbers(mAmperage)
                 + EnumChatFormatting.GRAY,
             StatCollector.translateToLocal("GT5U.item.cable.loss") + ": %%%"
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(mCableLossPerMeter)
+                + GTUtility.formatNumbers(mCableLossPerMeter)
                 + EnumChatFormatting.GRAY
                 + "%%% "
                 + StatCollector.translateToLocal("GT5U.item.cable.eu_volt") };
@@ -430,18 +430,18 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
     @Override
     public float getThickNess() {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x1) != 0) return 0.0625F;
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x1) != 0) return 0.0625F;
         return mThickNess;
     }
 
     @Override
     public void saveNBTData(NBTTagCompound aNBT) {
-        if (GT_Mod.gregtechproxy.gt6Cable) aNBT.setByte("mConnections", mConnections);
+        if (GTMod.gregtechproxy.gt6Cable) aNBT.setByte("mConnections", mConnections);
     }
 
     @Override
     public void loadNBTData(NBTTagCompound aNBT) {
-        if (GT_Mod.gregtechproxy.gt6Cable) {
+        if (GTMod.gregtechproxy.gt6Cable) {
             mConnections = aNBT.getByte("mConnections");
         }
     }
@@ -469,34 +469,34 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
         return new String[] {
             "Amperage: " + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(currAmp)
+                + GTUtility.formatNumbers(currAmp)
                 + EnumChatFormatting.RESET
                 + " / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mAmperage)
+                + GTUtility.formatNumbers(mAmperage)
                 + EnumChatFormatting.RESET
                 + " A",
             "Voltage Out: " + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(currVoltage)
+                + GTUtility.formatNumbers(currVoltage)
                 + EnumChatFormatting.RESET
                 + " / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxVoltageOut)
+                + GTUtility.formatNumbers(maxVoltageOut)
                 + EnumChatFormatting.RESET
                 + " EU/t",
             "Avg Amperage (20t): " + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(avgAmp)
+                + GTUtility.formatNumbers(avgAmp)
                 + EnumChatFormatting.RESET
                 + " A",
             "Avg Output (20t): " + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(avgVoltage)
+                + GTUtility.formatNumbers(avgVoltage)
                 + EnumChatFormatting.RESET
                 + " EU/t" };
     }
 
     @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0)
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0)
             return AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 1, aZ + 1);
         else return getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
     }
@@ -556,7 +556,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB,
         List<AxisAlignedBB> outputAABB, Entity collider) {
         super.addCollisionBoxesToList(aWorld, aX, aY, aZ, inputAABB, outputAABB, collider);
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0) {
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0) {
             final AxisAlignedBB aabb = getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
             if (inputAABB.intersectsWith(aabb)) outputAABB.add(aabb);
         }
@@ -564,7 +564,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
     @Override
     public boolean shouldJoinIc2Enet() {
-        if (!GT_Mod.gregtechproxy.ic2EnergySourceCompat) return false;
+        if (!GTMod.gregtechproxy.ic2EnergySourceCompat) return false;
 
         if (mConnections != 0) {
             final IGregTechTileEntity baseMeta = getBaseMetaTileEntity();
@@ -594,7 +594,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
             for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
                 if (isConnectedAtSide(side)) {
                     final CoverInfo coverInfo = pipe.getCoverInfoAtSide(side);
-                    if (coverInfo.getCoverBehavior() instanceof GT_Cover_None) continue;
+                    if (coverInfo.getCoverBehavior() instanceof GTCoverNone) continue;
                     if (!letsIn(coverInfo) || !letsOut(coverInfo)) {
                         pipe.addToLock(pipe, side);
                     } else {
@@ -607,7 +607,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
             for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
                 if (isConnectedAtSide(side)) {
                     final CoverInfo coverInfo = pipe.getCoverInfoAtSide(side);
-                    if (coverInfo.getCoverBehavior() instanceof GT_Cover_None) continue;
+                    if (coverInfo.getCoverBehavior() instanceof GTCoverNone) continue;
 
                     if (!letsIn(coverInfo) || !letsOut(coverInfo)) {
                         dontAllow = true;
@@ -629,19 +629,19 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
         currenttip.add(
             StatCollector.translateToLocal("GT5U.item.cable.max_voltage") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mVoltage)
+                + GTUtility.formatNumbers(mVoltage)
                 + " ("
-                + GT_Utility.getColoredTierNameFromVoltage(mVoltage)
+                + GTUtility.getColoredTierNameFromVoltage(mVoltage)
                 + EnumChatFormatting.GREEN
                 + ")");
         currenttip.add(
             StatCollector.translateToLocal("GT5U.item.cable.max_amperage") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mAmperage));
+                + GTUtility.formatNumbers(mAmperage));
         currenttip.add(
             StatCollector.translateToLocal("GT5U.item.cable.loss") + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(mCableLossPerMeter)
+                + GTUtility.formatNumbers(mCableLossPerMeter)
                 + EnumChatFormatting.RESET
                 + " "
                 + StatCollector.translateToLocal("GT5U.item.cable.eu_volt"));
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTECubicMultiBlockBase.java
index efb91e3a26..c8b0c8ce3f 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTECubicMultiBlockBase.java
@@ -4,13 +4,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 
 import java.util.List;
 
@@ -25,7 +25,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_StructureUtility;
+import gregtech.api.util.GTStructureUtility;
 
 /**
  * A simple 3x3x3 hollow cubic multiblock, that can be arbitrarily rotated, made of a single type of machine casing and
@@ -41,15 +41,15 @@ import gregtech.api.util.GT_StructureUtility;
  *
  * @param <T>
  */
-public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTileEntity_CubicMultiBlockBase<T>>
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> implements ISurvivalConstructable {
+public abstract class MTECubicMultiBlockBase<T extends MTECubicMultiBlockBase<T>> extends MTEEnhancedMultiBlockBase<T>
+    implements ISurvivalConstructable {
 
     protected static final String STRUCTURE_PIECE_MAIN = "main";
-    protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>>> STRUCTURE_DEFINITION = new ClassValue<>() {
+    protected static final ClassValue<IStructureDefinition<MTECubicMultiBlockBase<?>>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
-        protected IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>> computeValue(Class<?> type) {
-            return StructureDefinition.<GT_MetaTileEntity_CubicMultiBlockBase<?>>builder()
+        protected IStructureDefinition<MTECubicMultiBlockBase<?>> computeValue(Class<?> type) {
+            return StructureDefinition.<MTECubicMultiBlockBase<?>>builder()
                 .addShape(
                     STRUCTURE_PIECE_MAIN,
                     transpose(
@@ -58,24 +58,24 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil
                     'h',
                     ofChain(
                         lazy(
-                            t -> GT_StructureUtility.<GT_MetaTileEntity_CubicMultiBlockBase<?>>buildHatchAdder()
+                            t -> GTStructureUtility.<MTECubicMultiBlockBase<?>>buildHatchAdder()
                                 .atLeastList(t.getAllowedHatches())
                                 .casingIndex(t.getHatchTextureIndex())
                                 .dot(1)
                                 .build()),
                         onElementPass(
-                            GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded,
-                            lazy(GT_MetaTileEntity_CubicMultiBlockBase::getCasingElement))))
+                            MTECubicMultiBlockBase::onCorrectCasingAdded,
+                            lazy(MTECubicMultiBlockBase::getCasingElement))))
                 .build();
         }
     };
     private int mCasingAmount = 0;
 
-    protected GT_MetaTileEntity_CubicMultiBlockBase(int aID, String aName, String aNameRegional) {
+    protected MTECubicMultiBlockBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    protected GT_MetaTileEntity_CubicMultiBlockBase(String aName) {
+    protected MTECubicMultiBlockBase(String aName) {
         super(aName);
     }
 
@@ -122,9 +122,9 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil
         return mMaintenanceHatches.size() == 1;
     }
 
-    protected abstract IStructureElement<GT_MetaTileEntity_CubicMultiBlockBase<?>> getCasingElement();
+    protected abstract IStructureElement<MTECubicMultiBlockBase<?>> getCasingElement();
 
-    protected List<IHatchElement<? super GT_MetaTileEntity_CubicMultiBlockBase<?>>> getAllowedHatches() {
+    protected List<IHatchElement<? super MTECubicMultiBlockBase<?>>> getAllowedHatches() {
         return ImmutableList.of(InputHatch, OutputHatch, InputBus, OutputBus, Muffler, Maintenance, Energy);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
index 15ce78fae3..2cf4398e87 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
@@ -19,30 +19,30 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 
 import cpw.mods.fml.common.network.NetworkRegistry;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 
 /**
- * Enhanced multiblock base class, featuring following improvement over {@link GT_MetaTileEntity_MultiBlockBase}
+ * Enhanced multiblock base class, featuring following improvement over {@link MTEMultiBlockBase}
  * <p>
  * 1. TecTech style declarative structure check utilizing StructureLib. 2. Arbitrarily rotating the whole structure, if
  * allowed to.
  *
  * @param <T> type of this
  */
-public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>>
-    extends GT_MetaTileEntity_TooltipMultiBlockBase implements IAlignment, IConstructable {
+public abstract class MTEEnhancedMultiBlockBase<T extends MTEEnhancedMultiBlockBase<T>> extends MTETooltipMultiBlockBase
+    implements IAlignment, IConstructable {
 
     private ExtendedFacing mExtendedFacing = ExtendedFacing.DEFAULT;
     private IAlignmentLimits mLimits = getInitialAlignmentLimits();
 
-    protected GT_MetaTileEntity_EnhancedMultiBlockBase(int aID, String aName, String aNameRegional) {
+    protected MTEEnhancedMultiBlockBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    protected GT_MetaTileEntity_EnhancedMultiBlockBase(String aName) {
+    protected MTEEnhancedMultiBlockBase(String aName) {
         super(aName);
     }
 
@@ -61,7 +61,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
             mUpdated = false;
             mUpdate = 50;
             if (getBaseMetaTileEntity().isServerSide()
-                && !GregTech_API.isDummyWorld(getBaseMetaTileEntity().getWorld())) {
+                && !GregTechAPI.isDummyWorld(getBaseMetaTileEntity().getWorld())) {
                 StructureLibAPI.sendAlignment(
                     (IAlignmentProvider) base,
                     new NetworkRegistry.TargetPoint(
@@ -123,7 +123,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
      */
     public abstract IStructureDefinition<T> getStructureDefinition();
 
-    protected abstract GT_Multiblock_Tooltip_Builder createTooltip();
+    protected abstract MultiblockTooltipBuilder createTooltip();
 
     @Override
     public String[] getStructureDescription(ItemStack stackSize) {
@@ -184,8 +184,8 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
     }
 
     @SuppressWarnings("unchecked")
-    private IStructureDefinition<GT_MetaTileEntity_EnhancedMultiBlockBase<T>> getCastedStructureDefinition() {
-        return (IStructureDefinition<GT_MetaTileEntity_EnhancedMultiBlockBase<T>>) getStructureDefinition();
+    private IStructureDefinition<MTEEnhancedMultiBlockBase<T>> getCastedStructureDefinition() {
+        return (IStructureDefinition<MTEEnhancedMultiBlockBase<T>>) getStructureDefinition();
     }
 
     /**
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEExtendedPowerMultiBlockBase.java
index f430114319..64bade97e8 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEExtendedPowerMultiBlockBase.java
@@ -1,7 +1,7 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.VN;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.enums.GTValues.VN;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,25 +21,25 @@ import org.jetbrains.annotations.NotNull;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.check.CheckRecipeResult;
-import gregtech.api.util.GT_ExoticEnergyInputHelper;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.ExoticEnergyInputHelper;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.OverclockCalculator;
 import gregtech.api.util.shutdown.ShutDownReason;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 
 /**
  * Multiblock base class that allows machine to use power over int.
  */
-public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>>
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> {
+public abstract class MTEExtendedPowerMultiBlockBase<T extends MTEEnhancedMultiBlockBase<T>>
+    extends MTEEnhancedMultiBlockBase<T> {
 
     public long lEUt;
 
-    protected GT_MetaTileEntity_ExtendedPowerMultiBlockBase(int aID, String aName, String aNameRegional) {
+    protected MTEExtendedPowerMultiBlockBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    protected GT_MetaTileEntity_ExtendedPowerMultiBlockBase(String aName) {
+    protected MTEExtendedPowerMultiBlockBase(String aName) {
         super(aName);
     }
 
@@ -59,7 +59,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
     @Override
     protected void calculateOverclockedNessMultiInternal(long aEUt, int aDuration, int mAmperage, long maxInputVoltage,
         boolean perfectOC) {
-        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(aEUt)
+        OverclockCalculator calculator = new OverclockCalculator().setRecipeEUt(aEUt)
             .setEUt(maxInputVoltage * mAmperage)
             .setDuration(aDuration)
             .setDurationDecreasePerOC(perfectOC ? 4.0 : 2.0)
@@ -94,8 +94,8 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
         return (-this.lEUt * 10000) / Math.max(1000, mEfficiency);
     }
 
-    public List<GT_MetaTileEntity_Hatch> getExoticAndNormalEnergyHatchList() {
-        List<GT_MetaTileEntity_Hatch> tHatches = new ArrayList<>();
+    public List<MTEHatch> getExoticAndNormalEnergyHatchList() {
+        List<MTEHatch> tHatches = new ArrayList<>();
         tHatches.addAll(filterValidMTEs(mExoticEnergyHatches));
         tHatches.addAll(filterValidMTEs(mEnergyHatches));
         return tHatches;
@@ -103,7 +103,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
 
     @Override
     public boolean drainEnergyInput(long aEU) {
-        return GT_ExoticEnergyInputHelper.drainEnergy(aEU, getExoticAndNormalEnergyHatchList());
+        return ExoticEnergyInputHelper.drainEnergy(aEU, getExoticAndNormalEnergyHatchList());
     }
 
     @Override
@@ -145,13 +145,13 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
         }
 
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : getExoticAndNormalEnergyHatchList()) {
+        for (MTEHatch tHatch : getExoticAndNormalEnergyHatchList()) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -163,30 +163,30 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
         return new String[] {
             /* 1 */ StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mProgresstime / 20)
+                + GTUtility.formatNumbers(mProgresstime / 20)
                 + EnumChatFormatting.RESET
                 + " s / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mMaxProgresstime / 20)
+                + GTUtility.formatNumbers(mMaxProgresstime / 20)
                 + EnumChatFormatting.RESET
                 + " s",
             /* 2 */ StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(storedEnergy)
+                + GTUtility.formatNumbers(storedEnergy)
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxEnergy)
+                + GTUtility.formatNumbers(maxEnergy)
                 + EnumChatFormatting.RESET
                 + " EU",
             /* 3 */ StatCollector.translateToLocal("GT5U.multiblock.usage") + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(getActualEnergyUsage())
+                + GTUtility.formatNumbers(getActualEnergyUsage())
                 + EnumChatFormatting.RESET
                 + " EU/t",
             /* 4 */ StatCollector.translateToLocal("GT5U.multiblock.mei") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(voltage)
+                + GTUtility.formatNumbers(voltage)
                 + EnumChatFormatting.RESET
                 + " EU/t(*"
                 + amps
@@ -194,7 +194,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
                 + StatCollector.translateToLocal("GT5U.machines.tier")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + VN[GT_Utility.getTier(voltage)]
+                + VN[GTUtility.getTier(voltage)]
                 + EnumChatFormatting.RESET,
             /* 5 */ StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
                 + EnumChatFormatting.RED
@@ -216,22 +216,22 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
 
     @Override
     public long getMaxInputVoltage() {
-        return GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList());
+        return ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList());
     }
 
     @Override
     public long getAverageInputVoltage() {
-        return GT_ExoticEnergyInputHelper.getAverageInputVoltageMulti(getExoticAndNormalEnergyHatchList());
+        return ExoticEnergyInputHelper.getAverageInputVoltageMulti(getExoticAndNormalEnergyHatchList());
     }
 
     @Override
     public long getMaxInputAmps() {
-        return GT_ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(getExoticAndNormalEnergyHatchList());
+        return ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(getExoticAndNormalEnergyHatchList());
     }
 
     @Override
     public long getMaxInputEu() {
-        return GT_ExoticEnergyInputHelper.getTotalEuMulti(getExoticAndNormalEnergyHatchList());
+        return ExoticEnergyInputHelper.getTotalEuMulti(getExoticAndNormalEnergyHatchList());
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_FilterBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFilterBase.java
index 896cb223f3..32e224e50f 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_FilterBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFilterBase.java
@@ -5,11 +5,11 @@ import net.minecraft.nbt.NBTTagCompound;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.util.GT_TooltipDataCache;
 
-public abstract class GT_MetaTileEntity_FilterBase extends GT_MetaTileEntity_Buffer {
+public abstract class MTEFilterBase extends MTEBuffer {
 
     private static final String INVERT_FILTER_TOOLTIP = "GT5U.machines.invert_filter.tooltip";
     protected static final int FILTER_SLOT_INDEX = 9;
@@ -17,23 +17,21 @@ public abstract class GT_MetaTileEntity_FilterBase extends GT_MetaTileEntity_Buf
     private static final String EMIT_REDSTONE_GRADUALLY_TOOLTIP = "GT5U" + ".machines.emit_redstone_gradually.tooltip";
     protected boolean invertFilter = false;
 
-    public GT_MetaTileEntity_FilterBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEFilterBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_FilterBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEFilterBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_FilterBase(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEFilterBase(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_FilterBase(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEFilterBase(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -86,7 +84,7 @@ public abstract class GT_MetaTileEntity_FilterBase extends GT_MetaTileEntity_Buf
             createToggleButton(
                 () -> bRedstoneIfFull,
                 val -> bRedstoneIfFull = val,
-                GT_UITextures.OVERLAY_BUTTON_EMIT_REDSTONE,
+                GTUITextures.OVERLAY_BUTTON_EMIT_REDSTONE,
                 this::getEmitRedstoneGraduallyButtonTooltip).setUpdateTooltipEveryTick(true));
     }
 
@@ -100,7 +98,7 @@ public abstract class GT_MetaTileEntity_FilterBase extends GT_MetaTileEntity_Buf
             createToggleButton(
                 () -> invertFilter,
                 val -> invertFilter = val,
-                GT_UITextures.OVERLAY_BUTTON_INVERT_FILTER,
+                GTUITextures.OVERLAY_BUTTON_INVERT_FILTER,
                 () -> mTooltipCache.getData(INVERT_FILTER_TOOLTIP)));
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java
index cafd1c9cb7..ddc0e28723 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java
@@ -1,13 +1,13 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
-import static gregtech.api.enums.GT_Values.D1;
+import static gregtech.api.enums.GTValues.ALL_VALID_SIDES;
+import static gregtech.api.enums.GTValues.D1;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.enums.Mods.Translocator;
-import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.BOTTOM;
-import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.LEFT;
-import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.RIGHT;
-import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.TOP;
+import static gregtech.api.metatileentity.implementations.MTEFluid.Border.BOTTOM;
+import static gregtech.api.metatileentity.implementations.MTEFluid.Border.LEFT;
+import static gregtech.api.metatileentity.implementations.MTEFluid.Border.RIGHT;
+import static gregtech.api.metatileentity.implementations.MTEFluid.Border.TOP;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 import static net.minecraftforge.common.util.ForgeDirection.DOWN;
 import static net.minecraftforge.common.util.ForgeDirection.EAST;
@@ -39,7 +39,7 @@ import net.minecraftforge.fluids.IFluidHandler;
 import org.apache.commons.lang3.tuple.MutableTriple;
 
 import cpw.mods.fml.common.Optional;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
@@ -53,23 +53,23 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
 import gregtech.common.config.other.ConfigGeneral;
+import gregtech.common.covers.CoverDrain;
+import gregtech.common.covers.CoverFluidRegulator;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.covers.GT_Cover_Drain;
-import gregtech.common.covers.GT_Cover_FluidRegulator;
 
-public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
+public class MTEFluid extends MetaPipeEntity {
 
     protected static final EnumMap<ForgeDirection, EnumMap<Border, ForgeDirection>> FACE_BORDER_MAP = new EnumMap<>(
         ForgeDirection.class);
@@ -114,13 +114,13 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
      */
     public byte mDisableInput = 0;
 
-    public GT_MetaPipeEntity_Fluid(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
-        int aCapacity, int aHeatResistance, boolean aGasProof) {
+    public MTEFluid(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial, int aCapacity,
+        int aHeatResistance, boolean aGasProof) {
         this(aID, aName, aNameRegional, aThickNess, aMaterial, aCapacity, aHeatResistance, aGasProof, 1);
     }
 
-    public GT_MetaPipeEntity_Fluid(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
-        int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) {
+    public MTEFluid(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial, int aCapacity,
+        int aHeatResistance, boolean aGasProof, int aFluidTypes) {
         super(aID, aName, aNameRegional, 0, false);
         mThickNess = aThickNess;
         mMaterial = aMaterial;
@@ -132,8 +132,8 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         addInfo(aID);
     }
 
-    public GT_MetaPipeEntity_Fluid(String aName, float aThickNess, Materials aMaterial, int aCapacity,
-        int aHeatResistance, boolean aGasProof, int aFluidTypes) {
+    public MTEFluid(String aName, float aThickNess, Materials aMaterial, int aCapacity, int aHeatResistance,
+        boolean aGasProof, int aFluidTypes) {
         super(aName, 0);
         mThickNess = aThickNess;
         mMaterial = aMaterial;
@@ -151,14 +151,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaPipeEntity_Fluid(
-            mName,
-            mThickNess,
-            mMaterial,
-            mCapacity,
-            mHeatResistance,
-            mGasProof,
-            mPipeAmount);
+        return new MTEFluid(mName, mThickNess, mMaterial, mCapacity, mHeatResistance, mGasProof, mPipeAmount);
     }
 
     @Override
@@ -260,7 +253,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         for (int i = 0; i < mPipeAmount; i++) if (mFluids[i] != null)
             aNBT.setTag("mFluid" + (i == 0 ? "" : i), mFluids[i].writeToNBT(new NBTTagCompound()));
         aNBT.setByte("mLastReceivedFrom", mLastReceivedFrom);
-        if (GT_Mod.gregtechproxy.gt6Pipe) {
+        if (GTMod.gregtechproxy.gt6Pipe) {
             aNBT.setByte("mConnections", mConnections);
             aNBT.setByte("mDisableInput", mDisableInput);
         }
@@ -271,7 +264,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         for (int i = 0; i < mPipeAmount; i++)
             mFluids[i] = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid" + (i == 0 ? "" : i)));
         mLastReceivedFrom = aNBT.getByte("mLastReceivedFrom");
-        if (GT_Mod.gregtechproxy.gt6Pipe) {
+        if (GTMod.gregtechproxy.gt6Pipe) {
             mConnections = aNBT.getByte("mConnections");
             mDisableInput = aNBT.getByte("mDisableInput");
         }
@@ -287,11 +280,11 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                         .getTemperature(tFluid);
                     if (tTemperature > 320
                         && !isCoverOnSide((BaseMetaPipeEntity) getBaseMetaTileEntity(), (EntityLivingBase) aEntity)) {
-                        GT_Utility.applyHeatDamage((EntityLivingBase) aEntity, (tTemperature - 300) / 50.0F);
+                        GTUtility.applyHeatDamage((EntityLivingBase) aEntity, (tTemperature - 300) / 50.0F);
                         break;
                     } else if (tTemperature < 260
                         && !isCoverOnSide((BaseMetaPipeEntity) getBaseMetaTileEntity(), (EntityLivingBase) aEntity)) {
-                            GT_Utility.applyFrostDamage((EntityLivingBase) aEntity, (270 - tTemperature) / 25.0F);
+                            GTUtility.applyFrostDamage((EntityLivingBase) aEntity, (270 - tTemperature) / 25.0F);
                             break;
                         }
                 }
@@ -308,7 +301,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                 mLastReceivedFrom = 0;
             }
 
-            if (!GT_Mod.gregtechproxy.gt6Pipe || mCheckConnections) checkConnections();
+            if (!GTMod.gregtechproxy.gt6Pipe || mCheckConnections) checkConnections();
 
             final boolean shouldDistribute = (oLastReceivedFrom == mLastReceivedFrom);
             for (int i = 0, j = aBaseMetaTileEntity.getRandomNumber(mPipeAmount); i < mPipeAmount; i++) {
@@ -338,7 +331,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
             if (tTemperature > mHeatResistance) {
                 if (aBaseMetaTileEntity.getRandomNumber(100) == 0) {
                     // Poof
-                    GT_Log.exp.println(
+                    GTLog.exp.println(
                         "Set Pipe to Fire due to to low heat resistance at " + aBaseMetaTileEntity.getXCoord()
                             + " | "
                             + aBaseMetaTileEntity.getYCoord()
@@ -351,7 +344,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                 }
                 // Mmhmm, Fire
                 aBaseMetaTileEntity.setOnFire();
-                GT_Log.exp.println(
+                GTLog.exp.println(
                     "Set Blocks around Pipe to Fire due to to low heat resistance at " + aBaseMetaTileEntity.getXCoord()
                         + " | "
                         + aBaseMetaTileEntity.getYCoord()
@@ -376,10 +369,10 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                                     getBaseMetaTileEntity().getXCoord() + 3,
                                     getBaseMetaTileEntity().getYCoord() + 3,
                                     getBaseMetaTileEntity().getZCoord() + 3))) {
-                            GT_Utility.applyHeatDamage(tLiving, (tTemperature - 300) / 25.0F);
+                            GTUtility.applyHeatDamage(tLiving, (tTemperature - 300) / 25.0F);
                         }
                     } catch (Throwable e) {
-                        if (D1) e.printStackTrace(GT_Log.err);
+                        if (D1) e.printStackTrace(GTLog.err);
                     }
                 } else if (tTemperature < 260) {
                     try {
@@ -393,10 +386,10 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                                     getBaseMetaTileEntity().getXCoord() + 3,
                                     getBaseMetaTileEntity().getYCoord() + 3,
                                     getBaseMetaTileEntity().getZCoord() + 3))) {
-                            GT_Utility.applyFrostDamage(tLiving, (270 - tTemperature) / 12.5F);
+                            GTUtility.applyFrostDamage(tLiving, (270 - tTemperature) / 12.5F);
                         }
                     } catch (Throwable e) {
-                        if (D1) e.printStackTrace(GT_Log.err);
+                        if (D1) e.printStackTrace(GTLog.err);
                     }
                 }
             }
@@ -468,21 +461,21 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
 
     public void connectPipeOnSide(ForgeDirection side, EntityPlayer entityPlayer) {
         if (!isConnectedAtSide(side)) {
-            if (connect(side) > 0) GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("214", "Connected"));
+            if (connect(side) > 0) GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("214", "Connected"));
         } else {
             disconnect(side);
-            GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("215", "Disconnected"));
+            GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("215", "Disconnected"));
         }
     }
 
     public void blockPipeOnSide(ForgeDirection side, EntityPlayer entityPlayer, byte mask) {
         if (isInputDisabledAtSide(side)) {
             mDisableInput &= ~mask;
-            GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("212", "Input enabled"));
+            GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("212", "Input enabled"));
             if (!isConnectedAtSide(side)) connect(side);
         } else {
             mDisableInput |= mask;
-            GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("213", "Input disabled"));
+            GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("213", "Input disabled"));
         }
     }
 
@@ -490,11 +483,11 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     public boolean onWrenchRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer entityPlayer,
         float aX, float aY, float aZ, ItemStack aTool) {
 
-        if (GT_Mod.gregtechproxy.gt6Pipe) {
-            final int mode = GT_MetaGenerated_Tool.getToolMode(aTool);
+        if (GTMod.gregtechproxy.gt6Pipe) {
+            final int mode = MetaGeneratedTool.getToolMode(aTool);
             IGregTechTileEntity currentPipeBase = getBaseMetaTileEntity();
-            GT_MetaPipeEntity_Fluid currentPipe = (GT_MetaPipeEntity_Fluid) currentPipeBase.getMetaTileEntity();
-            final ForgeDirection tSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
+            MTEFluid currentPipe = (MTEFluid) currentPipeBase.getMetaTileEntity();
+            final ForgeDirection tSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
             final byte tMask = (byte) (tSide.flag);
 
             if (mode == ToolModes.REGULAR.get()) {
@@ -526,10 +519,9 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                         return wasActionPerformed;
                     }
 
-                    GT_MetaPipeEntity_Fluid nextPipe = nextPipeBase
-                        .getMetaTileEntity() instanceof GT_MetaPipeEntity_Fluid
-                            ? (GT_MetaPipeEntity_Fluid) nextPipeBase.getMetaTileEntity()
-                            : null;
+                    MTEFluid nextPipe = nextPipeBase.getMetaTileEntity() instanceof MTEFluid
+                        ? (MTEFluid) nextPipeBase.getMetaTileEntity()
+                        : null;
 
                     // if next tile entity is not a pipe
                     if (nextPipe == null) {
@@ -580,25 +572,25 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsIn(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsFluidIn(side, aCoverID, aCoverVariable, null, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsOut(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsFluidOut(side, aCoverID, aCoverVariable, null, aTileEntity);
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsIn(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsFluidIn(side, aCoverID, aCoverVariable, null, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsOut(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsFluidOut(side, aCoverID, aCoverVariable, null, aTileEntity);
     }
@@ -621,13 +613,13 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         final IGregTechTileEntity baseMetaTile = getBaseMetaTileEntity();
         if (baseMetaTile == null) return false;
 
-        final GT_CoverBehaviorBase<?> coverBehavior = baseMetaTile.getCoverBehaviorAtSideNew(side);
+        final CoverBehaviorBase<?> coverBehavior = baseMetaTile.getCoverBehaviorAtSideNew(side);
         final IGregTechTileEntity gTileEntity = (tileEntity instanceof IGregTechTileEntity)
             ? (IGregTechTileEntity) tileEntity
             : null;
 
-        if (coverBehavior instanceof GT_Cover_Drain
-            || (TinkerConstruct.isModLoaded() && isTConstructFaucet(tileEntity))) return true;
+        if (coverBehavior instanceof CoverDrain || (TinkerConstruct.isModLoaded() && isTConstructFaucet(tileEntity)))
+            return true;
 
         final IFluidHandler fTileEntity = (tileEntity instanceof IFluidHandler) ? (IFluidHandler) tileEntity : null;
 
@@ -636,7 +628,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
             if (tInfo != null) {
                 return tInfo.length > 0 || (Translocator.isModLoaded() && isTranslocator(tileEntity))
                     || gTileEntity != null
-                        && gTileEntity.getCoverBehaviorAtSideNew(tSide) instanceof GT_Cover_FluidRegulator;
+                        && gTileEntity.getCoverBehaviorAtSideNew(tSide) instanceof CoverFluidRegulator;
             }
         }
         return false;
@@ -657,14 +649,14 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     @Override
     public boolean getGT6StyleConnection() {
         // Yes if GT6 pipes are enabled
-        return GT_Mod.gregtechproxy.gt6Pipe;
+        return GTMod.gregtechproxy.gt6Pipe;
     }
 
     @Override
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         super.doSound(aIndex, aX, aY, aZ);
         if (aIndex == 9) {
-            GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 5, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 5, 1.0F, aX, aY, aZ);
 
             new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD)
                 .setWorld(getBaseMetaTileEntity().getWorld())
@@ -837,12 +829,12 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         List<String> descriptions = new ArrayList<>();
         descriptions.add(
             EnumChatFormatting.BLUE + "Fluid Capacity: %%%"
-                + GT_Utility.formatNumbers(mCapacity * 20L)
+                + GTUtility.formatNumbers(mCapacity * 20L)
                 + "%%% L/sec"
                 + EnumChatFormatting.GRAY);
         descriptions.add(
             EnumChatFormatting.RED + "Heat Limit: %%%"
-                + GT_Utility.formatNumbers(mHeatResistance)
+                + GTUtility.formatNumbers(mHeatResistance)
                 + "%%% K"
                 + EnumChatFormatting.GRAY);
         if (!mGasProof) {
@@ -856,7 +848,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
 
     @Override
     public float getThickNess() {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x1) != 0) return 0.0625F;
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x1) != 0) return 0.0625F;
         return mThickNess;
     }
 
@@ -876,7 +868,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
 
     @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0)
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0)
             return AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 1, aZ + 1);
         else return getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
     }
@@ -931,7 +923,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB,
         List<AxisAlignedBB> outputAABB, Entity collider) {
         super.addCollisionBoxesToList(aWorld, aX, aY, aZ, inputAABB, outputAABB, collider);
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0) {
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0) {
             final AxisAlignedBB aabb = getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
             if (inputAABB.intersectsWith(aabb)) outputAABB.add(aabb);
         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFrame.java
index 7cb2b3a9bd..ec000b6e9c 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFrame.java
@@ -12,22 +12,22 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_MetaPipeEntity_Frame extends MetaPipeEntity {
+public class MTEFrame extends MetaPipeEntity {
 
-    private static final String localizedDescFormat = GT_LanguageManager
+    private static final String localizedDescFormat = GTLanguageManager
         .addStringLocalization("gt.blockmachines.gt_frame.desc.format", "Just something you can put covers on.");
     public final Materials mMaterial;
 
-    public GT_MetaPipeEntity_Frame(int aID, String aName, String aNameRegional, Materials aMaterial) {
+    public MTEFrame(int aID, String aName, String aNameRegional, Materials aMaterial) {
         super(aID, aName, aNameRegional, 0);
         mMaterial = aMaterial;
         // Hide TileEntity frame in NEI, since we have the block version now that should always be used
         codechicken.nei.api.API.hideItem(this.getStackForm(1));
     }
 
-    public GT_MetaPipeEntity_Frame(String aName, Materials aMaterial) {
+    public MTEFrame(String aName, Materials aMaterial) {
         super(aName, 0);
         mMaterial = aMaterial;
     }
@@ -39,7 +39,7 @@ public class GT_MetaPipeEntity_Frame extends MetaPipeEntity {
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaPipeEntity_Frame(mName, mMaterial);
+        return new MTEFrame(mName, mMaterial);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatch.java
index 1e974f5e9d..bd0b3b6f61 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatch.java
@@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import appeng.api.crafting.ICraftingIconProvider;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -13,7 +13,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 /**
  * Handles texture changes internally. No special calls are necessary other than updateTexture in add***ToMachineList.
  */
-public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTank implements ICraftingIconProvider {
+public abstract class MTEHatch extends MTEBasicTank implements ICraftingIconProvider {
 
     public enum ConnectionType {
         CABLE,
@@ -32,23 +32,21 @@ public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTan
 
     private ItemStack ae2CraftingIcon;
 
-    public GT_MetaTileEntity_Hatch(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String aDescription, ITexture... aTextures) {
+    public MTEHatch(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription,
+        ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
-        String[] aDescription, ITexture... aTextures) {
+    public MTEHatch(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String[] aDescription,
+        ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatch(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatch(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -105,9 +103,9 @@ public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTan
         actualTexture = aNBT.getByte("mMachineBlock");
         mTexturePage = aNBT.getByte("mTexturePage");
 
-        if (mTexturePage != 0 && GT_Values.GT.isServerSide()) actualTexture |= 0x80; // <- lets just hope no one needs
-                                                                                     // the correct value for that on
-                                                                                     // server
+        if (mTexturePage != 0 && GTValues.GT.isServerSide()) actualTexture |= 0x80; // <- lets just hope no one needs
+                                                                                    // the correct value for that on
+                                                                                    // server
         mMachineBlock = actualTexture;
     }
 
@@ -137,7 +135,7 @@ public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTan
     /**
      * Some multiblocks restrict hatches by tier. This method allows hatches to specify custom tier used for
      * structure check, while keeping {@link #mTier} for other uses.
-     * 
+     *
      * @return Tier used for multiblock structure
      */
     public byte getTierForStructure() {
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchDataAccess.java
index 18344082ea..38c3102ff2 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchDataAccess.java
@@ -14,20 +14,20 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_AssemblyLineUtils;
+import gregtech.api.util.AssemblyLineUtils;
 
-public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch implements IAddUIWidgets {
+public class MTEHatchDataAccess extends MTEHatch implements IAddUIWidgets {
 
     private int timeout = 4;
 
-    public GT_MetaTileEntity_Hatch_DataAccess(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchDataAccess(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -38,12 +38,11 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
                 "Adds " + (aTier == 4 ? 4 : 16) + " extra slots for Data Sticks" });
     }
 
-    public GT_MetaTileEntity_Hatch_DataAccess(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchDataAccess(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aTier == 4 ? 4 : 16, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_DataAccess(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchDataAccess(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aTier == 4 ? 4 : 16, aDescription, aTextures);
     }
 
@@ -79,12 +78,12 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_DataAccess(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchDataAccess(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -125,7 +124,7 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
         super.loadNBTData(aNBT);
         if (aNBT.getByte("mSticksUpdated") != 1) {
             for (int i = 0; i < getSizeInventory(); i++) {
-                GT_AssemblyLineUtils.processDataStick(getStackInSlot(i));
+                AssemblyLineUtils.processDataStick(getStackInSlot(i));
             }
         }
     }
@@ -140,7 +139,7 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
     @Override
     public void setInventorySlotContents(int aIndex, ItemStack aStack) {
         super.setInventorySlotContents(aIndex, aStack);
-        GT_AssemblyLineUtils.processDataStick(aStack);
+        AssemblyLineUtils.processDataStick(aStack);
     }
 
     public List<ItemStack> getInventoryItems(Predicate<ItemStack> filter) {
@@ -161,10 +160,10 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         if (mTier == 4) {
             getBaseMetaTileEntity()
-                .add2by2Slots(builder, getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CIRCUIT);
+                .add2by2Slots(builder, getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_CIRCUIT);
         } else {
             getBaseMetaTileEntity()
-                .add4by4Slots(builder, getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CIRCUIT);
+                .add4by4Slots(builder, getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_CIRCUIT);
         }
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Dynamo.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchDynamo.java
index 8e621434db..00f46fe9eb 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Dynamo.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchDynamo.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -11,9 +11,9 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_Hatch_Dynamo extends GT_MetaTileEntity_Hatch {
+public class MTEHatchDynamo extends MTEHatch {
 
-    public GT_MetaTileEntity_Hatch_Dynamo(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchDynamo(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -23,16 +23,15 @@ public class GT_MetaTileEntity_Hatch_Dynamo extends GT_MetaTileEntity_Hatch {
             new String[] { "Generating electric Energy from Multiblocks", "Puts out up to 1 Amp" });
     }
 
-    public GT_MetaTileEntity_Hatch_Dynamo(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTEHatchDynamo(int aID, String aName, String aNameRegional, int aTier, String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, 0, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_Dynamo(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchDynamo(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Dynamo(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchDynamo(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
@@ -93,7 +92,7 @@ public class GT_MetaTileEntity_Hatch_Dynamo extends GT_MetaTileEntity_Hatch {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Dynamo(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchDynamo(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchEnergy.java
index d9be12671d..12d22d3bc7 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchEnergy.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -11,14 +11,13 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_Hatch_Energy extends GT_MetaTileEntity_Hatch {
+public class MTEHatchEnergy extends MTEHatch {
 
-    public GT_MetaTileEntity_Hatch_Energy(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTEHatchEnergy(int aID, String aName, String aNameRegional, int aTier, String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, 0, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_Energy(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchEnergy(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -28,21 +27,20 @@ public class GT_MetaTileEntity_Hatch_Energy extends GT_MetaTileEntity_Hatch {
             new String[] { "Energy Injector for Multiblocks", "Accepts up to 2 Amps" });
     }
 
-    public GT_MetaTileEntity_Hatch_Energy(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEHatchEnergy(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Energy(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchEnergy(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Energy(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchEnergy(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Energy(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchEnergy(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -108,7 +106,7 @@ public class GT_MetaTileEntity_Hatch_Energy extends GT_MetaTileEntity_Hatch {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Energy(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchEnergy(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInput.java
index 705a3e6248..c660bcc8f8 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInput.java
@@ -9,35 +9,34 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.GTMod;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
+public class MTEHatchInput extends MTEHatch {
 
     public RecipeMap<?> mRecipeMap = null;
 
-    public GT_MetaTileEntity_Hatch_Input(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchInput(int aID, String aName, String aNameRegional, int aTier) {
         this(
             aID,
             aName,
             aNameRegional,
             aTier,
             new String[] { "Fluid Input for Multiblocks",
-                "Capacity: " + GT_Utility.formatNumbers(8000L * (1L << aTier)) + "L" });
+                "Capacity: " + GTUtility.formatNumbers(8000L * (1L << aTier)) + "L" });
     }
 
-    public GT_MetaTileEntity_Hatch_Input(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTEHatchInput(int aID, String aName, String aNameRegional, int aTier, String[] aDescription) {
         this(aID, 3, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_Input(int aID, int aSlot, String aName, String aNameRegional, int aTier) {
+    public MTEHatchInput(int aID, int aSlot, String aName, String aNameRegional, int aTier) {
         this(
             aID,
             aSlot,
@@ -45,16 +44,14 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
             aNameRegional,
             aTier,
             new String[] { "Fluid Input for Multiblocks", "", "Can hold " + aSlot + " types of fluid." });
-        mDescriptionArray[1] = "Capacity: " + GT_Utility.formatNumbers(getCapacityPerTank(aTier, aSlot)) + "L";
+        mDescriptionArray[1] = "Capacity: " + GTUtility.formatNumbers(getCapacityPerTank(aTier, aSlot)) + "L";
     }
 
-    public GT_MetaTileEntity_Hatch_Input(int aID, int aSlot, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTEHatchInput(int aID, int aSlot, String aName, String aNameRegional, int aTier, String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, aSlot, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_Input(int aID, String aName, String aNameRegional, int aTier, int allSlotCount,
-        String[] strings) {
+    public MTEHatchInput(int aID, String aName, String aNameRegional, int aTier, int allSlotCount, String[] strings) {
         super(aID, aName, aNameRegional, aTier, allSlotCount, strings);
     }
 
@@ -62,29 +59,28 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
         return (int) (8000L * (1L << aTier) / aSlot);
     }
 
-    public GT_MetaTileEntity_Hatch_Input(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchInput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Input(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchInput(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Input(String aName, int aSlots, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchInput(String aName, int aSlots, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aSlots, aDescription, aTextures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(FLUID_IN_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(FLUID_IN_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
     }
@@ -106,7 +102,7 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Input(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchInput(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -125,7 +121,7 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -181,7 +177,7 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
         ItemStack aStack) {
         return side == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0
             && (mRecipeMap == null || mRecipeMap.containsInput(aStack)
-                || mRecipeMap.containsInput(GT_Utility.getFluidForFilledItem(aStack, true)));
+                || mRecipeMap.containsInput(GTUtility.getFluidForFilledItem(aStack, true)));
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInputBus.java
index 8c99e813e2..f4f04c38a3 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInputBus.java
@@ -22,9 +22,9 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.api.widget.Widget;
 import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget;
 
-import gregtech.GT_Mod;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.GTMod;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IConfigurationCircuitSupport;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
@@ -32,14 +32,13 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ClientPreference;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTClientPreference;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.GT_TooltipDataCache;
-import gregtech.api.util.GT_Utility;
 import gregtech.api.util.extensions.ArrayExt;
 
-public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
-    implements IConfigurationCircuitSupport, IAddUIWidgets {
+public class MTEHatchInputBus extends MTEHatch implements IConfigurationCircuitSupport, IAddUIWidgets {
 
     private static final String SORTING_MODE_TOOLTIP = "GT5U.machines.sorting_mode.tooltip";
     private static final String ONE_STACK_LIMIT_TOOLTIP = "GT5U.machines.one_stack_limit.tooltip";
@@ -51,16 +50,15 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
     public boolean disableLimited = true;
     private int uiButtonCount = 0;
 
-    public GT_MetaTileEntity_Hatch_InputBus(int id, String name, String nameRegional, int tier) {
+    public MTEHatchInputBus(int id, String name, String nameRegional, int tier) {
         this(id, name, nameRegional, tier, getSlots(tier) + 1);
     }
 
-    protected GT_MetaTileEntity_Hatch_InputBus(int id, String name, String nameRegional, int tier, int slots,
-        String[] description) {
+    protected MTEHatchInputBus(int id, String name, String nameRegional, int tier, int slots, String[] description) {
         super(id, name, nameRegional, tier, slots, description);
     }
 
-    public GT_MetaTileEntity_Hatch_InputBus(int id, String name, String nameRegional, int tier, int slots) {
+    public MTEHatchInputBus(int id, String name, String nameRegional, int tier, int slots) {
         super(
             id,
             name,
@@ -73,25 +71,24 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
                 "Capacity: " + getSlots(tier) + " stack" + (getSlots(tier) >= 2 ? "s" : "")));
     }
 
-    public GT_MetaTileEntity_Hatch_InputBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchInputBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         this(aName, aTier, getSlots(aTier) + 1, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_InputBus(String aName, int aTier, int aSlots, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchInputBus(String aName, int aTier, int aSlots, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aSlots, aDescription, aTextures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
     }
@@ -118,12 +115,12 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_InputBus(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchInputBus(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -140,7 +137,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
     @Override
     public void initDefaultModes(NBTTagCompound aNBT) {
         if (!getBaseMetaTileEntity().getWorld().isRemote) {
-            GT_ClientPreference tPreference = GT_Mod.gregtechproxy
+            GTClientPreference tPreference = GTMod.gregtechproxy
                 .getClientPreference(getBaseMetaTileEntity().getOwnerUuid());
             if (tPreference != null) disableFilter = !tPreference.isInputBusInitialFilterEnabled();
         }
@@ -161,23 +158,23 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
 
     protected void fillStacksIntoFirstSlots() {
         final int L = mInventory.length - 1;
-        HashMap<GT_Utility.ItemId, Integer> slots = new HashMap<>(L);
-        HashMap<GT_Utility.ItemId, ItemStack> stacks = new HashMap<>(L);
-        List<GT_Utility.ItemId> order = new ArrayList<>(L);
+        HashMap<GTUtility.ItemId, Integer> slots = new HashMap<>(L);
+        HashMap<GTUtility.ItemId, ItemStack> stacks = new HashMap<>(L);
+        List<GTUtility.ItemId> order = new ArrayList<>(L);
         List<Integer> validSlots = new ArrayList<>(L);
         for (int i = 0; i < L; i++) {
             if (!isValidSlot(i)) continue;
             validSlots.add(i);
             ItemStack s = mInventory[i];
             if (s == null) continue;
-            GT_Utility.ItemId sID = GT_Utility.ItemId.createNoCopy(s);
+            GTUtility.ItemId sID = GTUtility.ItemId.createNoCopy(s);
             slots.merge(sID, s.stackSize, Integer::sum);
             if (!stacks.containsKey(sID)) stacks.put(sID, s);
             order.add(sID);
             mInventory[i] = null;
         }
         int slotindex = 0;
-        for (GT_Utility.ItemId sID : order) {
+        for (GTUtility.ItemId sID : order) {
             int toSet = slots.get(sID);
             if (toSet == 0) continue;
             int slot = validSlots.get(slotindex);
@@ -227,13 +224,13 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
                     disableLimited = true;
                 }
             }
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 StatCollector.translateToLocal("GT5U.hatch.disableSort." + disableSort) + "   "
                     + StatCollector.translateToLocal("GT5U.hatch.disableLimited." + disableLimited));
         } else {
             disableFilter = !disableFilter;
-            GT_Utility
+            GTUtility
                 .sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.hatch.disableFilter." + disableFilter));
         }
     }
@@ -255,7 +252,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
 
     protected boolean limitedAllowPutStack(int aIndex, ItemStack aStack) {
         for (int i = 0; i < getSizeInventory(); i++)
-            if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get_nocopy(aStack), mInventory[i])) return i == aIndex;
+            if (GTUtility.areStacksEqual(GTOreDictUnificator.get_nocopy(aStack), mInventory[i])) return i == aIndex;
         return mInventory[aIndex] == null;
     }
 
@@ -274,7 +271,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
             createToggleButton(
                 () -> !disableSort,
                 val -> disableSort = !val,
-                GT_UITextures.OVERLAY_BUTTON_SORTING_MODE,
+                GTUITextures.OVERLAY_BUTTON_SORTING_MODE,
                 () -> mTooltipCache.getData(SORTING_MODE_TOOLTIP)));
     }
 
@@ -282,7 +279,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
         builder.widget(createToggleButton(() -> !disableLimited, val -> {
             disableLimited = !val;
             updateSlots();
-        }, GT_UITextures.OVERLAY_BUTTON_ONE_STACK_LIMIT, () -> mTooltipCache.getData(ONE_STACK_LIMIT_TOOLTIP)));
+        }, GTUITextures.OVERLAY_BUTTON_ONE_STACK_LIMIT, () -> mTooltipCache.getData(ONE_STACK_LIMIT_TOOLTIP)));
     }
 
     @Override
@@ -309,7 +306,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch
         Supplier<GT_TooltipDataCache.TooltipData> tooltipDataSupplier) {
         return new CycleButtonWidget().setToggle(getter, setter)
             .setStaticTexture(picture)
-            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(7 + (uiButtonCount++ * BUTTON_SIZE), 62)
             .setSize(BUTTON_SIZE, BUTTON_SIZE)
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MagHatch.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMagnet.java
index 8a462d12c6..660894d0df 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MagHatch.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMagnet.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.AuthorFourIsTheNumber;
+import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_EMS_HOUSING;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_EMS_HOUSING_GLOW;
 
@@ -13,20 +13,20 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IndustrialElectromagneticSeparator;
+import gregtech.common.tileentities.machines.multi.MTEIndustrialElectromagneticSeparator;
 
-public class GT_MetaTileEntity_MagHatch extends GT_MetaTileEntity_Hatch {
+public class MTEHatchMagnet extends MTEHatch {
 
-    public GT_MetaTileEntity_MagHatch(int aID, String aName, String aNameRegional) {
+    public MTEHatchMagnet(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, 5, 1, "Holds electromagnet for the Magnetic Flux Exhibitor");
     }
 
-    public GT_MetaTileEntity_MagHatch(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchMagnet(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription[0], aTextures);
     }
 
@@ -48,8 +48,7 @@ public class GT_MetaTileEntity_MagHatch extends GT_MetaTileEntity_Hatch {
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new SlotWidget(inventoryHandler, 0)
-                .setFilter(GT_MetaTileEntity_IndustrialElectromagneticSeparator::isValidElectromagnet)
+            new SlotWidget(inventoryHandler, 0).setFilter(MTEIndustrialElectromagneticSeparator::isValidElectromagnet)
                 .setAccess(true, true)
                 .setPos(79, 34));
     }
@@ -61,7 +60,7 @@ public class GT_MetaTileEntity_MagHatch extends GT_MetaTileEntity_Hatch {
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -98,6 +97,6 @@ public class GT_MetaTileEntity_MagHatch extends GT_MetaTileEntity_Hatch {
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_MagHatch(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchMagnet(mName, mTier, mDescriptionArray, mTextures);
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java
index 8a4d718244..3a715a541a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java
@@ -31,25 +31,25 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import cpw.mods.fml.common.network.NetworkRegistry;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import ic2.core.IHasGui;
 import ic2.core.item.ItemToolbox;
 
-public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch implements IAddUIWidgets, IAlignment {
+public class MTEHatchMaintenance extends MTEHatch implements IAddUIWidgets, IAlignment {
 
     private Rotation rotation = Rotation.NORMAL;
 
@@ -57,23 +57,22 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
     public boolean mWrench = false, mScrewdriver = false, mSoftHammer = false, mHardHammer = false,
         mSolderingTool = false, mCrowbar = false, mAuto;
 
-    public GT_MetaTileEntity_Hatch_Maintenance(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchMaintenance(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1, "For maintaining Multiblocks");
         mAuto = false;
     }
 
-    public GT_MetaTileEntity_Hatch_Maintenance(int aID, String aName, String aNameRegional, int aTier, boolean aAuto) {
+    public MTEHatchMaintenance(int aID, String aName, String aNameRegional, int aTier, boolean aAuto) {
         super(aID, aName, aNameRegional, aTier, 4, "For automatically maintaining Multiblocks");
         mAuto = aAuto;
     }
 
-    public GT_MetaTileEntity_Hatch_Maintenance(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
-        boolean aAuto) {
+    public MTEHatchMaintenance(String aName, int aTier, String aDescription, ITexture[][][] aTextures, boolean aAuto) {
         super(aName, aTier, aAuto ? 4 : 1, aDescription, aTextures);
         mAuto = aAuto;
     }
 
-    public GT_MetaTileEntity_Hatch_Maintenance(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
+    public MTEHatchMaintenance(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
         boolean aAuto) {
         super(aName, aTier, aAuto ? 4 : 1, aDescription, aTextures);
         mAuto = aAuto;
@@ -81,9 +80,9 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
 
     private static ItemStack[] getAutoMaintenanceInputs() {
         if (sAutoMaintenanceInputs == null) sAutoMaintenanceInputs = new ItemStack[] { ItemList.Duct_Tape.get(4),
-            GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 2),
-            GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
-            GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2) };
+            GTOreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 2),
+            GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
+            GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2) };
         return sAutoMaintenanceInputs;
     }
 
@@ -164,14 +163,14 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
 
     @Override
     public boolean isValidSlot(int aIndex) {
-        return mAuto && GT_Mod.gregtechproxy.mAMHInteraction;
+        return mAuto && GTMod.gregtechproxy.mAMHInteraction;
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
         if (aTileEntity.getMetaTileID() == 111)
-            return new GT_MetaTileEntity_Hatch_Maintenance(mName, mTier, mDescriptionArray, mTextures, true);
-        return new GT_MetaTileEntity_Hatch_Maintenance(mName, mTier, mDescriptionArray, mTextures, false);
+            return new MTEHatchMaintenance(mName, mTier, mDescriptionArray, mTextures, true);
+        return new MTEHatchMaintenance(mName, mTier, mDescriptionArray, mTextures, false);
     }
 
     @Override
@@ -193,9 +192,9 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
                     if (--tStack.stackSize == 0) {
                         aPlayer.inventory.mainInventory[aPlayer.inventory.currentItem] = null;
                     }
-                } else GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+                } else GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             } else {
-                GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+                GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             }
             return true;
         }
@@ -248,8 +247,8 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
                 amt = tStack.stackSize;
                 boolean temp = true;
                 for (ItemStack aStack : mInventory) {
-                    if ((GT_Utility.areUnificationsEqual(aStack, tStack, true)
-                        || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) {
+                    if ((GTUtility.areUnificationsEqual(aStack, tStack, true)
+                        || GTUtility.areUnificationsEqual(GTOreDictUnificator.get(false, aStack), tStack, true))) {
                         amt -= aStack.stackSize;
                         if (amt < 1) {
                             temp = false;
@@ -266,8 +265,8 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
                 if (tStack != null) {
                     amt = tStack.stackSize;
                     for (ItemStack aStack : mInventory) {
-                        if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility
-                            .areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) {
+                        if ((GTUtility.areUnificationsEqual(aStack, tStack, true)
+                            || GTUtility.areUnificationsEqual(GTOreDictUnificator.get(false, aStack), tStack, true))) {
                             if (aStack.stackSize < amt) {
                                 amt -= aStack.stackSize;
                                 aStack.stackSize = 0;
@@ -300,26 +299,25 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
             return;
         }
 
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sWrenchList) && !mWrench
-            && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mWrench = true;
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sScrewdriverList) && !mScrewdriver
-            && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mScrewdriver = true;
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sSoftHammerList) && !mSoftHammer
-            && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mSoftHammer = true;
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sHardHammerList) && !mHardHammer
-            && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mHardHammer = true;
-        if (GT_Utility.isStackInList(aStack, GregTech_API.sCrowbarList) && !mCrowbar
-            && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mCrowbar = true;
-        if (!mSolderingTool && GT_ModHandler.useSolderingIron(aStack, aPlayer, aToolboxInventory))
-            mSolderingTool = true;
-        if (GT_OreDictUnificator.isItemStackInstanceOf(aStack, "craftingDuctTape")) {
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sWrenchList) && !mWrench
+            && GTModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mWrench = true;
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sScrewdriverList) && !mScrewdriver
+            && GTModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mScrewdriver = true;
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sSoftHammerList) && !mSoftHammer
+            && GTModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mSoftHammer = true;
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sHardHammerList) && !mHardHammer
+            && GTModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mHardHammer = true;
+        if (GTUtility.isStackInList(aStack, GregTechAPI.sCrowbarList) && !mCrowbar
+            && GTModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) mCrowbar = true;
+        if (!mSolderingTool && GTModHandler.useSolderingIron(aStack, aPlayer, aToolboxInventory)) mSolderingTool = true;
+        if (GTOreDictUnificator.isItemStackInstanceOf(aStack, "craftingDuctTape")) {
             mWrench = mScrewdriver = mSoftHammer = mHardHammer = mCrowbar = mSolderingTool = true;
             getBaseMetaTileEntity().setActive(false);
             aStack.stackSize--;
         }
         if (mSolderingTool && aPlayer instanceof EntityPlayerMP tPlayer) {
             try {
-                GT_Mod.achievements.issueAchievement(tPlayer, "maintainance");
+                GTMod.achievements.issueAchievement(tPlayer, "maintainance");
             } catch (Exception ignored) {}
         }
     }
@@ -343,20 +341,18 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
     @Override
     public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        return mAuto && GT_Mod.gregtechproxy.mAMHInteraction;
+        return mAuto && GTMod.gregtechproxy.mAMHInteraction;
     }
 
     @Override
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        if (mAuto && GT_Mod.gregtechproxy.mAMHInteraction) {
-            for (int i = 0; i < getSizeInventory(); i++) if (GT_Utility.areStacksEqual(
-                GT_OreDictUnificator.get(false, aStack),
-                GT_OreDictUnificator.get(false, getStackInSlot(i)))) return i == aIndex;
-            for (ItemStack tInput : getAutoMaintenanceInputs())
-                if (GT_Utility.areUnificationsEqual(tInput, aStack, true)
-                    || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tInput, true))
-                    return true;
+        if (mAuto && GTMod.gregtechproxy.mAMHInteraction) {
+            for (int i = 0; i < getSizeInventory(); i++) if (GTUtility.areStacksEqual(
+                GTOreDictUnificator.get(false, aStack),
+                GTOreDictUnificator.get(false, getStackInSlot(i)))) return i == aIndex;
+            for (ItemStack tInput : getAutoMaintenanceInputs()) if (GTUtility.areUnificationsEqual(tInput, aStack, true)
+                || GTUtility.areUnificationsEqual(GTOreDictUnificator.get(false, aStack), tInput, true)) return true;
         }
         return false;
     }
@@ -367,7 +363,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
             getBaseMetaTileEntity().add2by2Slots(builder);
         } else {
             builder.widget(
-                new DrawableWidget().setDrawable(GT_UITextures.SLOT_MAINTENANCE)
+                new DrawableWidget().setDrawable(GTUITextures.SLOT_MAINTENANCE)
                     .setPos(78, 33)
                     .setSize(20, 20))
                 .widget(new SlotWidget(BaseSlot.empty()) {
@@ -389,7 +385,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
                         }
                     }
                 }.disableShiftInsert()
-                    .setBackground(GT_UITextures.TRANSPARENT)
+                    .setBackground(GTUITextures.TRANSPARENT)
                     .setPos(79, 34))
                 .widget(
                     new TextWidget("Click with Tool to repair.").setDefaultColor(COLOR_TEXT_GRAY.get())
@@ -427,7 +423,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
             changed = true;
         }
         if (changed) {
-            if (base.isServerSide() && !GregTech_API.isDummyWorld(base.getWorld())) {
+            if (base.isServerSide() && !GregTechAPI.isDummyWorld(base.getWorld())) {
                 StructureLibAPI.sendAlignment(
                     (IAlignmentProvider) base,
                     new NetworkRegistry.TargetPoint(
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMuffler.java
index 8707d0f804..179ba56254 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMuffler.java
@@ -10,20 +10,20 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ParticleFX;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 import gregtech.api.util.WorldSpawnedEventBuilder;
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 
 @SuppressWarnings("unused") // Unused API is expected within scope
-public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
+public class MTEHatchMuffler extends MTEHatch {
 
-    private static final String localizedDescFormat = GT_LanguageManager.addStringLocalization(
+    private static final String localizedDescFormat = GTLanguageManager.addStringLocalization(
         "gt.blockmachines.hatch.muffler.desc.format",
         "Outputs the Pollution (Might cause ... things)%n" + "DO NOT OBSTRUCT THE OUTPUT!%n"
             + "Reduces Pollution to %d%%%n"
@@ -33,24 +33,24 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
     private final String[] description = String.format(localizedDescFormat, pollutionReduction, pollutionRecover)
         .split("\\R");
 
-    public GT_MetaTileEntity_Hatch_Muffler(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchMuffler(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "");
     }
 
-    public GT_MetaTileEntity_Hatch_Muffler(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEHatchMuffler(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Muffler(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchMuffler(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         this(aName, aTier, new String[] { aDescription }, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Muffler(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchMuffler(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         this(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Muffler(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTEHatchMuffler(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
@@ -94,7 +94,7 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Muffler(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchMuffler(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -124,7 +124,7 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
         boolean chk1, chk2, chk3;
         float ran1 = XSTR_INSTANCE.nextFloat(), ran2, ran3;
         chk1 = ran1 * 100 < calculatePollutionReduction(100);
-        if (GT_Pollution.getPollution(getBaseMetaTileEntity()) >= GT_Mod.gregtechproxy.mPollutionSmogLimit) {
+        if (Pollution.getPollution(getBaseMetaTileEntity()) >= GTMod.gregtechproxy.mPollutionSmogLimit) {
             ran2 = XSTR_INSTANCE.nextFloat();
             ran3 = XSTR_INSTANCE.nextFloat();
             chk2 = ran2 * 100 < calculatePollutionReduction(100);
@@ -200,7 +200,7 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
      */
     public boolean polluteEnvironment(MetaTileEntity mte) {
         if (getBaseMetaTileEntity().getAirAtSide(getBaseMetaTileEntity().getFrontFacing())) {
-            GT_Pollution.addPollution(getBaseMetaTileEntity(), calculatePollutionReduction(10000));
+            Pollution.addPollution(getBaseMetaTileEntity(), calculatePollutionReduction(10000));
             return true;
         }
         return false;
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMultiInput.java
index 267c2d0f1c..9bf061573b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMultiInput.java
@@ -20,20 +20,20 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_Input implements IAddUIWidgets {
+public class MTEHatchMultiInput extends MTEHatchInput implements IAddUIWidgets {
 
     private final FluidStack[] mStoredFluid;
     private final FluidStackTank[] fluidTanks;
     public final int mCapacityPer;
 
-    public GT_MetaTileEntity_Hatch_MultiInput(int aID, int aSlot, String aName, String aNameRegional, int aTier) {
+    public MTEHatchMultiInput(int aID, int aSlot, String aName, String aNameRegional, int aTier) {
         super(aID, aSlot, aName, aNameRegional, aTier);
         this.mStoredFluid = new FluidStack[aSlot];
         fluidTanks = new FluidStackTank[aSlot];
         mCapacityPer = getCapacityPerTank(aTier, aSlot);
     }
 
-    public GT_MetaTileEntity_Hatch_MultiInput(int aID, int aSlot, String aName, String aNameRegional, int aTier,
+    public MTEHatchMultiInput(int aID, int aSlot, String aName, String aNameRegional, int aTier,
         String[] aDescription) {
         super(aID, aSlot, aName, aNameRegional, aTier, aDescription);
         this.mStoredFluid = new FluidStack[aSlot];
@@ -41,8 +41,7 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_
         mCapacityPer = getCapacityPerTank(aTier, aSlot);
     }
 
-    public GT_MetaTileEntity_Hatch_MultiInput(String aName, int aSlot, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchMultiInput(String aName, int aSlot, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aSlot, aTier, aDescription, aTextures);
         this.mStoredFluid = new FluidStack[aSlot];
         fluidTanks = new FluidStackTank[aSlot];
@@ -58,7 +57,7 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_MultiInput(mName, getMaxType(), mTier, mDescriptionArray, mTextures);
+        return new MTEHatchMultiInput(mName, getMaxType(), mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java
index 2aa2410bd1..3a9dd0dc96 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java
@@ -26,9 +26,9 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.GT_Mod;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.GTMod;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.fluid.IFluidStore;
 import gregtech.api.interfaces.metatileentity.IFluidLockable;
@@ -36,18 +36,17 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.common.gui.modularui.widget.FluidLockWidget;
 
-public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
-    implements IFluidStore, IFluidLockable, IAddUIWidgets {
+public class MTEHatchOutput extends MTEHatch implements IFluidStore, IFluidLockable, IAddUIWidgets {
 
     private String lockedFluidName = null;
     private WeakReference<EntityPlayer> playerThatLockedfluid = null;
     public byte mMode = 0;
 
-    public GT_MetaTileEntity_Hatch_Output(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchOutput(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -55,40 +54,39 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
             aTier,
             4,
             new String[] { "Fluid Output for Multiblocks",
-                "Capacity: " + GT_Utility.formatNumbers(8000L * (1L << aTier)) + "L",
+                "Capacity: " + GTUtility.formatNumbers(8000L * (1L << aTier)) + "L",
                 "Right click with screwdriver to restrict output",
                 "Can be restricted to put out Items and/or Steam/No Steam/1 specific Fluid",
                 "Restricted Output Hatches are given priority for Multiblock Fluid output" });
     }
 
-    public GT_MetaTileEntity_Hatch_Output(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchOutput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Output(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchOutput(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Output(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+    public MTEHatchOutput(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
         int inventorySize) {
         super(aID, aName, aNameRegional, aTier, inventorySize, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_Output(String name, int tier, int slots, String[] description,
-        ITexture[][][] textures) {
+    public MTEHatchOutput(String name, int tier, int slots, String[] description, ITexture[][][] textures) {
         super(name, tier, slots, description, textures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(FLUID_OUT_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(FLUID_OUT_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) };
     }
@@ -115,12 +113,12 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Output(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchOutput(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -131,7 +129,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
             IFluidHandler tTileEntity = aBaseMetaTileEntity
                 .getITankContainerAtSide(aBaseMetaTileEntity.getFrontFacing());
             if (tTileEntity != null) {
-                GT_Utility.moveFluid(
+                GTUtility.moveFluid(
                     aBaseMetaTileEntity,
                     tTileEntity,
                     aBaseMetaTileEntity.getFrontFacing(),
@@ -157,7 +155,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
         if (isFluidLocked()) {
             lockedFluidName = aNBT.getString("lockedFluidName");
         }
-        lockedFluidName = GT_Utility.isStringInvalid(lockedFluidName) ? null : lockedFluidName;
+        lockedFluidName = GTUtility.isStringInvalid(lockedFluidName) ? null : lockedFluidName;
     }
 
     @Override
@@ -229,42 +227,42 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
         final String inBrackets;
         switch (mMode) {
             case 0 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("108", "Outputs misc. Fluids, Steam and Items"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("108", "Outputs misc. Fluids, Steam and Items"));
                 this.setLockedFluidName(null);
             }
             case 1 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("109", "Outputs Steam and Items"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("109", "Outputs Steam and Items"));
                 this.setLockedFluidName(null);
             }
             case 2 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("110", "Outputs Steam and misc. Fluids"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("110", "Outputs Steam and misc. Fluids"));
                 this.setLockedFluidName(null);
             }
             case 3 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("111", "Outputs Steam"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("111", "Outputs Steam"));
                 this.setLockedFluidName(null);
             }
             case 4 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("112", "Outputs misc. Fluids and Items"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("112", "Outputs misc. Fluids and Items"));
                 this.setLockedFluidName(null);
             }
             case 5 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("113", "Outputs only Items"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("113", "Outputs only Items"));
                 this.setLockedFluidName(null);
             }
             case 6 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("114", "Outputs only misc. Fluids"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("114", "Outputs only misc. Fluids"));
                 this.setLockedFluidName(null);
             }
             case 7 -> {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("115", "Outputs nothing"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("115", "Outputs nothing"));
                 this.setLockedFluidName(null);
             }
             case 8 -> {
                 playerThatLockedfluid = new WeakReference<>(aPlayer);
                 if (mFluid == null) {
                     this.setLockedFluidName(null);
-                    inBrackets = GT_Utility.trans(
+                    inBrackets = GTUtility.trans(
                         "115.3",
                         "currently none, will be locked to the next that is put in (or use fluid cell to lock)");
                 } else {
@@ -275,18 +273,16 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
                     inBrackets = this.getDrainableStack()
                         .getLocalizedName();
                 }
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
-                    String.format(
-                        "%s (%s)",
-                        GT_Utility.trans("151.1", "Outputs items and 1 specific Fluid"),
-                        inBrackets));
+                    String
+                        .format("%s (%s)", GTUtility.trans("151.1", "Outputs items and 1 specific Fluid"), inBrackets));
             }
             case 9 -> {
                 playerThatLockedfluid = new WeakReference<>(aPlayer);
                 if (mFluid == null) {
                     this.setLockedFluidName(null);
-                    inBrackets = GT_Utility.trans(
+                    inBrackets = GTUtility.trans(
                         "115.3",
                         "currently none, will be locked to the next that is put in (or use fluid cell to lock)");
                 } else {
@@ -297,9 +293,9 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
                     inBrackets = this.getDrainableStack()
                         .getLocalizedName();
                 }
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
-                    String.format("%s (%s)", GT_Utility.trans("151.2", "Outputs 1 specific Fluid"), inBrackets));
+                    String.format("%s (%s)", GTUtility.trans("151.2", "Outputs 1 specific Fluid"), inBrackets));
             }
         }
     }
@@ -317,11 +313,11 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
             if (getLockedFluidName() != null && !getLockedFluidName().equals(
                 tFluid.getFluid()
                     .getName())) {
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
                     String.format(
                         "%s %s",
-                        GT_Utility.trans(
+                        GTUtility.trans(
                             "151.3",
                             "Hatch is locked to a different fluid. To change the locking, empty it and made it locked to the next fluid with a screwdriver. Currently locked to"),
                         StatCollector.translateToLocal(getLockedFluidName())));
@@ -329,17 +325,17 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
                 setLockedFluidName(
                     tFluid.getFluid()
                         .getName());
-                if (mMode == 8) GT_Utility.sendChatToPlayer(
+                if (mMode == 8) GTUtility.sendChatToPlayer(
                     aPlayer,
                     String.format(
                         "%s (%s)",
-                        GT_Utility.trans("151.1", "Outputs items and 1 specific Fluid"),
+                        GTUtility.trans("151.1", "Outputs items and 1 specific Fluid"),
                         tFluid.getLocalizedName()));
-                else GT_Utility.sendChatToPlayer(
+                else GTUtility.sendChatToPlayer(
                     aPlayer,
                     String.format(
                         "%s (%s)",
-                        GT_Utility.trans("151.2", "Outputs 1 specific Fluid"),
+                        GTUtility.trans("151.2", "Outputs 1 specific Fluid"),
                         tFluid.getLocalizedName()));
             }
             return true;
@@ -412,7 +408,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
 
     @Override
     public boolean canStoreFluid(@Nonnull FluidStack fluidStack) {
-        if (mFluid != null && !GT_Utility.areFluidsEqual(mFluid, fluidStack)) {
+        if (mFluid != null && !GTUtility.areFluidsEqual(mFluid, fluidStack)) {
             return false;
         }
         if (isFluidLocked()) {
@@ -423,7 +419,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
                 fluidStack.getFluid()
                     .getName());
         }
-        if (GT_ModHandler.isSteam(fluidStack)) {
+        if (GTModHandler.isSteam(fluidStack)) {
             return outputsSteam();
         }
         return outputsLiquids();
@@ -442,9 +438,9 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
                     .getName());
             final EntityPlayer player;
             if (playerThatLockedfluid == null || (player = playerThatLockedfluid.get()) == null) return;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 player,
-                String.format(GT_Utility.trans("151.4", "Successfully locked Fluid to %s"), mFluid.getLocalizedName()));
+                String.format(GTUtility.trans("151.4", "Successfully locked Fluid to %s"), mFluid.getLocalizedName()));
             playerThatLockedfluid = null;
         }
     }
@@ -459,12 +455,12 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
         return new String[] { EnumChatFormatting.BLUE + "Output Hatch" + EnumChatFormatting.RESET, "Stored Fluid:",
             EnumChatFormatting.GOLD + (mFluid == null ? "No Fluid" : mFluid.getLocalizedName())
                 + EnumChatFormatting.RESET,
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid == null ? 0 : mFluid.amount)
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(mFluid == null ? 0 : mFluid.amount)
                 + " L"
                 + EnumChatFormatting.RESET
                 + " "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(getCapacity())
+                + GTUtility.formatNumbers(getCapacity())
                 + " L"
                 + EnumChatFormatting.RESET,
             (!isFluidLocked() || lockedFluidName == null) ? "Not Locked"
@@ -477,7 +473,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         super.addUIWidgets(builder, buildContext);
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setPos(98, 16)
                 .setSize(71, 45))
             .widget(new FluidLockWidget(this).setPos(149, 41))
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutputBus.java
index 0bfe55cac1..31973f935b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutputBus.java
@@ -2,7 +2,7 @@ package gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.Textures.BlockIcons.ITEM_OUT_SIGN;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_OUT;
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -18,10 +18,10 @@ import com.gtnewhorizons.modularui.api.forge.ItemHandlerHelper;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.widgets.GT_PhantomItemButton;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.widgets.PhantomItemButton;
 import gregtech.api.interfaces.IDataCopyable;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IItemLockable;
@@ -29,22 +29,21 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.extensions.ArrayExt;
 
-public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch
-    implements IAddUIWidgets, IItemLockable, IDataCopyable {
+public class MTEHatchOutputBus extends MTEHatch implements IAddUIWidgets, IItemLockable, IDataCopyable {
 
     private static final String DATA_STICK_DATA_TYPE = "outputBusFilter";
     private static final String LOCKED_ITEM_NBT_KEY = "lockedItem";
 
     protected ItemStack lockedItem = null;
 
-    public GT_MetaTileEntity_Hatch_OutputBus(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchOutputBus(int aID, String aName, String aNameRegional, int aTier) {
         this(aID, aName, aNameRegional, aTier, getSlots(aTier));
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus(int id, String name, String nameRegional, int tier, int slots) {
+    public MTEHatchOutputBus(int id, String name, String nameRegional, int tier, int slots) {
         super(
             id,
             name,
@@ -58,35 +57,33 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch
                 "Right click with data stick to load filter config"));
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTEHatchOutputBus(int aID, String aName, String aNameRegional, int aTier, String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, getSlots(aTier), aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription, int inventorySize) {
+    public MTEHatchOutputBus(int aID, String aName, String aNameRegional, int aTier, String[] aDescription,
+        int inventorySize) {
         super(aID, aName, aNameRegional, aTier, inventorySize, aDescription);
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchOutputBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, getSlots(aTier), aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus(String name, int tier, int slots, String[] description,
-        ITexture[][][] textures) {
+    public MTEHatchOutputBus(String name, int tier, int slots, String[] description, ITexture[][][] textures) {
         super(name, tier, slots, description, textures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(ITEM_OUT_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
+        return GTMod.gregtechproxy.mRenderIndicatorsOnHatch
             ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(ITEM_OUT_SIGN) }
             : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) };
     }
@@ -113,19 +110,19 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_OutputBus(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchOutputBus(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (!acceptsItemLock() || !(aPlayer instanceof EntityPlayerMP)) {
-            GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+            GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             return super.onRightclick(aBaseMetaTileEntity, aPlayer);
         }
 
         final ItemStack dataStick = aPlayer.inventory.getCurrentItem();
         if (!ItemList.Tool_DataStick.isStackEqual(dataStick, false, true)) {
-            GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+            GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             return super.onRightclick(aBaseMetaTileEntity, aPlayer);
         }
 
@@ -197,7 +194,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch
 
         for (int i = 0, mInventoryLength = mInventory.length; i < mInventoryLength && aStack.stackSize > 0; i++) {
             ItemStack tSlot = mInventory[i];
-            if (GT_Utility.isStackInvalid(tSlot)) {
+            if (GTUtility.isStackInvalid(tSlot)) {
                 int tRealStackLimit = Math.min(getInventoryStackLimit(), aStack.getMaxStackSize());
                 if (aStack.stackSize <= tRealStackLimit) {
                     mInventory[i] = aStack;
@@ -286,8 +283,8 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch
 
         if (acceptsItemLock()) {
             builder.widget(
-                new GT_PhantomItemButton(this).setPos(getGUIWidth() - 25, 40)
-                    .setBackground(GT_PhantomItemButton.FILTER_BACKGROUND));
+                new PhantomItemButton(this).setPos(getGUIWidth() - 25, 40)
+                    .setBackground(PhantomItemButton.FILTER_BACKGROUND));
         }
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchQuadrupleHumongous.java
index e0ab7acf95..b0040d0c6a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchQuadrupleHumongous.java
@@ -4,13 +4,13 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_Hatch_QuadrupleHumongous extends GT_MetaTileEntity_Hatch_MultiInput {
+public class MTEHatchQuadrupleHumongous extends MTEHatchMultiInput {
 
-    public GT_MetaTileEntity_Hatch_QuadrupleHumongous(int aID, int aSlot, String aName, String aNameRegional) {
+    public MTEHatchQuadrupleHumongous(int aID, int aSlot, String aName, String aNameRegional) {
         super(aID, aSlot, aName, aNameRegional, 13);
     }
 
-    public GT_MetaTileEntity_Hatch_QuadrupleHumongous(String aName, int aSlot, int aTier, String[] aDescription,
+    public MTEHatchQuadrupleHumongous(String aName, int aSlot, int aTier, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aSlot, aTier, aDescription, aTextures);
     }
@@ -22,6 +22,6 @@ public class GT_MetaTileEntity_Hatch_QuadrupleHumongous extends GT_MetaTileEntit
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_QuadrupleHumongous(mName, getMaxType(), mTier, mDescriptionArray, mTextures);
+        return new MTEHatchQuadrupleHumongous(mName, getMaxType(), mTier, mDescriptionArray, mTextures);
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEItem.java
index 660230660e..ba804e834e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEItem.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
+import static gregtech.api.enums.GTValues.ALL_VALID_SIDES;
 import static gregtech.api.enums.Textures.BlockIcons.PIPE_RESTRICTOR;
 
 import java.util.ArrayList;
@@ -20,9 +20,9 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
@@ -33,14 +33,14 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
 import gregtech.common.covers.CoverInfo;
 
-public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileEntityItemPipe {
+public class MTEItem extends MetaPipeEntity implements IMetaTileEntityItemPipe {
 
     public final float mThickNess;
     public final Materials mMaterial;
@@ -52,7 +52,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     public boolean mIsRestrictive = false;
     private int[] cacheSides;
 
-    public GT_MetaPipeEntity_Item(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
+    public MTEItem(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
         int aInvSlotCount, int aStepSize, boolean aIsRestrictive, int aTickTime) {
         super(aID, aName, aNameRegional, aInvSlotCount, false);
         mIsRestrictive = aIsRestrictive;
@@ -63,12 +63,12 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
         addInfo(aID);
     }
 
-    public GT_MetaPipeEntity_Item(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
+    public MTEItem(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial,
         int aInvSlotCount, int aStepSize, boolean aIsRestrictive) {
         this(aID, aName, aNameRegional, aThickNess, aMaterial, aInvSlotCount, aStepSize, aIsRestrictive, 20);
     }
 
-    public GT_MetaPipeEntity_Item(String aName, float aThickNess, Materials aMaterial, int aInvSlotCount, int aStepSize,
+    public MTEItem(String aName, float aThickNess, Materials aMaterial, int aInvSlotCount, int aStepSize,
         boolean aIsRestrictive, int aTickTime) {
         super(aName, aInvSlotCount);
         mIsRestrictive = aIsRestrictive;
@@ -85,14 +85,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaPipeEntity_Item(
-            mName,
-            mThickNess,
-            mMaterial,
-            mInventory.length,
-            mStepSize,
-            mIsRestrictive,
-            mTickTime);
+        return new MTEItem(mName, mThickNess, mMaterial, mInventory.length, mStepSize, mIsRestrictive, mTickTime);
     }
 
     @Override
@@ -191,13 +184,13 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     @Override
     public void saveNBTData(NBTTagCompound aNBT) {
         aNBT.setByte("mLastReceivedFrom", (byte) mLastReceivedFrom.ordinal());
-        if (GT_Mod.gregtechproxy.gt6Pipe) aNBT.setByte("mConnections", mConnections);
+        if (GTMod.gregtechproxy.gt6Pipe) aNBT.setByte("mConnections", mConnections);
     }
 
     @Override
     public void loadNBTData(NBTTagCompound aNBT) {
         mLastReceivedFrom = ForgeDirection.getOrientation(aNBT.getByte("mLastReceivedFrom"));
-        if (GT_Mod.gregtechproxy.gt6Pipe) {
+        if (GTMod.gregtechproxy.gt6Pipe) {
             mConnections = aNBT.getByte("mConnections");
         }
     }
@@ -211,7 +204,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
                 mCurrentTransferStartTick = 0;
             }
 
-            if (!GT_Mod.gregtechproxy.gt6Pipe || mCheckConnections) checkConnections();
+            if (!GTMod.gregtechproxy.gt6Pipe || mCheckConnections) checkConnections();
 
             if (oLastReceivedFrom == mLastReceivedFrom) {
                 doTickProfilingInThisTick = false;
@@ -221,7 +214,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
                 for (boolean temp = true; temp && !isInventoryEmpty() && pipeCapacityCheck();) {
                     temp = false;
                     tPipeList.clear();
-                    for (IMetaTileEntityItemPipe tTileEntity : GT_Utility
+                    for (IMetaTileEntityItemPipe tTileEntity : GTUtility
                         .sortMapByValuesAcending(
                             IMetaTileEntityItemPipe.Util.scanPipes(this, new HashMap<>(), 0, false, false))
                         .keySet()) {
@@ -242,13 +235,13 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     @Override
     public boolean onWrenchRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer entityPlayer,
         float aX, float aY, float aZ) {
-        if (GT_Mod.gregtechproxy.gt6Pipe) {
-            final ForgeDirection tSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
+        if (GTMod.gregtechproxy.gt6Pipe) {
+            final ForgeDirection tSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
             if (isConnectedAtSide(tSide)) {
                 disconnect(tSide);
-                GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("215", "Disconnected"));
+                GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("215", "Disconnected"));
             } else {
-                if (connect(tSide) > 0) GT_Utility.sendChatToPlayer(entityPlayer, GT_Utility.trans("214", "Connected"));
+                if (connect(tSide) > 0) GTUtility.sendChatToPlayer(entityPlayer, GTUtility.trans("214", "Connected"));
             }
             return true;
         }
@@ -256,25 +249,25 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsIn(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsItemsIn(side, aCoverID, aCoverVariable, -1, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
+    public boolean letsOut(CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
         return coverBehavior.letsItemsOut(side, aCoverID, aCoverVariable, -1, aTileEntity);
     }
 
     @Override
-    public boolean letsIn(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsIn(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsItemsIn(side, aCoverID, aCoverVariable, -1, aTileEntity);
     }
 
     @Override
-    public boolean letsOut(GT_CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
+    public boolean letsOut(CoverBehaviorBase<?> coverBehavior, ForgeDirection side, int aCoverID,
         ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         return coverBehavior.letsItemsOut(side, aCoverID, aCoverVariable, -1, aTileEntity);
     }
@@ -294,7 +287,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
         if (tileEntity == null) return false;
 
         final ForgeDirection oppositeSide = side.getOpposite();
-        boolean connectable = GT_Utility.isConnectableNonInventoryPipe(tileEntity, oppositeSide);
+        boolean connectable = GTUtility.isConnectableNonInventoryPipe(tileEntity, oppositeSide);
 
         final IGregTechTileEntity gTileEntity = (tileEntity instanceof IGregTechTileEntity)
             ? (IGregTechTileEntity) tileEntity
@@ -322,7 +315,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     @Override
     public boolean getGT6StyleConnection() {
         // Yes if GT6 pipes are enabled
-        return GT_Mod.gregtechproxy.gt6Pipe;
+        return GTMod.gregtechproxy.gt6Pipe;
     }
 
     @Override
@@ -356,7 +349,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
                 if ((!(tInventory instanceof TileEntityHopper) && !(tInventory instanceof TileEntityDispenser))
                     || getBaseMetaTileEntity().getMetaIDAtSide(side) != side.getOpposite()
                         .ordinal()) {
-                    return GT_Utility.moveMultipleItemStacks(
+                    return GTUtility.moveMultipleItemStacks(
                         aSender,
                         tInventory,
                         ForgeDirection.UNKNOWN,
@@ -419,7 +412,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
             if (cacheSides == null) cacheSides = super.getAccessibleSlotsFromSide(ordinalSide);
             return cacheSides;
         } else {
-            return GT_Values.emptyIntArray;
+            return GTValues.emptyIntArray;
         }
     }
 
@@ -440,13 +433,13 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     @Override
     public String[] getDescription() {
         if (mTickTime == 20) return new String[] { "Item Capacity: %%%" + getMaxPipeCapacity() + "%%% Stacks/sec",
-            "Routing Value: %%%" + GT_Utility.formatNumbers(mStepSize) };
+            "Routing Value: %%%" + GTUtility.formatNumbers(mStepSize) };
         else if (mTickTime % 20 == 0) return new String[] {
             "Item Capacity: %%%" + getMaxPipeCapacity() + "%%% Stacks/%%%" + (mTickTime / 20) + "%%% sec",
-            "Routing Value: %%%" + GT_Utility.formatNumbers(mStepSize) };
+            "Routing Value: %%%" + GTUtility.formatNumbers(mStepSize) };
         else return new String[] {
             "Item Capacity: %%%" + getMaxPipeCapacity() + "%%% Stacks/%%%" + mTickTime + "%%% ticks",
-            "Routing Value: %%%" + GT_Utility.formatNumbers(mStepSize) };
+            "Routing Value: %%%" + GTUtility.formatNumbers(mStepSize) };
     }
 
     private boolean isInventoryEmpty() {
@@ -456,13 +449,13 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
 
     @Override
     public float getThickNess() {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x1) != 0) return 0.0625F;
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x1) != 0) return 0.0625F;
         return mThickNess;
     }
 
     @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0)
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0)
             return AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 1, aZ + 1);
         else return getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
     }
@@ -522,7 +515,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB,
         List<AxisAlignedBB> outputAABB, Entity collider) {
         super.addCollisionBoxesToList(aWorld, aX, aY, aZ, inputAABB, outputAABB, collider);
-        if (GT_Mod.instance.isClientSide() && (GT_Client.hideValue & 0x2) != 0) {
+        if (GTMod.instance.isClientSide() && (GTClient.hideValue & 0x2) != 0) {
             final AxisAlignedBB aabb = getActualCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
             if (inputAABB.intersectsWith(aabb)) outputAABB.add(aabb);
         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
index 6c2df9b082..ab70cf25ae 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
@@ -1,9 +1,9 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.VN;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.enums.GTValues.VN;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.formatNumbers;
 import static mcp.mobius.waila.api.SpecialChars.GREEN;
 import static mcp.mobius.waila.api.SpecialChars.RED;
 import static mcp.mobius.waila.api.SpecialChars.RESET;
@@ -59,63 +59,63 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.VoidingMode;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.fluid.IFluidStore;
 import gregtech.api.interfaces.metatileentity.IItemLockable;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.modularui.IBindPlayerInventoryUI;
+import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SingleRecipeCheck;
-import gregtech.api.util.GT_ClientPreference;
-import gregtech.api.util.GT_ExoticEnergyInputHelper;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_ParallelHelper;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.GT_Waila;
+import gregtech.api.util.ExoticEnergyInputHelper;
+import gregtech.api.util.GTClientPreference;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.GTWaila;
 import gregtech.api.util.OutputHatchWrapper;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.api.util.ParallelHelper;
 import gregtech.api.util.VoidProtectionHelper;
 import gregtech.api.util.shutdown.ShutDownReason;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
-import gregtech.client.GT_SoundLoop;
-import gregtech.common.GT_Pollution;
+import gregtech.client.GTSoundLoop;
+import gregtech.common.Pollution;
 import gregtech.common.config.machinestats.ConfigMachines;
 import gregtech.common.gui.modularui.widget.CheckRecipeResultSyncer;
 import gregtech.common.gui.modularui.widget.ShutDownReasonSyncer;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_CraftingInput_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_InputBus_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Input_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME;
+import gregtech.common.items.MetaGeneratedTool01;
 import gregtech.common.tileentities.machines.IDualInputHatch;
 import gregtech.common.tileentities.machines.IDualInputInventory;
 import gregtech.common.tileentities.machines.IRecipeProcessingAwareHatch;
 import gregtech.common.tileentities.machines.ISmartInputHatch;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine;
+import gregtech.common.tileentities.machines.MTEHatchCraftingInputME;
+import gregtech.common.tileentities.machines.MTEHatchInputBusME;
+import gregtech.common.tileentities.machines.MTEHatchInputME;
+import gregtech.common.tileentities.machines.MTEHatchOutputBusME;
+import gregtech.common.tileentities.machines.MTEHatchOutputME;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbine;
 import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
-    implements ControllerWithOptionalFeatures, IAddGregtechLogo, IAddUIWidgets, IBindPlayerInventoryUI {
+public abstract class MTEMultiBlockBase extends MetaTileEntity
+    implements IControllerWithOptionalFeatures, IAddGregtechLogo, IAddUIWidgets, IBindPlayerInventoryUI {
 
     public static boolean disableMaintenance;
     public boolean hasMaintenanceChecks = getDefaultHasMaintenanceChecks();
@@ -146,20 +146,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     protected static final String BATCH_MODE_NBT_KEY = "batchMode";
     protected SingleRecipeCheck mSingleRecipeCheck = null;
 
-    public ArrayList<GT_MetaTileEntity_Hatch_Input> mInputHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Output> mOutputHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_InputBus> mInputBusses = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_OutputBus> mOutputBusses = new ArrayList<>();
+    public ArrayList<MTEHatchInput> mInputHatches = new ArrayList<>();
+    public ArrayList<MTEHatchOutput> mOutputHatches = new ArrayList<>();
+    public ArrayList<MTEHatchInputBus> mInputBusses = new ArrayList<>();
+    public ArrayList<MTEHatchOutputBus> mOutputBusses = new ArrayList<>();
     public ArrayList<IDualInputHatch> mDualInputHatches = new ArrayList<>();
     public ArrayList<ISmartInputHatch> mSmartInputHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Dynamo> mDynamoHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Muffler> mMufflerHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Energy> mEnergyHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Maintenance> mMaintenanceHatches = new ArrayList<>();
-    protected List<GT_MetaTileEntity_Hatch> mExoticEnergyHatches = new ArrayList<>();
+    public ArrayList<MTEHatchDynamo> mDynamoHatches = new ArrayList<>();
+    public ArrayList<MTEHatchMuffler> mMufflerHatches = new ArrayList<>();
+    public ArrayList<MTEHatchEnergy> mEnergyHatches = new ArrayList<>();
+    public ArrayList<MTEHatchMaintenance> mMaintenanceHatches = new ArrayList<>();
+    protected List<MTEHatch> mExoticEnergyHatches = new ArrayList<>();
     protected final ProcessingLogic processingLogic;
     @SideOnly(Side.CLIENT)
-    protected GT_SoundLoop activitySoundLoop;
+    protected GTSoundLoop activitySoundLoop;
 
     protected long mLastWorkingTick = 0, mTotalRunTime = 0;
     private static final int CHECK_INTERVAL = 100; // How often should we check for a new recipe on an idle machine?
@@ -168,27 +168,27 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     protected static final byte INTERRUPT_SOUND_INDEX = 8;
     protected static final byte PROCESS_START_SOUND_INDEX = 1;
 
-    public GT_MetaTileEntity_MultiBlockBase(int aID, String aName, String aNameRegional) {
+    public MTEMultiBlockBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, 2);
         this.processingLogic = null;
-        GT_MetaTileEntity_MultiBlockBase.disableMaintenance = ConfigMachines.disableMaintenanceChecks;
+        MTEMultiBlockBase.disableMaintenance = ConfigMachines.disableMaintenanceChecks;
         this.damageFactorLow = ConfigMachines.damageFactorLow;
         this.damageFactorHigh = ConfigMachines.damageFactorHigh;
         this.mNEI = "";
         if (!shouldCheckMaintenance()) fixAllIssues();
     }
 
-    public GT_MetaTileEntity_MultiBlockBase(String aName) {
+    public MTEMultiBlockBase(String aName) {
         super(aName, 2);
         this.processingLogic = createProcessingLogic();
-        GT_MetaTileEntity_MultiBlockBase.disableMaintenance = ConfigMachines.disableMaintenanceChecks;
+        MTEMultiBlockBase.disableMaintenance = ConfigMachines.disableMaintenanceChecks;
         this.damageFactorLow = ConfigMachines.damageFactorLow;
         this.damageFactorHigh = ConfigMachines.damageFactorHigh;
         if (!shouldCheckMaintenance()) fixAllIssues();
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         return side != getBaseMetaTileEntity().getFrontFacing();
     }
 
@@ -197,11 +197,11 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (supportsSingleRecipeLocking()) {
             mLockedToSingleRecipe = !mLockedToSingleRecipe;
             if (mLockedToSingleRecipe) {
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
-                    GT_Utility.trans("223", "Single recipe locking enabled. Will lock to next recipe."));
+                    GTUtility.trans("223", "Single recipe locking enabled. Will lock to next recipe."));
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("220", "Single recipe locking disabled."));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("220", "Single recipe locking disabled."));
                 mSingleRecipeCheck = null;
             }
         }
@@ -273,7 +273,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (mOutputItems != null) {
             aNBT.setInteger("mOutputItemsLength", mOutputItems.length);
             for (int i = 0; i < mOutputItems.length; i++) if (mOutputItems[i] != null) {
-                GT_Utility.saveItem(aNBT, "mOutputItem" + i, mOutputItems[i]);
+                GTUtility.saveItem(aNBT, "mOutputItem" + i, mOutputItems[i]);
             }
         }
         if (mOutputFluids != null) {
@@ -342,15 +342,14 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         int aOutputItemsLength = aNBT.getInteger("mOutputItemsLength");
         if (aOutputItemsLength > 0) {
             mOutputItems = new ItemStack[aOutputItemsLength];
-            for (int i = 0; i < mOutputItems.length; i++)
-                mOutputItems[i] = GT_Utility.loadItem(aNBT, "mOutputItem" + i);
+            for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = GTUtility.loadItem(aNBT, "mOutputItem" + i);
         }
 
         int aOutputFluidsLength = aNBT.getInteger("mOutputFluidsLength");
         if (aOutputFluidsLength > 0) {
             mOutputFluids = new FluidStack[aOutputFluidsLength];
             for (int i = 0; i < mOutputFluids.length; i++)
-                mOutputFluids[i] = GT_Utility.loadFluid(aNBT, "mOutputFluids" + i);
+                mOutputFluids[i] = GTUtility.loadFluid(aNBT, "mOutputFluids" + i);
         }
         if (shouldCheckMaintenance()) {
             mWrench = aNBT.getBoolean("mWrench");
@@ -376,7 +375,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     @Override
     public void onLeftclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        if (aBaseMetaTileEntity.isServerSide() && GT_Util.saveMultiblockInputConfiguration(this, aPlayer)) {
+        if (aBaseMetaTileEntity.isServerSide() && GTUtil.saveMultiblockInputConfiguration(this, aPlayer)) {
             aPlayer.addChatComponentMessage(new ChatComponentTranslation("GT5U.MULTI_MACHINE_CONFIG.SAVE"));
             return;
         }
@@ -385,9 +384,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        if (GT_Util.hasMultiblockInputConfiguration(aPlayer.getHeldItem())) {
+        if (GTUtil.hasMultiblockInputConfiguration(aPlayer.getHeldItem())) {
             if (aBaseMetaTileEntity.isServerSide()) {
-                if (GT_Util.loadMultiblockInputConfiguration(this, aPlayer)) {
+                if (GTUtil.loadMultiblockInputConfiguration(this, aPlayer)) {
                     aPlayer.addChatComponentMessage(new ChatComponentTranslation("GT5U.MULTI_MACHINE_CONFIG.LOAD"));
                 } else {
                     aPlayer
@@ -396,7 +395,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             }
             return true;
         }
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -508,7 +507,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (!shouldCheckMaintenance()) return;
 
         if (getRepairStatus() != getIdealStatus()) {
-            for (GT_MetaTileEntity_Hatch_Maintenance tHatch : filterValidMTEs(mMaintenanceHatches)) {
+            for (MTEHatchMaintenance tHatch : filterValidMTEs(mMaintenanceHatches)) {
                 if (tHatch.mAuto) tHatch.autoMaintainance();
                 if (tHatch.mWrench) mWrench = true;
                 if (tHatch.mScrewdriver) mScrewdriver = true;
@@ -593,7 +592,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                         for (ItemStack tStack : mOutputItems) {
                             if (tStack != null) {
                                 try {
-                                    GT_Mod.achievements.issueAchivementHatch(
+                                    GTMod.achievements.issueAchivementHatch(
                                         aBaseMetaTileEntity.getWorld()
                                             .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()),
                                         tStack);
@@ -607,7 +606,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                         addFluidOutputs(mOutputFluids);
                         if (mOutputFluids.length > 1) {
                             try {
-                                GT_Mod.achievements.issueAchievement(
+                                GTMod.achievements.issueAchievement(
                                     aBaseMetaTileEntity.getWorld()
                                         .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()),
                                     "oilplant");
@@ -647,7 +646,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public boolean polluteEnvironment(int aPollutionLevel) {
         mPollution += aPollutionLevel;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             if (mPollution >= 10000) {
                 if (tHatch.polluteEnvironment(this)) {
                     mPollution -= 10000;
@@ -671,9 +670,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         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);
         }
     }
@@ -683,7 +682,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 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);
         }
     }
 
@@ -691,7 +690,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     protected void doActivitySound(ResourceLocation activitySound) {
         if (getBaseMetaTileEntity().isActive() && activitySound != null) {
             if (activitySoundLoop == null) {
-                activitySoundLoop = new GT_SoundLoop(activitySound, getBaseMetaTileEntity(), false, true);
+                activitySoundLoop = new GTSoundLoop(activitySound, getBaseMetaTileEntity(), false, true);
                 Minecraft.getMinecraft()
                     .getSoundHandler()
                     .playSound(activitySoundLoop);
@@ -865,8 +864,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                     result = foundResult;
                 }
             } else {
-                for (GT_MetaTileEntity_Hatch_InputBus bus : mInputBusses) {
-                    if (bus instanceof GT_MetaTileEntity_Hatch_CraftingInput_ME) {
+                for (MTEHatchInputBus bus : mInputBusses) {
+                    if (bus instanceof MTEHatchCraftingInputME) {
                         continue;
                     }
                     List<ItemStack> inputItems = new ArrayList<>();
@@ -1047,9 +1046,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             if (mInventory[1] != null && getBaseMetaTileEntity().getRandomNumber(2) == 0
                 && !mInventory[1].getUnlocalizedName()
                     .startsWith("gt.blockmachines.basicmachine.")) {
-                if (mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) {
+                if (mInventory[1].getItem() instanceof MetaGeneratedTool01) {
                     NBTTagCompound tNBT = mInventory[1].getTagCompound();
-                    ((GT_MetaGenerated_Tool) mInventory[1].getItem()).doDamage(
+                    ((MetaGeneratedTool) mInventory[1].getItem()).doDamage(
                         mInventory[1],
                         (long) getDamageToComponent(mInventory[1])
                             * (long) Math.min(mEUt / this.damageFactorLow, Math.pow(mEUt, this.damageFactorHigh)));
@@ -1073,7 +1072,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public void explodeMultiblock() {
 
-        GT_Log.exp.println(
+        GTLog.exp.println(
             "MultiBlockExplosion at: " + this.getBaseMetaTileEntity()
                 .getXCoord()
                 + " | "
@@ -1087,7 +1086,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                     .getWorld().provider.dimensionId
                 + ".");
 
-        GT_Pollution.addPollution(getBaseMetaTileEntity(), GT_Mod.gregtechproxy.mPollutionOnExplosion);
+        Pollution.addPollution(getBaseMetaTileEntity(), GTMod.gregtechproxy.mPollutionOnExplosion);
         mInventory[1] = null;
         // noinspection unchecked // In this case, the inspection only indicates that the array can be abused in runtime
         Iterable<MetaTileEntity> allHatches = Iterables.concat(
@@ -1123,7 +1122,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         long totalOutput = 0;
         long aFirstVoltageFound = -1;
         boolean aFoundMixedDynamos = false;
-        for (GT_MetaTileEntity_Hatch_Dynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
+        for (MTEHatchDynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
             long aVoltage = aDynamo.maxEUOutput();
             long aTotal = aDynamo.maxAmperesOut() * aVoltage;
             // Check against voltage to check when hatch mixing
@@ -1147,7 +1146,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         int aAmpsToInject;
         int aRemainder;
         int ampsOnCurrentHatch;
-        for (GT_MetaTileEntity_Hatch_Dynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
+        for (MTEHatchDynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
             leftToInject = aEU - injected;
             aVoltage = aDynamo.maxEUOutput();
             aAmpsToInject = (int) (leftToInject / aVoltage);
@@ -1172,22 +1171,21 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      */
     public long getMaxInputVoltage() {
         long rVoltage = 0;
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches))
-            rVoltage += tHatch.getBaseMetaTileEntity()
-                .getInputVoltage();
+        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) rVoltage += tHatch.getBaseMetaTileEntity()
+            .getInputVoltage();
         return rVoltage;
     }
 
     public long getAverageInputVoltage() {
-        return GT_ExoticEnergyInputHelper.getAverageInputVoltageMulti(mEnergyHatches);
+        return ExoticEnergyInputHelper.getAverageInputVoltageMulti(mEnergyHatches);
     }
 
     public long getMaxInputAmps() {
-        return GT_ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(mEnergyHatches);
+        return ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(mEnergyHatches);
     }
 
     public long getMaxInputEu() {
-        return GT_ExoticEnergyInputHelper.getTotalEuMulti(mEnergyHatches);
+        return ExoticEnergyInputHelper.getTotalEuMulti(mEnergyHatches);
     }
 
     /**
@@ -1195,7 +1193,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      */
     public long getMaxInputPower() {
         long eut = 0;
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
+        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
             IGregTechTileEntity baseTile = tHatch.getBaseMetaTileEntity();
             eut += baseTile.getInputVoltage() * baseTile.getInputAmperage();
         }
@@ -1230,8 +1228,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      */
     protected void calculateOverclockedNessMultiInternal(long aEUt, int aDuration, int mAmperage, long maxInputVoltage,
         boolean perfectOC) {
-        byte tier = (byte) Math.max(0, GT_Utility.getTier(maxInputVoltage));
-        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(aEUt)
+        byte tier = (byte) Math.max(0, GTUtility.getTier(maxInputVoltage));
+        OverclockCalculator calculator = new OverclockCalculator().setRecipeEUt(aEUt)
             .setEUt(V[tier] * mAmperage)
             .setDuration(aDuration)
             .setDurationDecreasePerOC(perfectOC ? 4.0 : 2.0)
@@ -1260,16 +1258,16 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public boolean drainEnergyInput(long aEU) {
         if (aEU <= 0) return true;
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
+        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
             if (tHatch.getBaseMetaTileEntity()
                 .decreaseStoredEnergyUnits(aEU, false)) return true;
         }
         return false;
     }
 
-    protected static boolean dumpFluid(List<GT_MetaTileEntity_Hatch_Output> aOutputHatches, FluidStack copiedFluidStack,
+    protected static boolean dumpFluid(List<MTEHatchOutput> aOutputHatches, FluidStack copiedFluidStack,
         boolean restrictiveHatchesOnly) {
-        for (GT_MetaTileEntity_Hatch_Output tHatch : filterValidMTEs(aOutputHatches)) {
+        for (MTEHatchOutput tHatch : filterValidMTEs(aOutputHatches)) {
             if (restrictiveHatchesOnly && tHatch.mMode == 0) {
                 continue;
             }
@@ -1308,7 +1306,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public boolean depleteInput(FluidStack aLiquid, boolean simulate) {
         if (aLiquid == null) return false;
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
             setHatchRecipeMap(tHatch);
             FluidStack tLiquid = tHatch.drain(ForgeDirection.UNKNOWN, aLiquid, false);
             if (tLiquid != null && tLiquid.amount >= aLiquid.amount) {
@@ -1323,10 +1321,10 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     public boolean addOutput(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
-        aStack = GT_Utility.copyOrNull(aStack);
+        if (GTUtility.isStackInvalid(aStack)) return false;
+        aStack = GTUtility.copyOrNull(aStack);
 
-        final List<GT_MetaTileEntity_Hatch_OutputBus> filteredBuses = filterValidMTEs(mOutputBusses);
+        final List<MTEHatchOutputBus> filteredBuses = filterValidMTEs(mOutputBusses);
         if (dumpItem(filteredBuses, aStack, true) || dumpItem(filteredBuses, aStack, false)) {
             return true;
         }
@@ -1336,7 +1334,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         while (outputSuccess && aStack.stackSize > 0) {
             outputSuccess = false;
             ItemStack single = aStack.splitStack(1);
-            for (GT_MetaTileEntity_Hatch_Output tHatch : filterValidMTEs(mOutputHatches)) {
+            for (MTEHatchOutput tHatch : filterValidMTEs(mOutputHatches)) {
                 if (!outputSuccess && tHatch.outputsItems()) {
                     if (tHatch.getBaseMetaTileEntity()
                         .addStackToSlot(1, single)) outputSuccess = true;
@@ -1346,9 +1344,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         return outputSuccess;
     }
 
-    private boolean dumpItem(List<GT_MetaTileEntity_Hatch_OutputBus> outputBuses, ItemStack itemStack,
-        boolean restrictiveBusesOnly) {
-        for (GT_MetaTileEntity_Hatch_OutputBus outputBus : outputBuses) {
+    private boolean dumpItem(List<MTEHatchOutputBus> outputBuses, ItemStack itemStack, boolean restrictiveBusesOnly) {
+        for (MTEHatchOutputBus outputBus : outputBuses) {
             if (restrictiveBusesOnly && !outputBus.isLocked()) {
                 continue;
             }
@@ -1362,12 +1359,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     public boolean depleteInput(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
-        FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true);
+        if (GTUtility.isStackInvalid(aStack)) return false;
+        FluidStack aLiquid = GTUtility.getFluidForFilledItem(aStack, true);
         if (aLiquid != null) return depleteInput(aLiquid);
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
             setHatchRecipeMap(tHatch);
-            if (GT_Utility.areStacksEqual(
+            if (GTUtility.areStacksEqual(
                 aStack,
                 tHatch.getBaseMetaTileEntity()
                     .getStackInSlot(0))) {
@@ -1379,11 +1376,11 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 }
             }
         }
-        for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) {
+        for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) {
             tHatch.mRecipeMap = getRecipeMap();
             for (int i = tHatch.getBaseMetaTileEntity()
                 .getSizeInventory() - 1; i >= 0; i--) {
-                if (GT_Utility.areStacksEqual(
+                if (GTUtility.areStacksEqual(
                     aStack,
                     tHatch.getBaseMetaTileEntity()
                         .getStackInSlot(i))) {
@@ -1401,7 +1398,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public ArrayList<ItemStack> getStoredOutputs() {
         ArrayList<ItemStack> rList = new ArrayList<>();
-        for (GT_MetaTileEntity_Hatch_OutputBus tHatch : filterValidMTEs(mOutputBusses)) {
+        for (MTEHatchOutputBus tHatch : filterValidMTEs(mOutputBusses)) {
             for (int i = tHatch.getBaseMetaTileEntity()
                 .getSizeInventory() - 1; i >= 0; i--) {
                 rList.add(
@@ -1415,15 +1412,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     public ArrayList<FluidStack> getStoredFluids() {
         ArrayList<FluidStack> rList = new ArrayList<>();
         Map<Fluid, FluidStack> inputsFromME = new HashMap<>();
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
             setHatchRecipeMap(tHatch);
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput multiInputHatch) {
+            if (tHatch instanceof MTEHatchMultiInput multiInputHatch) {
                 for (FluidStack tFluid : multiInputHatch.getStoredFluid()) {
                     if (tFluid != null) {
                         rList.add(tFluid);
                     }
                 }
-            } else if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) {
+            } else if (tHatch instanceof MTEHatchInputME meHatch) {
                 for (FluidStack fluidStack : meHatch.getStoredFluids()) {
                     if (fluidStack != null) {
                         // Prevent the same fluid from different ME hatches from being recognized
@@ -1449,7 +1446,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      * @param doDrain If false, fluid will not actually be consumed
      * @return Whether the hatch contains enough fluid to drain
      */
-    public boolean drain(GT_MetaTileEntity_Hatch hatch, FluidStack fluid, boolean doDrain) {
+    public boolean drain(MTEHatch hatch, FluidStack fluid, boolean doDrain) {
         if (fluid == null || hatch == null) return false;
         if (supportsCraftingMEBuffer() && hatch instanceof IDualInputHatch tHatch && tHatch.supportsFluids()) {
             Optional<IDualInputInventory> inventory = tHatch.getFirstNonEmptyInventory();
@@ -1465,8 +1462,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             }
         }
 
-        if (hatch instanceof GT_MetaTileEntity_Hatch_Input tHatch && tHatch.isValid()) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) {
+        if (hatch instanceof MTEHatchInput tHatch && tHatch.isValid()) {
+            if (tHatch instanceof MTEHatchInputME meHatch) {
                 meHatch.startRecipeProcessing();
                 FluidStack tFluid = meHatch.drain(ForgeDirection.UNKNOWN, fluid, doDrain);
                 meHatch.endRecipeProcessing(this);
@@ -1482,20 +1479,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public ArrayList<ItemStack> getStoredInputs() {
         ArrayList<ItemStack> rList = new ArrayList<>();
-        Map<GT_Utility.ItemId, ItemStack> inputsFromME = new HashMap<>();
-        for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_CraftingInput_ME) {
+        Map<GTUtility.ItemId, ItemStack> inputsFromME = new HashMap<>();
+        for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) {
+            if (tHatch instanceof MTEHatchCraftingInputME) {
                 continue;
             }
             tHatch.mRecipeMap = getRecipeMap();
             IGregTechTileEntity tileEntity = tHatch.getBaseMetaTileEntity();
-            boolean isMEBus = tHatch instanceof GT_MetaTileEntity_Hatch_InputBus_ME;
+            boolean isMEBus = tHatch instanceof MTEHatchInputBusME;
             for (int i = tileEntity.getSizeInventory() - 1; i >= 0; i--) {
                 ItemStack itemStack = tileEntity.getStackInSlot(i);
                 if (itemStack != null) {
                     if (isMEBus) {
                         // Prevent the same item from different ME buses from being recognized
-                        inputsFromME.put(GT_Utility.ItemId.createNoCopy(itemStack), itemStack);
+                        inputsFromME.put(GTUtility.ItemId.createNoCopy(itemStack), itemStack);
                     } else {
                         rList.add(itemStack);
                     }
@@ -1537,20 +1534,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             }
         }
 
-        Map<GT_Utility.ItemId, ItemStack> inputsFromME = new HashMap<>();
-        for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_CraftingInput_ME) {
+        Map<GTUtility.ItemId, ItemStack> inputsFromME = new HashMap<>();
+        for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) {
+            if (tHatch instanceof MTEHatchCraftingInputME) {
                 continue;
             }
             tHatch.mRecipeMap = getRecipeMap();
             IGregTechTileEntity tileEntity = tHatch.getBaseMetaTileEntity();
-            boolean isMEBus = tHatch instanceof GT_MetaTileEntity_Hatch_InputBus_ME;
+            boolean isMEBus = tHatch instanceof MTEHatchInputBusME;
             for (int i = tileEntity.getSizeInventory() - 1; i >= 0; i--) {
                 ItemStack itemStack = tileEntity.getStackInSlot(i);
                 if (itemStack != null) {
                     if (isMEBus) {
                         // Prevent the same item from different ME buses from being recognized
-                        inputsFromME.put(GT_Utility.ItemId.createNoCopy(itemStack), itemStack);
+                        inputsFromME.put(GTUtility.ItemId.createNoCopy(itemStack), itemStack);
                     } else {
                         rList.add(itemStack);
                     }
@@ -1566,15 +1563,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         return rList;
     }
 
-    public Map<GT_Utility.ItemId, ItemStack> getStoredInputsFromME() {
-        Map<GT_Utility.ItemId, ItemStack> inputsFromME = new Object2ReferenceOpenHashMap<>();
-        for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_InputBus_ME meBus) {
+    public Map<GTUtility.ItemId, ItemStack> getStoredInputsFromME() {
+        Map<GTUtility.ItemId, ItemStack> inputsFromME = new Object2ReferenceOpenHashMap<>();
+        for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) {
+            if (tHatch instanceof MTEHatchInputBusME meBus) {
                 for (int i = meBus.getSizeInventory() - 1; i >= 0; i--) {
                     ItemStack itemStack = meBus.getStackInSlot(i);
                     if (itemStack != null) {
                         // Prevent the same item from different ME buses from being recognized
-                        inputsFromME.put(GT_Utility.ItemId.createNoCopy(itemStack), itemStack);
+                        inputsFromME.put(GTUtility.ItemId.createNoCopy(itemStack), itemStack);
                     }
                 }
             }
@@ -1584,8 +1581,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     public Map<Fluid, FluidStack> getStoredFluidsFromME() {
         Map<Fluid, FluidStack> fluidsFromME = new Reference2ReferenceOpenHashMap<>();
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) {
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
+            if (tHatch instanceof MTEHatchInputME meHatch) {
                 for (FluidStack fluid : meHatch.getStoredFluids()) {
                     if (fluid != null) {
                         // Prevent the same fluid from different ME hatches from being recognized
@@ -1613,17 +1610,17 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     public void updateSlots() {
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) tHatch.updateSlots();
-        for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) tHatch.updateSlots();
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) tHatch.updateSlots();
+        for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) tHatch.updateSlots();
     }
 
     protected void startRecipeProcessing() {
-        for (GT_MetaTileEntity_Hatch_InputBus hatch : filterValidMTEs(mInputBusses)) {
+        for (MTEHatchInputBus hatch : filterValidMTEs(mInputBusses)) {
             if (hatch instanceof IRecipeProcessingAwareHatch aware) {
                 aware.startRecipeProcessing();
             }
         }
-        for (GT_MetaTileEntity_Hatch_Input hatch : filterValidMTEs(mInputHatches)) {
+        for (MTEHatchInput hatch : filterValidMTEs(mInputHatches)) {
             if (hatch instanceof IRecipeProcessingAwareHatch aware) {
                 aware.startRecipeProcessing();
             }
@@ -1637,12 +1634,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     protected void endRecipeProcessing() {
-        for (GT_MetaTileEntity_Hatch_InputBus hatch : filterValidMTEs(mInputBusses)) {
+        for (MTEHatchInputBus hatch : filterValidMTEs(mInputBusses)) {
             if (hatch instanceof IRecipeProcessingAwareHatch aware) {
                 setResultIfFailure(aware.endRecipeProcessing(this));
             }
         }
-        for (GT_MetaTileEntity_Hatch_Input hatch : filterValidMTEs(mInputHatches)) {
+        for (MTEHatchInput hatch : filterValidMTEs(mInputHatches)) {
             if (hatch instanceof IRecipeProcessingAwareHatch aware) {
                 setResultIfFailure(aware.endRecipeProcessing(this));
             }
@@ -1653,7 +1650,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch hatch) {
+        if (aMetaTileEntity instanceof MTEHatch hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
         }
@@ -1667,26 +1664,21 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 mSmartInputHatches.add(hatch);
             }
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-            setHatchRecipeMap((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);
-            return mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);
-        }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
-            ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = getRecipeMap();
-            return mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity);
-        }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output)
-            return mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus)
-            return mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy)
-            return mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo)
-            return mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance)
-            return mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler)
-            return mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchInput) {
+            setHatchRecipeMap((MTEHatchInput) aMetaTileEntity);
+            return mInputHatches.add((MTEHatchInput) aMetaTileEntity);
+        }
+        if (aMetaTileEntity instanceof MTEHatchInputBus) {
+            ((MTEHatchInputBus) aMetaTileEntity).mRecipeMap = getRecipeMap();
+            return mInputBusses.add((MTEHatchInputBus) aMetaTileEntity);
+        }
+        if (aMetaTileEntity instanceof MTEHatchOutput) return mOutputHatches.add((MTEHatchOutput) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchOutputBus) return mOutputBusses.add((MTEHatchOutputBus) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchEnergy) return mEnergyHatches.add((MTEHatchEnergy) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchDynamo) return mDynamoHatches.add((MTEHatchDynamo) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchMaintenance)
+            return mMaintenanceHatches.add((MTEHatchMaintenance) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchMuffler) return mMufflerHatches.add((MTEHatchMuffler) aMetaTileEntity);
         return false;
     }
 
@@ -1694,7 +1686,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance hatch) {
+        if (aMetaTileEntity instanceof MTEHatchMaintenance hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mMaintenanceHatches.add(hatch);
@@ -1708,7 +1700,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         }
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy hatch) {
+        if (aMetaTileEntity instanceof MTEHatchEnergy hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mEnergyHatches.add(hatch);
@@ -1720,8 +1712,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch hatch
-            && GT_ExoticEnergyInputHelper.isExoticEnergyInput(aMetaTileEntity)) {
+        if (aMetaTileEntity instanceof MTEHatch hatch && ExoticEnergyInputHelper.isExoticEnergyInput(aMetaTileEntity)) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mExoticEnergyHatches.add(hatch);
@@ -1733,7 +1724,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo hatch) {
+        if (aMetaTileEntity instanceof MTEHatchDynamo hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mDynamoHatches.add(hatch);
@@ -1745,7 +1736,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler hatch) {
+        if (aMetaTileEntity instanceof MTEHatchMuffler hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mMufflerHatches.add(hatch);
@@ -1776,7 +1767,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aMetaTileEntity instanceof ISmartInputHatch hatch) {
             mSmartInputHatches.add(hatch);
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus hatch) {
+        if (aMetaTileEntity instanceof MTEHatchInputBus hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             hatch.mRecipeMap = getRecipeMap();
@@ -1789,7 +1780,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus hatch) {
+        if (aMetaTileEntity instanceof MTEHatchOutputBus hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mOutputBusses.add(hatch);
@@ -1804,7 +1795,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aMetaTileEntity instanceof ISmartInputHatch hatch) {
             mSmartInputHatches.add(hatch);
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input hatch) {
+        if (aMetaTileEntity instanceof MTEHatchInput hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             setHatchRecipeMap(hatch);
@@ -1817,7 +1808,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output hatch) {
+        if (aMetaTileEntity instanceof MTEHatchOutput hatch) {
             hatch.updateTexture(aBaseCasingIndex);
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             return mOutputHatches.add(hatch);
@@ -1825,7 +1816,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         return false;
     }
 
-    protected void setHatchRecipeMap(GT_MetaTileEntity_Hatch_Input hatch) {
+    protected void setHatchRecipeMap(MTEHatchInput hatch) {
         if (filtersFluid()) {
             hatch.mRecipeMap = getRecipeMap();
         }
@@ -1841,13 +1832,13 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
         }
 
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
+        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -1886,7 +1877,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 + StatCollector.translateToLocal("GT5U.machines.tier")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + VN[GT_Utility.getTier(getMaxInputVoltage())]
+                + VN[GTUtility.getTier(getMaxInputVoltage())]
                 + EnumChatFormatting.RESET,
             /* 5 */ StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
                 + EnumChatFormatting.RED
@@ -1929,7 +1920,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         int tInputList_sS = tInputList.size();
         for (int i = 0; i < tInputList_sS - 1; i++) {
             for (int j = i + 1; j < tInputList_sS; j++) {
-                if (!GT_Utility.areStacksEqual(tInputList.get(i), tInputList.get(j))) continue;
+                if (!GTUtility.areStacksEqual(tInputList.get(i), tInputList.get(j))) continue;
                 if (tInputList.get(i).stackSize >= tInputList.get(j).stackSize) {
                     tInputList.remove(j--);
                     tInputList_sS = tInputList.size();
@@ -1949,7 +1940,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         int tFluidList_sS = tFluidList.size();
         for (int i = 0; i < tFluidList_sS - 1; i++) {
             for (int j = i + 1; j < tFluidList_sS; j++) {
-                if (!GT_Utility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) continue;
+                if (!GTUtility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) continue;
 
                 if (tFluidList.get(i).amount >= tFluidList.get(j).amount) {
                     tFluidList.remove(j--);
@@ -1989,15 +1980,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                         StatCollector.translateToLocalFormatted(
                             "GT5U.waila.energy.use_with_amperage",
                             formatNumbers(actualEnergyUsage),
-                            GT_Utility.getAmperageForTier(actualEnergyUsage, (byte) energyTier),
-                            GT_Utility.getColoredTierNameFromTier((byte) energyTier)));
+                            GTUtility.getAmperageForTier(actualEnergyUsage, (byte) energyTier),
+                            GTUtility.getColoredTierNameFromTier((byte) energyTier)));
                 } else if (actualEnergyUsage < 0) {
                     currentTip.add(
                         StatCollector.translateToLocalFormatted(
                             "GT5U.waila.energy.produce_with_amperage",
                             formatNumbers(-actualEnergyUsage),
-                            GT_Utility.getAmperageForTier(-actualEnergyUsage, (byte) energyTier),
-                            GT_Utility.getColoredTierNameFromTier((byte) energyTier)));
+                            GTUtility.getAmperageForTier(-actualEnergyUsage, (byte) energyTier),
+                            GTUtility.getColoredTierNameFromTier((byte) energyTier)));
                 }
             } else {
                 if (actualEnergyUsage > 0) {
@@ -2005,20 +1996,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                         StatCollector.translateToLocalFormatted(
                             "GT5U.waila.energy.use",
                             formatNumbers(actualEnergyUsage),
-                            GT_Utility.getColoredTierNameFromVoltage(actualEnergyUsage)));
+                            GTUtility.getColoredTierNameFromVoltage(actualEnergyUsage)));
                 } else if (actualEnergyUsage < 0) {
                     currentTip.add(
                         StatCollector.translateToLocalFormatted(
                             "GT5U.waila.energy.produce",
                             formatNumbers(-actualEnergyUsage),
-                            GT_Utility.getColoredTierNameFromVoltage(-actualEnergyUsage)));
+                            GTUtility.getColoredTierNameFromVoltage(-actualEnergyUsage)));
                 }
             }
         }
-        currentTip.add(
-            GT_Waila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
+        currentTip
+            .add(GTWaila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
         // Show ns on the tooltip
-        if (GT_Mod.gregtechproxy.wailaAverageNS && tag.hasKey("averageNS")) {
+        if (GTMod.gregtechproxy.wailaAverageNS && tag.hasKey("averageNS")) {
             int tAverageTime = tag.getInteger("averageNS");
             currentTip.add("Average CPU load of ~" + formatNumbers(tAverageTime) + " ns");
         }
@@ -2051,7 +2042,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             }
         }
 
-        final GT_ClientPreference preference = GT_Mod.gregtechproxy.getClientPreference(player.getUniqueID());
+        final GTClientPreference preference = GTMod.gregtechproxy.getClientPreference(player.getUniqueID());
         if (preference != null && preference.isWailaAverageNSEnabled()) {
             getBaseMetaTileEntity().startTimeStatistics();
             int tAverageTime = 0;
@@ -2073,7 +2064,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     protected void setMufflers(boolean state) {
-        for (GT_MetaTileEntity_Hatch_Muffler aMuffler : mMufflerHatches) {
+        for (MTEHatchMuffler aMuffler : mMufflerHatches) {
             final IGregTechTileEntity iGTTileEntity = aMuffler.getBaseMetaTileEntity();
             if (iGTTileEntity != null && !iGTTileEntity.isDead()) {
                 iGTTileEntity.setActive(state);
@@ -2088,7 +2079,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         setMufflers(false);
     }
 
-    public List<GT_MetaTileEntity_Hatch> getExoticEnergyHatches() {
+    public List<MTEHatch> getExoticEnergyHatches() {
         return mExoticEnergyHatches;
     }
 
@@ -2118,10 +2109,10 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      * If void protection is enabled, it also checks for {@link #protectsExcessItem()} and
      * {@link #protectsExcessFluid()}, so you don't need to call them along with this method.
      * <p>
-     * If you're using {@link GT_ParallelHelper}, it will handle void protection and return 0 parallel
+     * If you're using {@link ParallelHelper}, it will handle void protection and return 0 parallel
      * if all the output cannot be dumped into buses / hatches. In that case you won't use this method.
      */
-    protected boolean canOutputAll(@Nonnull GT_Recipe recipe) {
+    protected boolean canOutputAll(@Nonnull GTRecipe recipe) {
         return canOutputAll(recipe.mOutputs, recipe.mFluidOutputs);
     }
 
@@ -2231,8 +2222,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     @Override
     public List<ItemStack> getItemOutputSlots(ItemStack[] toOutput) {
         List<ItemStack> ret = new ArrayList<>();
-        for (final GT_MetaTileEntity_Hatch tBus : filterValidMTEs(mOutputBusses)) {
-            if (!(tBus instanceof GT_MetaTileEntity_Hatch_OutputBus_ME)) {
+        for (final MTEHatch tBus : filterValidMTEs(mOutputBusses)) {
+            if (!(tBus instanceof MTEHatchOutputBusME)) {
                 final IInventory tBusInv = tBus.getBaseMetaTileEntity();
                 for (int i = 0; i < tBusInv.getSizeInventory(); i++) {
                     final ItemStack stackInSlot = tBus.getStackInSlot(i);
@@ -2263,18 +2254,18 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     /**
      * Util method for DT-like structure to collect list of output hatches.
      */
-    protected <T extends GT_MetaTileEntity_Hatch_Output> List<? extends IFluidStore> getFluidOutputSlotsByLayer(
-        FluidStack[] toOutput, List<List<T>> hatchesByLayer) {
+    protected <T extends MTEHatchOutput> List<? extends IFluidStore> getFluidOutputSlotsByLayer(FluidStack[] toOutput,
+        List<List<T>> hatchesByLayer) {
         List<IFluidStore> ret = new ArrayList<>();
         for (int i = 0; i < toOutput.length; i++) {
             if (i >= hatchesByLayer.size()) {
                 break;
             }
             FluidStack fluidOutputForLayer = toOutput[i];
-            for (GT_MetaTileEntity_Hatch_Output hatch : hatchesByLayer.get(i)) {
+            for (MTEHatchOutput hatch : hatchesByLayer.get(i)) {
                 if (!hatch.isValid()) continue;
                 if (fluidOutputForLayer != null) {
-                    ret.add(new OutputHatchWrapper(hatch, f -> GT_Utility.areFluidsEqual(f, fluidOutputForLayer)));
+                    ret.add(new OutputHatchWrapper(hatch, f -> GTUtility.areFluidsEqual(f, fluidOutputForLayer)));
                 } else {
                     ret.add(hatch);
                 }
@@ -2285,9 +2276,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
 
     @Override
     public boolean canDumpItemToME() {
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mOutputBusses)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_OutputBus_ME) {
-                if ((((GT_MetaTileEntity_Hatch_OutputBus_ME) tHatch).canAcceptItem())) {
+        for (MTEHatch tHatch : filterValidMTEs(mOutputBusses)) {
+            if (tHatch instanceof MTEHatchOutputBusME) {
+                if ((((MTEHatchOutputBusME) tHatch).canAcceptItem())) {
                     return true;
                 }
             }
@@ -2298,8 +2289,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     @Override
     public boolean canDumpFluidToME() {
         for (IFluidStore tHatch : getFluidOutputSlots(new FluidStack[0])) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME) {
-                if ((((GT_MetaTileEntity_Hatch_Output_ME) tHatch).canAcceptFluid())) {
+            if (tHatch instanceof MTEHatchOutputME) {
+                if ((((MTEHatchOutputME) tHatch).canAcceptFluid())) {
                     return true;
                 }
             }
@@ -2336,8 +2327,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
      * Creates the icon list for this machine. Override this and add the overlays to machineModeIcons in order.
      */
     public void setMachineModeIcons() {
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT);
     }
 
     /**
@@ -2447,13 +2438,13 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setPos(4, 4)
                 .setSize(190, 85));
         final SlotWidget inventorySlot = new SlotWidget(inventoryHandler, 1);
         builder.widget(
             inventorySlot.setPos(173, 167)
-                .setBackground(GT_UITextures.SLOT_DARK_GRAY));
+                .setBackground(GTUITextures.SLOT_DARK_GRAY));
 
         final DynamicPositionedColumn screenElements = new DynamicPositionedColumn();
         drawTexts(screenElements, inventorySlot);
@@ -2563,44 +2554,42 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         if (supportsMachineModeSwitch()) {
             screenElements.widget(
                 TextWidget.dynamicString(
-                    () -> EnumChatFormatting.WHITE + GT_Utility.trans("400", "Running mode: ")
+                    () -> EnumChatFormatting.WHITE + GTUtility.trans("400", "Running mode: ")
                         + EnumChatFormatting.GOLD
                         + getMachineModeName()));
         }
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("132", "Pipe is loose.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("132", "Pipe is loose.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mWrench))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mWrench, val -> mWrench = val));
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("133", "Screws are loose.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("133", "Screws are loose.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mScrewdriver))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mScrewdriver, val -> mScrewdriver = val));
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("134", "Something is stuck.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("134", "Something is stuck.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mSoftHammer))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mSoftHammer, val -> mSoftHammer = val));
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("135", "Platings are dented.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("135", "Platings are dented.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mHardHammer))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mHardHammer, val -> mHardHammer = val));
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("136", "Circuitry burned out.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("136", "Circuitry burned out.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mSolderingTool))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mSolderingTool, val -> mSolderingTool = val));
-        screenElements
-            .widget(
-                new TextWidget(GT_Utility.trans("137", "That doesn't belong there."))
-                    .setDefaultColor(COLOR_TEXT_WHITE.get())
-                    .setEnabled(widget -> !mCrowbar))
+        screenElements.widget(
+            new TextWidget(GTUtility.trans("137", "That doesn't belong there.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                .setEnabled(widget -> !mCrowbar))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mCrowbar, val -> mCrowbar = val));
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mMachine))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val));
         screenElements.widget(
@@ -2611,7 +2600,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 .setEnabled(widget -> (getBaseMetaTileEntity().getErrorDisplayID() & 256) != 0));
 
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("139", "Hit with Soft Mallet")).setDefaultColor(COLOR_TEXT_WHITE.get())
+            new TextWidget(GTUtility.trans("139", "Hit with Soft Mallet")).setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setEnabled(
                     widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 && !getBaseMetaTileEntity().isActive()))
             .widget(
@@ -2623,15 +2612,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                     () -> getBaseMetaTileEntity().isActive(),
                     val -> getBaseMetaTileEntity().setActive(val)));
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("140", "to (re-)start the Machine")).setDefaultColor(COLOR_TEXT_WHITE.get())
+            new TextWidget(GTUtility.trans("140", "to (re-)start the Machine")).setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setEnabled(
                     widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 && !getBaseMetaTileEntity().isActive()));
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("141", "if it doesn't start.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+            new TextWidget(GTUtility.trans("141", "if it doesn't start.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setEnabled(
                     widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 && !getBaseMetaTileEntity().isActive()));
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("142", "Running perfectly.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+            new TextWidget(GTUtility.trans("142", "Running perfectly.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setEnabled(
                     widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 && getBaseMetaTileEntity().isActive()));
 
@@ -2656,7 +2645,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 .setTextAlignment(Alignment.CenterLeft)
                 .setEnabled(
                     widget -> shouldDisplayShutDownReason() && !getBaseMetaTileEntity().isActive()
-                        && GT_Utility.isStringValid(
+                        && GTUtility.isStringValid(
                             getBaseMetaTileEntity().getLastShutDownReason()
                                 .getDisplayString())
                         && getBaseMetaTileEntity().wasShutdown()))
@@ -2675,7 +2664,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
                 .setTextAlignment(Alignment.CenterLeft)
                 .setEnabled(
                     widget -> shouldDisplayCheckRecipeResult()
-                        && GT_Utility.isStringValid(checkRecipeResult.getDisplayString())
+                        && GTUtility.isStringValid(checkRecipeResult.getDisplayString())
                         && (isAllowedToWork() || getBaseMetaTileEntity().isActive()
                             || checkRecipeResult.persistsOnShutdown())))
             .widget(new CheckRecipeResultSyncer(() -> checkRecipeResult, (result) -> checkRecipeResult = result));
@@ -2706,15 +2695,14 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         }
 
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("144", "Missing Turbine Rotor")).setDefaultColor(COLOR_TEXT_WHITE.get())
+            new TextWidget(GTUtility.trans("144", "Missing Turbine Rotor")).setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setEnabled(widget -> {
                     if (getBaseMetaTileEntity().isAllowedToWork()) return false;
-                    if (getBaseMetaTileEntity().getErrorDisplayID() == 0
-                        && this instanceof GT_MetaTileEntity_LargeTurbine) {
+                    if (getBaseMetaTileEntity().getErrorDisplayID() == 0 && this instanceof MTELargeTurbine) {
                         final ItemStack tItem = inventorySlot.getMcSlot()
                             .getStack();
                         return tItem == null
-                            || !(tItem.getItem() == GT_MetaGenerated_Tool_01.INSTANCE && tItem.getItemDamage() >= 170
+                            || !(tItem.getItem() == MetaGeneratedTool01.INSTANCE && tItem.getItemDamage() >= 170
                                 && tItem.getItemDamage() <= 177);
                     }
                     return false;
@@ -2726,12 +2714,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
     }
 
     @TestOnly
-    protected void setEnergyHatches(ArrayList<GT_MetaTileEntity_Hatch_Energy> EnergyHatches) {
+    protected void setEnergyHatches(ArrayList<MTEHatchEnergy> EnergyHatches) {
         this.mEnergyHatches = EnergyHatches;
     }
 
     @TestOnly
-    protected void setExoticEnergyHatches(List<GT_MetaTileEntity_Hatch> ExoticEnergyHatches) {
+    protected void setExoticEnergyHatches(List<MTEHatch> ExoticEnergyHatches) {
         this.mExoticEnergyHatches = ExoticEnergyHatches;
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SpecialFilter.java b/src/main/java/gregtech/api/metatileentity/implementations/MTESpecialFilter.java
index 1a71f17ec8..c93b542805 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SpecialFilter.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTESpecialFilter.java
@@ -15,27 +15,25 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public abstract class GT_MetaTileEntity_SpecialFilter extends GT_MetaTileEntity_FilterBase {
+public abstract class MTESpecialFilter extends MTEFilterBase {
 
     private static final String ALLOW_NBT_TOOLTIP = "GT5U.machines.allow_nbt.tooltip";
     private boolean allowNbt = false;
 
-    public GT_MetaTileEntity_SpecialFilter(int aID, String aName, String aNameRegional, int aTier,
-        String[] aDescription) {
+    public MTESpecialFilter(int aID, String aName, String aNameRegional, int aTier, String[] aDescription) {
         // 9 buffer slot, 1 representation slot, 1 holo slot. last seems not needed...
         super(aID, aName, aNameRegional, aTier, 11, aDescription);
     }
 
-    public GT_MetaTileEntity_SpecialFilter(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTESpecialFilter(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_SpecialFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTESpecialFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
@@ -75,21 +73,21 @@ public abstract class GT_MetaTileEntity_SpecialFilter extends GT_MetaTileEntity_
         super.addUIWidgets(builder, buildContext);
         addAllowNbtButton(builder);
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_WHITE.apply(27, false))
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_WHITE.apply(27, false))
                 .setPos(6, 19)
                 .setSize(27, 24))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_BLUE.apply(42, true))
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_BLUE.apply(42, true))
                     .setPos(53, 19)
                     .setSize(42, 24))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_RED.apply(19, true))
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_RED.apply(19, true))
                     .setPos(152, 19)
                     .setSize(19, 24))
             .widget(
                 createFilterIconSlot(BaseSlot.phantom(inventoryHandler, 9)).disableShiftInsert()
                     .setPos(34, 22)
-                    .setBackground(GT_UITextures.BUTTON_STANDARD))
+                    .setBackground(GTUITextures.BUTTON_STANDARD))
             .widget(
                 SlotGroup.ofItemHandler(inventoryHandler, 3)
                     .endAtSlot(8)
@@ -102,7 +100,7 @@ public abstract class GT_MetaTileEntity_SpecialFilter extends GT_MetaTileEntity_
             createToggleButton(
                 () -> allowNbt,
                 val -> allowNbt = val,
-                GT_UITextures.OVERLAY_BUTTON_NBT,
+                GTUITextures.OVERLAY_BUTTON_NBT,
                 () -> mTooltipCache.getData(ALLOW_NBT_TOOLTIP)));
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java b/src/main/java/gregtech/api/metatileentity/implementations/MTETieredMachineBlock.java
index a08e49fd6c..8bffeaf17e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTETieredMachineBlock.java
@@ -1,19 +1,19 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.GT;
+import static gregtech.api.enums.GTValues.GT;
 import static gregtech.api.metatileentity.BaseTileEntity.BATTERY_SLOT_TOOLTIP;
 import static gregtech.api.metatileentity.BaseTileEntity.BATTERY_SLOT_TOOLTIP_ALT;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
 
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.enums.GTValues;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntity {
+public abstract class MTETieredMachineBlock extends MetaTileEntity {
 
     /**
      * Value between [0 - 9] to describe the Tier of this Machine. PLZ [0-15] works - READ! GT_Values class.
@@ -30,8 +30,8 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
      */
     public final ITexture[][][] mTextures;
 
-    public GT_MetaTileEntity_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier,
-        int aInvSlotCount, String aDescription, ITexture... aTextures) {
+    public MTETieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+        String aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aInvSlotCount);
         mTier = (byte) Math.max(0, Math.min(aTier, 14));
         mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription };
@@ -40,8 +40,8 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
         else mTextures = null;
     }
 
-    public GT_MetaTileEntity_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier,
-        int aInvSlotCount, String[] aDescription, ITexture... aTextures) {
+    public MTETieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+        String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aInvSlotCount);
         mTier = (byte) Math.max(0, Math.min(aTier, 15));
         mDescriptionArray = aDescription == null ? new String[0] : aDescription;
@@ -51,7 +51,7 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
         else mTextures = null;
     }
 
-    public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String aDescription,
+    public MTETieredMachineBlock(String aName, int aTier, int aInvSlotCount, String aDescription,
         ITexture[][][] aTextures) {
         super(aName, aInvSlotCount);
         mTier = (byte) aTier;
@@ -59,7 +59,7 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
         mTextures = aTextures;
     }
 
-    public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTETieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aInvSlotCount);
         mTier = (byte) aTier;
@@ -98,13 +98,13 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
     protected SlotWidget createChargerSlot(int x, int y) {
         final String batterySlotTooltipKey;
         final Object[] batterySlotTooltipArgs;
-        final String pTier1 = GT_Utility.getColoredTierNameFromTier(mTier);
-        if (mTier == GT_Values.VN.length - 1) {
+        final String pTier1 = GTUtility.getColoredTierNameFromTier(mTier);
+        if (mTier == GTValues.VN.length - 1) {
             batterySlotTooltipKey = BATTERY_SLOT_TOOLTIP_ALT;
             batterySlotTooltipArgs = new String[] { pTier1 };
         } else {
             batterySlotTooltipKey = BATTERY_SLOT_TOOLTIP;
-            batterySlotTooltipArgs = new String[] { pTier1, GT_Utility.getColoredTierNameFromTier((byte) (mTier + 1)) };
+            batterySlotTooltipArgs = new String[] { pTier1, GTUtility.getColoredTierNameFromTier((byte) (mTier + 1)) };
         }
         return createChargerSlot(x, y, batterySlotTooltipKey, batterySlotTooltipArgs);
     }
@@ -113,7 +113,7 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
         return (SlotWidget) new SlotWidget(inventoryHandler, rechargerSlotStartIndex()).disableShiftInsert()
             .setGTTooltip(() -> mTooltipCache.getData(tooltipKey, tooltipArgs))
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
-            .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CHARGER)
+            .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_CHARGER)
             .setPos(x, y);
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TooltipMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTETooltipMultiBlockBase.java
index c12c7c1442..71fce08c7e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TooltipMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTETooltipMultiBlockBase.java
@@ -4,30 +4,29 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 
 import org.lwjgl.input.Keyboard;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ISecondaryDescribable;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
 /**
- * A multiblock with tooltip {@link GT_Multiblock_Tooltip_Builder}
+ * A multiblock with tooltip {@link MultiblockTooltipBuilder}
  */
-public abstract class GT_MetaTileEntity_TooltipMultiBlockBase extends GT_MetaTileEntity_MultiBlockBase
-    implements ISecondaryDescribable {
+public abstract class MTETooltipMultiBlockBase extends MTEMultiBlockBase implements ISecondaryDescribable {
 
-    private static final AtomicReferenceArray<GT_Multiblock_Tooltip_Builder> tooltips = new AtomicReferenceArray<>(
-        GregTech_API.METATILEENTITIES.length);
+    private static final AtomicReferenceArray<MultiblockTooltipBuilder> tooltips = new AtomicReferenceArray<>(
+        GregTechAPI.METATILEENTITIES.length);
 
-    public GT_MetaTileEntity_TooltipMultiBlockBase(int aID, String aName, String aNameRegional) {
+    public MTETooltipMultiBlockBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_TooltipMultiBlockBase(String aName) {
+    public MTETooltipMultiBlockBase(String aName) {
         super(aName);
     }
 
-    protected GT_Multiblock_Tooltip_Builder getTooltip() {
+    protected MultiblockTooltipBuilder getTooltip() {
         int tId = getBaseMetaTileEntity().getMetaTileID();
-        GT_Multiblock_Tooltip_Builder tooltip = tooltips.get(tId);
+        MultiblockTooltipBuilder tooltip = tooltips.get(tId);
         if (tooltip == null) {
             tooltip = createTooltip();
             tooltips.set(tId, tooltip);
@@ -35,7 +34,7 @@ public abstract class GT_MetaTileEntity_TooltipMultiBlockBase extends GT_MetaTil
         return tooltip;
     }
 
-    protected abstract GT_Multiblock_Tooltip_Builder createTooltip();
+    protected abstract MultiblockTooltipBuilder createTooltip();
 
     @Override
     public String[] getDescription() {
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java b/src/main/java/gregtech/api/metatileentity/implementations/MTETransformer.java
index de7019b292..d2b88d26bc 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTETransformer.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Mods.EnderIO;
 import static mcp.mobius.waila.api.SpecialChars.BLUE;
 import static mcp.mobius.waila.api.SpecialChars.GOLD;
@@ -23,13 +23,13 @@ import cofh.api.energy.IEnergyStorage;
 import crazypants.enderio.machine.capbank.TileCapBank;
 import crazypants.enderio.machine.capbank.network.ICapBankNetwork;
 import crazypants.enderio.power.IPowerContainer;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
@@ -39,17 +39,17 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
  * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
  * Machine
  */
-public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachineBlock {
+public class MTETransformer extends MTETieredMachineBlock {
 
-    public GT_MetaTileEntity_Transformer(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
+    public MTETransformer(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, 0, aDescription);
     }
 
-    public GT_MetaTileEntity_Transformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTETransformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Transformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTETransformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
@@ -94,7 +94,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Transformer(mName, mTier, mDescriptionArray, mTextures);
+        return new MTETransformer(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -175,7 +175,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
 
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        if (aBaseMetaTileEntity.isServerSide() && GregTech_API.mInputRF) {
+        if (aBaseMetaTileEntity.isServerSide() && GregTechAPI.mInputRF) {
             aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork());
             for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
                 if (aBaseMetaTileEntity.getStoredEU() >= aBaseMetaTileEntity.getEUCapacity()) break;
@@ -185,20 +185,20 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
                     && energyProvider.extractEnergy(side.getOpposite(), 1, true) == 1) {
                     long tEU = ((IEnergyProvider) tTileEntity).extractEnergy(
                         side.getOpposite(),
-                        GT_Utility.safeInt(maxEUInput() * 100L / GregTech_API.mRFtoEU),
+                        GTUtility.safeInt(maxEUInput() * 100L / GregTechAPI.mRFtoEU),
                         false);
-                    tEU = tEU * GregTech_API.mRFtoEU / 100;
+                    tEU = tEU * GregTechAPI.mRFtoEU / 100;
                     aBaseMetaTileEntity.injectEnergyUnits(ForgeDirection.UNKNOWN, Math.min(tEU, maxEUInput()), 1);
                 } else if (tTileEntity instanceof IEnergyStorage energyStorage
                     && energyStorage.extractEnergy(1, true) == 1) {
                         long tEU = ((IEnergyStorage) tTileEntity)
-                            .extractEnergy(GT_Utility.safeInt(maxEUInput() * 100L / GregTech_API.mRFtoEU), false);
-                        tEU = tEU * GregTech_API.mRFtoEU / 100;
+                            .extractEnergy(GTUtility.safeInt(maxEUInput() * 100L / GregTechAPI.mRFtoEU), false);
+                        tEU = tEU * GregTechAPI.mRFtoEU / 100;
                         aBaseMetaTileEntity.injectEnergyUnits(ForgeDirection.UNKNOWN, Math.min(tEU, maxEUInput()), 1);
                     } else if (EnderIO.isModLoaded() && tTileEntity instanceof IPowerContainer powerContainer
                         && powerContainer.getEnergyStored() > 0) {
                             final int storedRF = powerContainer.getEnergyStored();
-                            final int extractRF = GT_Utility.safeInt(maxEUInput() * 100L / GregTech_API.mRFtoEU);
+                            final int extractRF = GTUtility.safeInt(maxEUInput() * 100L / GregTechAPI.mRFtoEU);
                             long tEU = 0;
                             if (tTileEntity instanceof TileCapBank capBank) {
                                 ICapBankNetwork network = capBank.getNetwork();
@@ -206,9 +206,9 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
                                     tEU = Math.min(
                                         (Math.min(
                                             Math.min(network.getEnergyStoredL(), storedRF - extractRF),
-                                            network.getMaxOutput())) * (long) GregTech_API.mRFtoEU / 100L,
+                                            network.getMaxOutput())) * (long) GregTechAPI.mRFtoEU / 100L,
                                         maxEUInput());
-                                    network.addEnergy(GT_Utility.safeInt(-(tEU * 100 / GregTech_API.mRFtoEU)));
+                                    network.addEnergy(GTUtility.safeInt(-(tEU * 100 / GregTechAPI.mRFtoEU)));
                                 }
                             } else {
                                 if (storedRF > extractRF) {
@@ -216,7 +216,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
                                     tEU = maxEUInput();
                                 } else {
                                     powerContainer.setEnergyStored(0);
-                                    tEU = storedRF * (long) GregTech_API.mRFtoEU / 100L;
+                                    tEU = storedRF * (long) GregTechAPI.mRFtoEU / 100L;
                                 }
                             }
                             aBaseMetaTileEntity
@@ -255,15 +255,15 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
 
     @Override
     public String getAlternativeModeText() {
-        return (getBaseMetaTileEntity().isAllowedToWork() ? GT_Utility.trans("145", "Step Down, In: ")
-            : GT_Utility.trans("146", "Step Up, In: ")) + maxEUInput()
-            + GT_Utility.trans("148", "V ")
+        return (getBaseMetaTileEntity().isAllowedToWork() ? GTUtility.trans("145", "Step Down, In: ")
+            : GTUtility.trans("146", "Step Up, In: ")) + maxEUInput()
+            + GTUtility.trans("148", "V ")
             + maxAmperesIn()
-            + GT_Utility.trans("147", "A, Out: ")
+            + GTUtility.trans("147", "A, Out: ")
             + maxEUOutput()
-            + GT_Utility.trans("148", "V ")
+            + GTUtility.trans("148", "V ")
             + maxAmperesOut()
-            + GT_Utility.trans("149", "A");
+            + GTUtility.trans("149", "A");
     }
 
     @Override
@@ -279,17 +279,17 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
         final ForgeDirection side = accessor.getSide();
         final boolean allowedToWork = tag.getBoolean("isAllowedToWork");
 
-        final byte inputTier = GT_Utility.getTier(tag.getLong("maxEUInput"));
-        final byte outputTier = GT_Utility.getTier(tag.getLong("maxEUOutput"));
+        final byte inputTier = GTUtility.getTier(tag.getLong("maxEUInput"));
+        final byte outputTier = GTUtility.getTier(tag.getLong("maxEUOutput"));
 
         currenttip.add(
             String.format(
                 "%s %s(%dA) -> %s(%dA)",
                 (allowedToWork ? (GREEN + "Step Down") : (RED + "Step Up")) + RESET,
-                GT_Mod.gregtechproxy.mWailaTransformerVoltageTier ? GT_Utility.getColoredTierNameFromTier(inputTier)
+                GTMod.gregtechproxy.mWailaTransformerVoltageTier ? GTUtility.getColoredTierNameFromTier(inputTier)
                     : tag.getLong("maxEUInput"),
                 tag.getLong("maxAmperesIn"),
-                GT_Mod.gregtechproxy.mWailaTransformerVoltageTier ? GT_Utility.getColoredTierNameFromTier(outputTier)
+                GTMod.gregtechproxy.mWailaTransformerVoltageTier ? GTUtility.getColoredTierNameFromTier(outputTier)
                     : tag.getLong("maxEUOutput"),
                 tag.getLong("maxAmperesOut")));
 
@@ -297,15 +297,14 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
             currenttip.add(
                 String.format(
                     GOLD + "Input:" + RESET + " %s(%dA)",
-                    GT_Mod.gregtechproxy.mWailaTransformerVoltageTier ? GT_Utility.getColoredTierNameFromTier(inputTier)
+                    GTMod.gregtechproxy.mWailaTransformerVoltageTier ? GTUtility.getColoredTierNameFromTier(inputTier)
                         : tag.getLong("maxEUInput"),
                     tag.getLong("maxAmperesIn")));
         } else {
             currenttip.add(
                 String.format(
                     BLUE + "Output:" + RESET + " %s(%dA)",
-                    GT_Mod.gregtechproxy.mWailaTransformerVoltageTier
-                        ? GT_Utility.getColoredTierNameFromTier(outputTier)
+                    GTMod.gregtechproxy.mWailaTransformerVoltageTier ? GTUtility.getColoredTierNameFromTier(outputTier)
                         : tag.getLong("maxEUOutput"),
                     tag.getLong("maxAmperesOut")));
         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEWetTransformer.java
index f865a5ea8a..e2c2437311 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEWetTransformer.java
@@ -1,6 +1,6 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.util.EnumChatFormatting;
 
@@ -11,20 +11,19 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transformer {
+public class MTEWetTransformer extends MTETransformer {
 
-    public GT_MetaTileEntity_WetTransformer(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription) {
+    public MTEWetTransformer(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_WetTransformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEWetTransformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_WetTransformer(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEWetTransformer(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessDynamo.java
index a04f5cd986..fc7bc3fae2 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessDynamo.java
@@ -1,7 +1,7 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.AuthorColen;
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.AuthorColen;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.common.misc.WirelessNetworkManager.addEUToGlobalEnergyMap;
 import static gregtech.common.misc.WirelessNetworkManager.strongCheckOrAddUser;
 
@@ -18,17 +18,15 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IWirelessEnergyHatchInformation;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_Dynamo
-    implements IWirelessEnergyHatchInformation {
+public class MTEWirelessDynamo extends MTEHatchDynamo implements IWirelessEnergyHatchInformation {
 
     private UUID owner_uuid;
 
-    public GT_MetaTileEntity_Wireless_Dynamo(String aName, byte aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEWirelessDynamo(String aName, byte aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Wireless_Dynamo(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEWirelessDynamo(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, new String[] { "" });
     }
 
@@ -106,7 +104,7 @@ public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_D
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Wireless_Dynamo(mName, mTier, new String[] { "" }, mTextures);
+        return new MTEWirelessDynamo(mName, mTier, new String[] { "" }, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessEnergy.java
index bf624eadd7..e195b4ab08 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEWirelessEnergy.java
@@ -1,7 +1,7 @@
 package gregtech.api.metatileentity.implementations;
 
-import static gregtech.api.enums.GT_Values.AuthorColen;
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.AuthorColen;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.common.misc.WirelessNetworkManager.addEUToGlobalEnergyMap;
 import static java.lang.Long.min;
 
@@ -20,8 +20,7 @@ import gregtech.api.interfaces.tileentity.IWirelessEnergyHatchInformation;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.common.misc.spaceprojects.SpaceProjectManager;
 
-public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_Energy
-    implements IWirelessEnergyHatchInformation {
+public class MTEWirelessEnergy extends MTEHatchEnergy implements IWirelessEnergyHatchInformation {
 
     private final BigInteger eu_transferred_per_operation = BigInteger
         .valueOf(2 * V[mTier] * ticks_between_energy_addition);
@@ -29,11 +28,11 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En
 
     private UUID owner_uuid;
 
-    public GT_MetaTileEntity_Wireless_Hatch(String aName, byte aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEWirelessEnergy(String aName, byte aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Wireless_Hatch(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEWirelessEnergy(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, new String[] { "" });
     }
 
@@ -111,7 +110,7 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Wireless_Hatch(mName, mTier, new String[] { "" }, mTextures);
+        return new MTEWirelessEnergy(mName, mTier, new String[] { "" }, mTextures);
     }
 
     @Override