51 files changed, 1045 insertions, 1123 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 708650dfe2..e51d60834f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -1,21 +1,21 @@
 package gtPlusPlus.xmod.gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.GTValues.W;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.xmod.gregtech.api.interfaces.IGregtechItemContainer;
 
 /**
  * Class containing all non-OreDict Items of GregTech.
  */
-public enum GregtechItemList implements GregtechItemContainer {
+public enum GregtechItemList implements IGregtechItemContainer {
 
     /**
      * Items
@@ -777,16 +777,16 @@ public enum GregtechItemList implements GregtechItemContainer {
     GT_Dehydrator_ZPM,
 
     // Fluid Storage Tanks
-    GT_FluidTank_ULV,
-    GT_FluidTank_LV,
-    GT_FluidTank_MV,
-    GT_FluidTank_HV,
-    GT_FluidTank_EV,
-    GT_FluidTank_IV,
-    GT_FluidTank_LuV,
-    GT_FluidTank_ZPM,
-    GT_FluidTank_UV,
-    GT_FluidTank_MAX,
+    GTFluidTank_ULV,
+    GTFluidTank_LV,
+    GTFluidTank_MV,
+    GTFluidTank_HV,
+    GTFluidTank_EV,
+    GTFluidTank_IV,
+    GTFluidTank_LuV,
+    GTFluidTank_ZPM,
+    GTFluidTank_UV,
+    GTFluidTank_MAX,
 
     // GT RTG
     RTG,
@@ -845,14 +845,14 @@ public enum GregtechItemList implements GregtechItemContainer {
             return this;
         }
         final ItemStack aStack = new ItemStack(aItem, 1, 0);
-        this.mStack = GT_Utility.copyAmount(1, aStack);
+        this.mStack = GTUtility.copyAmount(1, aStack);
         return this;
     }
 
     @Override
     public GregtechItemList set(final ItemStack aStack) {
         this.mHasNotBeenSet = false;
-        this.mStack = GT_Utility.copyAmount(1, aStack);
+        this.mStack = GTUtility.copyAmount(1, aStack);
         return this;
     }
 
@@ -861,7 +861,7 @@ public enum GregtechItemList implements GregtechItemContainer {
         if (this.mHasNotBeenSet) {
             throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
         }
-        if (GT_Utility.isStackInvalid(this.mStack)) {
+        if (GTUtility.isStackInvalid(this.mStack)) {
             return null;
         }
         return this.mStack.getItem();
@@ -887,15 +887,15 @@ public enum GregtechItemList implements GregtechItemContainer {
 
     @Override
     public boolean isStackEqual(final Object aStack, final boolean aWildcard, final boolean aIgnoreNBT) {
-        if (GT_Utility.isStackInvalid(aStack)) {
+        if (GTUtility.isStackInvalid(aStack)) {
             return false;
         }
-        return GT_Utility
+        return GTUtility
             .areUnificationsEqual((ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT);
     }
 
     public static Block getBlockFromStack(Object aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return Blocks.air;
+        if (GTUtility.isStackInvalid(aStack)) return Blocks.air;
         return Block.getBlockFromItem(((ItemStack) aStack).getItem());
     }
 
@@ -904,10 +904,10 @@ public enum GregtechItemList implements GregtechItemContainer {
         if (this.mHasNotBeenSet) {
             throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
         }
-        if (GT_Utility.isStackInvalid(this.mStack)) {
-            return GT_Utility.copyAmount(aAmount, aReplacements);
+        if (GTUtility.isStackInvalid(this.mStack)) {
+            return GTUtility.copyAmount(aAmount, aReplacements);
         }
-        return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(this.mStack));
+        return GTUtility.copyAmount(aAmount, GTOreDictUnificator.get(this.mStack));
     }
 
     @Override
@@ -915,10 +915,10 @@ public enum GregtechItemList implements GregtechItemContainer {
         if (this.mHasNotBeenSet) {
             throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
         }
-        if (GT_Utility.isStackInvalid(this.mStack)) {
-            return GT_Utility.copyAmount(aAmount, aReplacements);
+        if (GTUtility.isStackInvalid(this.mStack)) {
+            return GTUtility.copyAmount(aAmount, aReplacements);
         }
-        return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(this.mStack));
+        return GTUtility.copyAmountAndMetaData(aAmount, W, GTOreDictUnificator.get(this.mStack));
     }
 
     @Override
@@ -926,10 +926,10 @@ public enum GregtechItemList implements GregtechItemContainer {
         if (this.mHasNotBeenSet) {
             throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
         }
-        if (GT_Utility.isStackInvalid(this.mStack)) {
-            return GT_Utility.copyAmount(aAmount, aReplacements);
+        if (GTUtility.isStackInvalid(this.mStack)) {
+            return GTUtility.copyAmount(aAmount, aReplacements);
         }
-        return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(this.mStack));
+        return GTUtility.copyAmountAndMetaData(aAmount, 0, GTOreDictUnificator.get(this.mStack));
     }
 
     @Override
@@ -937,31 +937,31 @@ public enum GregtechItemList implements GregtechItemContainer {
         if (this.mHasNotBeenSet) {
             throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
         }
-        if (GT_Utility.isStackInvalid(this.mStack)) {
-            return GT_Utility.copyAmount(aAmount, aReplacements);
+        if (GTUtility.isStackInvalid(this.mStack)) {
+            return GTUtility.copyAmount(aAmount, aReplacements);
         }
-        return GT_Utility
-            .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack));
+        return GTUtility
+            .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GTOreDictUnificator.get(this.mStack));
     }
 
     @Override
     public ItemStack getWithName(final long aAmount, final String aDisplayName, final Object... aReplacements) {
         final ItemStack rStack = this.get(1, aReplacements);
-        if (GT_Utility.isStackInvalid(rStack)) {
+        if (GTUtility.isStackInvalid(rStack)) {
             return null;
         }
         rStack.setStackDisplayName(aDisplayName);
-        return GT_Utility.copyAmount(aAmount, rStack);
+        return GTUtility.copyAmount(aAmount, rStack);
     }
 
     @Override
     public ItemStack getWithCharge(final long aAmount, final int aEnergy, final Object... aReplacements) {
         final ItemStack rStack = this.get(1, aReplacements);
-        if (GT_Utility.isStackInvalid(rStack)) {
+        if (GTUtility.isStackInvalid(rStack)) {
             return null;
         }
-        GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
-        return GT_Utility.copyAmount(aAmount, rStack);
+        GTModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
+        return GTUtility.copyAmount(aAmount, rStack);
     }
 
     @Override
@@ -969,10 +969,10 @@ public enum GregtechItemList implements GregtechItemContainer {
         if (this.mHasNotBeenSet) {
             throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
         }
-        if (GT_Utility.isStackInvalid(this.mStack)) {
-            return GT_Utility.copyAmount(aAmount, aReplacements);
+        if (GTUtility.isStackInvalid(this.mStack)) {
+            return GTUtility.copyAmount(aAmount, aReplacements);
         }
-        return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(this.mStack));
+        return GTUtility.copyAmountAndMetaData(aAmount, aMetaValue, GTOreDictUnificator.get(this.mStack));
     }
 
     @Override
@@ -981,7 +981,7 @@ public enum GregtechItemList implements GregtechItemContainer {
             throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
         }
         for (final Object tOreName : aOreNames) {
-            GT_OreDictUnificator.registerOre(tOreName, this.get(1));
+            GTOreDictUnificator.registerOre(tOreName, this.get(1));
         }
         return this;
     }
@@ -992,7 +992,7 @@ public enum GregtechItemList implements GregtechItemContainer {
             throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
         }
         for (final Object tOreName : aOreNames) {
-            GT_OreDictUnificator.registerOre(tOreName, this.getWildcard(1));
+            GTOreDictUnificator.registerOre(tOreName, this.getWildcard(1));
         }
         return this;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 655b242c04..fedd28f342 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.xmod.gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.B;
-import static gregtech.api.enums.GT_Values.D2;
-import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.GTValues.B;
+import static gregtech.api.enums.GTValues.D2;
+import static gregtech.api.enums.GTValues.M;
 import static gtPlusPlus.core.util.Utils.getTcAspectStack;
 
 import java.util.ArrayList;
@@ -21,18 +21,18 @@ import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Element;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.SubTag;
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.enums.TCAspects;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
 import gregtech.api.enums.TextureSet;
 import gregtech.api.interfaces.IColorModulationContainer;
 import gregtech.api.interfaces.ICondition;
 import gregtech.api.interfaces.ISubTagContainer;
 import gregtech.api.objects.MaterialStack;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import gregtech.api.util.GTConfig;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IOreRecipeRegistrator;
 import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData;
 import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack;
 
@@ -123,15 +123,15 @@ public enum GregtechOrePrefixes {
     public final List<TC_AspectStack> mAspects = new ArrayList<>();
     public final Collection<GregtechOrePrefixes> mFamiliarPrefixes = new HashSet<>();
     /**
-     * Used to determine the amount of Material this Prefix contains. Multiply or Divide GregTech_API.MATERIAL_UNIT to
+     * Used to determine the amount of Material this Prefix contains. Multiply or Divide GregTechAPI.MATERIAL_UNIT to
      * get the Amounts in comparision to one Ingot. 0 = Null Negative = Undefined Amount
      */
     public final long mMaterialAmount;
 
     private final Collection<Materials> mNotGeneratedItems = new HashSet<>(), mIgnoredMaterials = new HashSet<>(),
         mGeneratedItems = new HashSet<>();
-    private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessing = new ArrayList<>();
-    private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessingFake = new ArrayList<>();
+    private final ArrayList<IOreRecipeRegistrator> mOreProcessing = new ArrayList<>();
+    private final ArrayList<IOreRecipeRegistrator> mOreProcessingFake = new ArrayList<>();
     public final ItemStack mContainerItem = null;
     public final ICondition<ISubTagContainer> mCondition = null;
     public byte mDefaultStackSize = 64;
@@ -170,64 +170,64 @@ public enum GregtechOrePrefixes {
         // TODO - Utilise some form of way to check if it's gt 5.9 if so, use string switch.
         if (this.name()
             .startsWith("ore")) {
-            getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.TERRA.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
             .startsWith("wire")
             || this.name()
                 .startsWith("cable")) {
-            getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
             .startsWith("dust")) {
-            getTcAspectStack(TC_Aspects.PERDITIO.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.PERDITIO.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
             .startsWith("crushed")) {
-            getTcAspectStack(TC_Aspects.PERFODIO.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.PERFODIO.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
             .startsWith("ingot")
             || this.name()
                 .startsWith("nugget")) {
-            getTcAspectStack(TC_Aspects.METALLUM.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.METALLUM.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
             .startsWith("armor")) {
-            getTcAspectStack(TC_Aspects.TUTAMEN.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.TUTAMEN.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
             .startsWith("stone")) {
-            getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.TERRA.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
             .startsWith("pipe")) {
-            getTcAspectStack(TC_Aspects.ITER.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.ITER.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
             .startsWith("gear")) {
-            getTcAspectStack(TC_Aspects.MOTUS.name(), 1).addToAspectList(this.mAspects);
-            getTcAspectStack(TC_Aspects.MACHINA.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.MOTUS.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.MACHINA.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
             .startsWith("frame")
             || this.name()
                 .startsWith("plate")) {
-            getTcAspectStack(TC_Aspects.FABRICO.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.FABRICO.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
             .startsWith("tool")) {
-            getTcAspectStack(TC_Aspects.INSTRUMENTUM.name(), 2).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.INSTRUMENTUM.name(), 2).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
@@ -236,7 +236,7 @@ public enum GregtechOrePrefixes {
                 .startsWith("crystal")
             || this.name()
                 .startsWith("lens")) {
-            getTcAspectStack(TC_Aspects.VITREUS.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.VITREUS.name(), 1).addToAspectList(this.mAspects);
             return;
         }
         if (this.name()
@@ -246,7 +246,7 @@ public enum GregtechOrePrefixes {
         }
         if (this.name()
             .startsWith("battery")) {
-            getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects);
+            getTcAspectStack(TCAspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects);
         }
     }
 
@@ -282,7 +282,7 @@ public enum GregtechOrePrefixes {
     }
 
     public static GregtechOrePrefixes getPrefix(final String aPrefixName, final GregtechOrePrefixes aReplacement) {
-        final Object tObject = GT_Utility.getFieldContent(GregtechOrePrefixes.class, aPrefixName, false, false);
+        final Object tObject = GTUtility.getFieldContent(GregtechOrePrefixes.class, aPrefixName, false, false);
         if ((tObject != null) && (tObject instanceof GregtechOrePrefixes)) {
             return (GregtechOrePrefixes) tObject;
         }
@@ -323,7 +323,7 @@ public enum GregtechOrePrefixes {
             return false;
         }
         for (final ItemStack tStack : this.mPrefixedItems) {
-            if (GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) {
+            if (GTUtility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) {
                 return true;
             }
         }
@@ -353,7 +353,7 @@ public enum GregtechOrePrefixes {
         return this.mFamiliarPrefixes.add(aPrefix);
     }
 
-    public boolean add(final Interface_OreRecipeRegistrator aRegistrator) {
+    public boolean add(final IOreRecipeRegistrator aRegistrator) {
         if (aRegistrator == null) {
             return false;
         }
@@ -364,19 +364,19 @@ public enum GregtechOrePrefixes {
         final ItemStack aStack) {
         if ((aMaterial != null)
             && ((aMaterial != GT_Materials._NULL) || this.mIsSelfReferencing || !this.mIsMaterialBased)
-            && GT_Utility.isStackValid(aStack)) {
-            for (final Interface_OreRecipeRegistrator tRegistrator : this.mOreProcessing) {
+            && GTUtility.isStackValid(aStack)) {
+            for (final IOreRecipeRegistrator tRegistrator : this.mOreProcessing) {
                 if (D2) {
-                    GT_Log.ore.println(
+                    GTLog.ore.println(
                         "Processing '" + aOreDictName
                             + "' with the Prefix '"
                             + this.name()
                             + "' and the Material '"
                             + aMaterial.name()
                             + "' at "
-                            + GT_Utility.getClassName(tRegistrator));
+                            + GTUtility.getClassName(tRegistrator));
                 }
-                tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack));
+                tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GTUtility.copyAmount(1, aStack));
             }
         }
     }
@@ -385,19 +385,19 @@ public enum GregtechOrePrefixes {
     public void processOre(final Materials aMaterial, final String aOreDictName, final String aModName,
         final ItemStack aStack) {
         if ((aMaterial != null) && ((aMaterial != Materials._NULL) || this.mIsSelfReferencing || !this.mIsMaterialBased)
-            && GT_Utility.isStackValid(aStack)) {
-            for (final Interface_OreRecipeRegistrator tRegistrator : this.mOreProcessingFake) {
+            && GTUtility.isStackValid(aStack)) {
+            for (final IOreRecipeRegistrator tRegistrator : this.mOreProcessingFake) {
                 if (D2) {
-                    GT_Log.ore.println(
+                    GTLog.ore.println(
                         "Processing '" + aOreDictName
                             + "' with the Prefix '"
                             + this.name()
                             + "' and the Material '"
                             + aMaterial.mName
                             + "' at "
-                            + GT_Utility.getClassName(tRegistrator));
+                            + GTUtility.getClassName(tRegistrator));
                 }
-                tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack));
+                tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GTUtility.copyAmount(1, aStack));
             }
         }
     }
@@ -432,7 +432,7 @@ public enum GregtechOrePrefixes {
          *
          */
         _NULL(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "NULL", 0, 0, 0, 0, false, false, 1, 1, 1,
-            Dyes._NULL, Element._NULL, Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS.name(), 1))),
+            Dyes._NULL, Element._NULL, Arrays.asList(getTcAspectStack(TCAspects.VACUOS.name(), 1))),
 
         // Lapis(526, TextureSet.SET_LAPIS, 1.0F, 0, 1, 1 | 4 | 8, 70, 70, 220, 0, "Lapis", 0, 0, -1, 0, false, false,
         // 3, 1, 1, Dyes.dyeBlue, 2, Arrays.asList(new MaterialStack(Materials.Lazurite, 12), new
@@ -445,7 +445,7 @@ public enum GregtechOrePrefixes {
                 new MaterialStack(Materials.Redstone, 1),
                 new MaterialStack(Materials.Blaze, 1),
                 new MaterialStack(Materials.Sulfur, 1)),
-            Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TC_Aspects.IGNIS, 1))),
+            Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TCAspects.IGNIS, 1))),
         Cryotheum(21, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 102, 178, 255, 0, "Cryotheum", 0, 0, -1, 0, false,
             false, 2, 3, 1, Dyes.dyeLightBlue, 2,
             Arrays.asList(
@@ -453,7 +453,7 @@ public enum GregtechOrePrefixes {
                 new MaterialStack(Materials.Redstone, 1),
                 new MaterialStack(Materials.Snow, 1),
                 new MaterialStack(Materials.Niter, 1)),
-            Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TC_Aspects.GELUM, 1))),
+            Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TCAspects.GELUM, 1))),
         Ender(22, TextureSet.SET_FLUID, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Ender", 0, 0, -1, 0, false, false, 3, 1, 1,
             Dyes.dyeGreen),
 
@@ -462,57 +462,57 @@ public enum GregtechOrePrefixes {
          */
         Symbiotic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "IV Tier", 0, 0, -1, 0, false, false, 1, 1,
             1, Dyes.dyeLightGray,
-            Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 4), getTcAspectStack(TC_Aspects.MACHINA, 4))),
+            Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 4), getTcAspectStack(TCAspects.MACHINA, 4))),
         Neutronic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "LuV Tier", 0, 0, -1, 0, false, false, 1, 1,
             1, Dyes.dyeLightGray,
-            Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 6), getTcAspectStack(TC_Aspects.MACHINA, 6))),
+            Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 6), getTcAspectStack(TCAspects.MACHINA, 6))),
         Quantum(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "ZPM Tier", 0, 0, -1, 0, false, false, 1, 1,
             1, Dyes.dyeLightGray,
-            Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8), getTcAspectStack(TC_Aspects.MACHINA, 8))),
+            Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 8), getTcAspectStack(TCAspects.MACHINA, 8))),
 
         Superconductor(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 190, 240, 190, 0, "Superconductor", 0, 0, -1, 0, false,
-            false, 1, 1, 1, Dyes.dyeGreen, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8))),
+            false, 1, 1, 1, Dyes.dyeGreen, Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 8))),
 
         Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 66, 0, "Staballoy", 0,
             0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2,
             Arrays.asList(new MaterialStack(Materials.Titanium, 1), new MaterialStack(Materials.Uranium, 9)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))),
         Bedrockium(31, TextureSet.SET_FINE, 8.0F, 8196, 3, 1 | 2 | 16 | 32 | 64 | 128, 39, 39, 39, 0, "Bedrockium", 0,
             0, -1, 0, false, false, 1, 5, 1, Dyes.dyeLightGray, 2,
             Arrays.asList(new MaterialStack(Materials.Carbon, 63), new MaterialStack(Materials.Carbon, 56)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS, 8), getTcAspectStack(TC_Aspects.TUTAMEN, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.VACUOS, 8), getTcAspectStack(TCAspects.TUTAMEN, 3))),
         BloodSteel(32, TextureSet.SET_METALLIC, 11.0F, 768, 4, 1 | 2 | 16 | 32 | 64 | 128, 142, 28, 0, 0, "Blood Steel",
             0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Steel, 3)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.VICTUS, 8), getTcAspectStack(TC_Aspects.IGNIS, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.VICTUS, 8), getTcAspectStack(TCAspects.IGNIS, 3))),
         Void(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0,
             -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack,
-            Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TC_Aspects.VACUOS, 7))),
+            Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TCAspects.VACUOS, 7))),
         ConductiveIron(34, TextureSet.SET_METALLIC, 5.0F, 256, 2, 1 | 2, 164, 109, 100, 0, "Conductive Iron", 0, 0, -1,
             0, false, false, 3, 1, 1, Dyes.dyeRed, 2,
             Arrays.asList(new MaterialStack(Materials.Iron, 6), new MaterialStack(Materials.Redstone, 2)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 2), getTcAspectStack(TC_Aspects.METALLUM, 2))),
+            Arrays.asList(getTcAspectStack(TCAspects.POTENTIA, 2), getTcAspectStack(TCAspects.METALLUM, 2))),
         ElectricalSteel(35, TextureSet.SET_METALLIC, 7.0F, 768, 3, 1 | 2 | 64 | 128, 194, 194, 194, 0,
             "Electrical Steel", 0, 0, 1811, 1000, true, false, 3, 1, 1, Dyes.dyeLightGray, 2,
             Arrays.asList(
                 new MaterialStack(Materials.Iron, 3),
                 new MaterialStack(Materials.Coal, 2),
                 new MaterialStack(Materials.Silicon, 2)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.MAGNETO, 2), getTcAspectStack(TC_Aspects.ELECTRUM, 5))),
+            Arrays.asList(getTcAspectStack(TCAspects.MAGNETO, 2), getTcAspectStack(TCAspects.ELECTRUM, 5))),
         EnergeticAlloy(36, TextureSet.SET_SHINY, 5.0F, 512, 3, 1 | 2 | 64 | 128, 252, 152, 45, 0, "Energetic Alloy", 0,
             0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange, 2,
             Arrays.asList(
                 new MaterialStack(Materials.Gold, 3),
                 new MaterialStack(Materials.Glowstone, 2),
                 new MaterialStack(Materials.Redstone, 2)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 4), getTcAspectStack(TC_Aspects.LUX, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.POTENTIA, 4), getTcAspectStack(TCAspects.LUX, 3))),
         VibrantAlloy(37, TextureSet.SET_SHINY, 7.0F, 1280, 4, 1 | 2 | 64 | 128, 204, 242, 142, 0, "Vibrant Alloy", 0, 0,
             -1, 0, false, false, 3, 1, 1, Dyes.dyeLime, 2,
             Arrays.asList(new MaterialStack(Materials.EnergeticAlloy, 1), new MaterialStack(Materials.EnderPearl, 3)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.MACHINA, 5), getTcAspectStack(TC_Aspects.TELUM, 4))),
+            Arrays.asList(getTcAspectStack(TCAspects.MACHINA, 5), getTcAspectStack(TCAspects.TELUM, 4))),
         PulsatingIron(38, TextureSet.SET_SHINY, 5.0F, 256, 2, 1 | 2 | 64 | 128, 50, 91, 21, 0, "Pulsating Iron", 0, 0,
             -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen, 2,
             Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.EnderPearl, 2)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.ALIENIS, 3), getTcAspectStack(TC_Aspects.METALLUM, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.ALIENIS, 3), getTcAspectStack(TCAspects.METALLUM, 3))),
         /* TODO */ RedstoneAlloy(39, TextureSet.SET_METALLIC, 1.0F, 256, 2, 1 | 2 | 16 | 32 | 64, 178, 34, 34, 0,
             "Redstone Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2,
             Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.Redstone, 4))),
@@ -521,14 +521,14 @@ public enum GregtechOrePrefixes {
         Tantalloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 166, 0, "Tantalloy-60",
             0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
             Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))),
         Tantalloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 122, 135, 196, 0,
             "Tantalloy-61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
             Arrays.asList(
                 new MaterialStack(Materials.Tungsten, 1),
                 new MaterialStack(Materials.Tantalum, 9),
                 new MaterialStack(Materials.Titanium, 1)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))),
 
         Potin(42, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 201, 151, 129, 0, "Potin", 0, 0,
             3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
@@ -536,42 +536,42 @@ public enum GregtechOrePrefixes {
                 new MaterialStack(Materials.Tungsten, 1),
                 new MaterialStack(Materials.Tantalum, 9),
                 new MaterialStack(Materials.Titanium, 1)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))),
         Inconel792(43, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 108, 240, 118, 0,
             "Inconel-792", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
             Arrays.asList(
                 new MaterialStack(Materials.Tungsten, 1),
                 new MaterialStack(Materials.Tantalum, 9),
                 new MaterialStack(Materials.Titanium, 1)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))),
         Inconel690(44, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 118, 220, 138, 0, "Inconel-690",
             0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
             Arrays.asList(
                 new MaterialStack(Materials.Tungsten, 1),
                 new MaterialStack(Materials.Tantalum, 9),
                 new MaterialStack(Materials.Titanium, 1)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))),
         MaragingSteel300(45, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 150, 150, 150, 0,
             "Maraging Steel 300", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
             Arrays.asList(
                 new MaterialStack(Materials.Tungsten, 1),
                 new MaterialStack(Materials.Tantalum, 9),
                 new MaterialStack(Materials.Titanium, 1)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))),
         MaragingSteel350(46, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 160, 160, 160, 0,
             "Maraging Steel 350", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
             Arrays.asList(
                 new MaterialStack(Materials.Tungsten, 1),
                 new MaterialStack(Materials.Tantalum, 9),
                 new MaterialStack(Materials.Titanium, 1)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))),
         HastelloyX(47, TextureSet.SET_SHINY, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 255, 193, 37, 0, "Hastelloy-X",
             0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
             Arrays.asList(
                 new MaterialStack(Materials.Tungsten, 1),
                 new MaterialStack(Materials.Tantalum, 9),
                 new MaterialStack(Materials.Titanium, 1)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))),
 
         TriniumNaquadahCarbonite(48, TextureSet.SET_SHINY, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 255, 233, 0, 0,
             "Trinium Naquadah Carbonite", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
@@ -579,7 +579,7 @@ public enum GregtechOrePrefixes {
                 new MaterialStack(Materials.Tungsten, 1),
                 new MaterialStack(Materials.Tantalum, 9),
                 new MaterialStack(Materials.Titanium, 1)),
-            Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
+            Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))),
 
         // Radioactive Materials
         HydrofluoricAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 200, 200, 200, 0, "Hydrofluoric Acid", 0, 0,
@@ -727,8 +727,8 @@ public enum GregtechOrePrefixes {
             this.mToolSpeed = aToolSpeed;
             this.mIconSet = aIconSet;
             if (aMetaItemSubID >= 0) {
-                if (CORE.sMU_GeneratedMaterials[aMetaItemSubID] == null) {
-                    CORE.sMU_GeneratedMaterials[aMetaItemSubID] = this;
+                if (GTPPCore.sMU_GeneratedMaterials[aMetaItemSubID] == null) {
+                    GTPPCore.sMU_GeneratedMaterials[aMetaItemSubID] = this;
                 } else {
                     throw new IllegalArgumentException("The Index " + aMetaItemSubID + " is already used!");
                 }
@@ -971,7 +971,7 @@ public enum GregtechOrePrefixes {
         }
 
         public static GT_Materials get(final String aMaterialName) {
-            final Object tObject = GT_Utility.getFieldContent(GT_Materials.class, aMaterialName, false, false);
+            final Object tObject = GTUtility.getFieldContent(GT_Materials.class, aMaterialName, false, false);
             if ((tObject != null) && (tObject instanceof GT_Materials)) {
                 return (GT_Materials) tObject;
             }
@@ -987,7 +987,7 @@ public enum GregtechOrePrefixes {
          *
          * @param aConfiguration
          */
-        public static void init(final GT_Config aConfiguration) {
+        public static void init(final GTConfig aConfiguration) {
             for (final GT_Materials tMaterial : VALUES) {
                 final String tString = tMaterial.toString()
                     .toLowerCase();
@@ -1110,7 +1110,7 @@ public enum GregtechOrePrefixes {
             }
             for (final ItemStack tStack : this.mMaterialItems) {
                 for (final ItemStack aStack : aStacks) {
-                    if (GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) {
+                    if (GTUtility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) {
                         return true;
                     }
                 }
@@ -1127,7 +1127,7 @@ public enum GregtechOrePrefixes {
             }
             boolean temp = false;
             for (int i = 0; i < this.mMaterialItems.size(); i++) {
-                if (GT_Utility.areStacksEqual(aStack, this.mMaterialItems.get(i))) {
+                if (GTUtility.areStacksEqual(aStack, this.mMaterialItems.get(i))) {
                     this.mMaterialItems.remove(i--);
                     temp = true;
                 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPPUITextures.java
index e6276713f3..08cff8d55e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPPUITextures.java
@@ -8,7 +8,7 @@ import java.util.stream.IntStream;
 import com.gtnewhorizons.modularui.api.drawable.AdaptableUITexture;
 import com.gtnewhorizons.modularui.api.drawable.UITexture;
 
-public class GTPP_UITextures {
+public class GTPPUITextures {
 
     public static final UITexture OVERLAY_SLOT_COAL = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/coal");
     public static final UITexture OVERLAY_SLOT_CANISTER_DARK = UITexture
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java
index e522d41799..1bc2050eee 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java
@@ -6,7 +6,7 @@ import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable;
 import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import ic2.api.info.Info;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
@@ -26,7 +26,7 @@ public class ElectricSlotWidget extends SlotWidget {
     private ElectricSlotWidget(BaseSlot slot) {
         super(slot);
         setFilter(
-            stack -> (accepts(stack)) || (stack.getItem() instanceof GT_MetaGenerated_Tool)
+            stack -> (accepts(stack)) || (stack.getItem() instanceof MetaGeneratedTool)
                 || (stack.getItem() instanceof IElectricItem));
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java
index 9431739c45..ea9ab3602a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java
@@ -4,7 +4,7 @@ import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-public interface GregtechItemContainer {
+public interface IGregtechItemContainer {
 
     public Item getItem();
 
@@ -24,13 +24,13 @@ public interface GregtechItemContainer {
 
     public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements);
 
-    public GregtechItemContainer set(Item aItem);
+    public IGregtechItemContainer set(Item aItem);
 
-    public GregtechItemContainer set(ItemStack aStack);
+    public IGregtechItemContainer set(ItemStack aStack);
 
-    public GregtechItemContainer registerOre(Object... aOreNames);
+    public IGregtechItemContainer registerOre(Object... aOreNames);
 
-    public GregtechItemContainer registerWildcardAsOre(Object... aOreNames);
+    public IGregtechItemContainer registerWildcardAsOre(Object... aOreNames);
 
     public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements);
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java
index 545a97288f..a68efc4fb8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java
@@ -12,9 +12,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 import gregtech.api.enums.SubTag;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
+import gtPlusPlus.xmod.gregtech.api.items.GTMetaItemBase;
 
-public interface Interface_ItemBehaviour<E extends Item> {
+public interface IItemBehaviour<E extends Item> {
 
     public boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity);
 
@@ -36,7 +36,7 @@ public interface Interface_ItemBehaviour<E extends Item> {
 
     public ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack);
 
-    public boolean hasProjectile(Gregtech_MetaItem_Base aItem, SubTag aProjectileType, ItemStack aStack);
+    public boolean hasProjectile(GTMetaItemBase aItem, SubTag aProjectileType, ItemStack aStack);
 
     public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX,
         double aY, double aZ);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java
index 6ae25525bd..4c8b1c2391 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java
@@ -6,7 +6,7 @@ import gregtech.api.enums.Materials;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
-public interface Interface_OreRecipeRegistrator {
+public interface IOreRecipeRegistrator {
 
     /**
      * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java
index 97d952d4a1..98b446869c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java
@@ -12,16 +12,15 @@ import net.minecraft.util.DamageSource;
 import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
+import gregtech.api.items.MetaGeneratedTool;
+import gtPlusPlus.xmod.gregtech.api.items.GTMetaTool;
 
 /**
  * The Stats for GT Tools. Not including any Material Modifiers.
  * <p/>
  * And this is supposed to not have any ItemStack Parameters as these are generic Stats.
  */
-public interface Interface_ToolStats extends IToolStats {
+public interface IToolStats extends gregtech.api.interfaces.IToolStats {
 
     /**
      * Called when aPlayer crafts this Tool
@@ -32,7 +31,7 @@ public interface Interface_ToolStats extends IToolStats {
     /**
      * Called when this gets added to a Tool Item
      */
-    public void onStatsAddedToTool(Gregtech_MetaTool gregtech_MetaTool, int aID);
+    public void onStatsAddedToTool(GTMetaTool gregtech_MetaTool, int aID);
 
     /**
      * @return Damage the Tool receives when breaking a Block. 100 is one Damage Point (or 100 EU).
@@ -198,5 +197,5 @@ public interface Interface_ToolStats extends IToolStats {
      * Called when this gets added to a Tool Item
      */
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID);
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID);
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTGenericItem.java
index 3ad04ab014..d734328327 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTGenericItem.java
@@ -25,31 +25,31 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IProjectileItem;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.Utils;
 
 /**
  * Extended by most Items, also used as a fallback Item, to prevent the accidental deletion when Errors occur.
  */
-public class Gregtech_Generic_Item extends Item implements IProjectileItem {
+public class GTGenericItem extends Item implements IProjectileItem {
 
     private final String mName, mTooltip;
     protected IIcon mIcon;
 
-    public Gregtech_Generic_Item(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip) {
+    public GTGenericItem(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip) {
         this(aUnlocalized, aEnglish, aEnglishTooltip, true);
     }
 
-    public Gregtech_Generic_Item(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip,
+    public GTGenericItem(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip,
         final boolean aWriteToolTipIntoLangFile) {
         super();
         this.mName = aUnlocalized;
-        GT_LanguageManager.addStringLocalization(this.mName + ".name", aEnglish);
-        if (GT_Utility.isStringValid(aEnglishTooltip)) {
-            GT_LanguageManager.addStringLocalization(
+        GTLanguageManager.addStringLocalization(this.mName + ".name", aEnglish);
+        if (GTUtility.isStringValid(aEnglishTooltip)) {
+            GTLanguageManager.addStringLocalization(
                 this.mTooltip = this.mName + ".tooltip_main",
                 aEnglishTooltip,
                 aWriteToolTipIntoLangFile);
@@ -104,9 +104,9 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem {
             aList.add((aStack.getMaxDamage() - this.getDamage(aStack)) + " / " + aStack.getMaxDamage());
         }
         if (this.mTooltip != null) {
-            aList.add(GT_LanguageManager.getTranslation(this.mTooltip));
+            aList.add(GTLanguageManager.getTranslation(this.mTooltip));
         }
-        if (GT_ModHandler.isElectricItem(aStack)) {
+        if (GTModHandler.isElectricItem(aStack)) {
             aList.add("Tier: " + this.getTier(aStack));
         }
         this.addAdditionalToolTips(aList, aStack);
@@ -164,7 +164,7 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem {
 
         @Override
         public ItemStack dispenseStack(final IBlockSource aSource, final ItemStack aStack) {
-            return ((Gregtech_Generic_Item) aStack.getItem()).onDispense(aSource, aStack);
+            return ((GTGenericItem) aStack.getItem()).onDispense(aSource, aStack);
         }
 
         @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java
index 015ba9d716..c98023bad7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.api.items;
 
-import static gregtech.api.enums.GT_Values.D1;
+import static gregtech.api.enums.GTValues.D1;
 import static gregtech.api.enums.Mods.GTPlusPlus;
 
 import java.util.ArrayList;
@@ -20,21 +20,21 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.SubTag;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
 import gregtech.api.interfaces.IFoodStat;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.IItemContainer;
 import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IItemBehaviour;
 
-public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
+public abstract class GTMetaItem extends GTMetaItemBase {
 
     /**
      * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this
@@ -42,7 +42,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
      * <p/>
      * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item.
      */
-    public static final HashMap<String, Gregtech_MetaItem> sInstances = new HashMap<>();
+    public static final HashMap<String, GTMetaItem> sInstances = new HashMap<>();
 
     /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
 
@@ -61,7 +61,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
      *
      * @param aUnlocalized The Unlocalized Name of this Item.
      */
-    public Gregtech_MetaItem(final String aUnlocalized, final short aOffset, final short aItemAmount) {
+    public GTMetaItem(final String aUnlocalized, final short aOffset, final short aItemAmount) {
         super(aUnlocalized);
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         this.setHasSubtypes(true);
@@ -94,8 +94,8 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
             final ItemStack rStack = new ItemStack(this, 1, this.mOffset + aID);
             this.mEnabledItems.set(aID);
             this.mVisibleItems.set(aID);
-            GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish);
-            GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip);
+            GTLanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish);
+            GTLanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip);
             final List<TC_AspectStack> tAspects = new ArrayList<>();
             // Important Stuff to do first
             for (final Object tRandomData : aRandomData) {
@@ -105,7 +105,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
                         continue;
                     }
                     if (tRandomData == SubTag.NO_UNIFICATION) {
-                        GT_OreDictUnificator.addToBlacklist(rStack);
+                        GTOreDictUnificator.addToBlacklist(rStack);
                         continue;
                     }
                 }
@@ -115,10 +115,8 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
                 if (tRandomData != null) {
                     boolean tUseOreDict = true;
 
-                    if (tRandomData instanceof Interface_ItemBehaviour) {
-                        this.addItemBehavior(
-                            this.mOffset + aID,
-                            (Interface_ItemBehaviour<Gregtech_MetaItem_Base>) tRandomData);
+                    if (tRandomData instanceof IItemBehaviour) {
+                        this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<GTMetaItemBase>) tRandomData);
                         tUseOreDict = false;
                     }
                     if (tRandomData instanceof IItemContainer) {
@@ -133,21 +131,21 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
                         continue;
                     }
                     if (tRandomData instanceof ItemData) {
-                        if (GT_Utility.isStringValid(tRandomData)) {
-                            GT_OreDictUnificator.registerOre(tRandomData, rStack);
+                        if (GTUtility.isStringValid(tRandomData)) {
+                            GTOreDictUnificator.registerOre(tRandomData, rStack);
                         } else {
-                            GT_OreDictUnificator.addItemData(rStack, (ItemData) tRandomData);
+                            GTOreDictUnificator.addItemData(rStack, (ItemData) tRandomData);
                         }
                         continue;
                     }
                     if (tUseOreDict) {
-                        GT_OreDictUnificator.registerOre(tRandomData, rStack);
+                        GTOreDictUnificator.registerOre(tRandomData, rStack);
                         continue;
                     }
                 }
             }
-            if (GregTech_API.sThaumcraftCompat != null) {
-                GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
+            if (GregTechAPI.sThaumcraftCompat != null) {
+                GregTechAPI.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
             }
             return rStack;
         }
@@ -161,7 +159,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
      * @param aValue     200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU)
      * @return the Item itself for convenience in constructing.
      */
-    public final Gregtech_MetaItem setBurnValue(final int aMetaValue, final int aValue) {
+    public final GTMetaItem setBurnValue(final int aMetaValue, final int aValue) {
         if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length())) || (aValue < 0)) {
             return this;
         }
@@ -184,8 +182,8 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
      *                       this Battery charge/discharge-able.
      * @return the Item itself for convenience in constructing.
      */
-    public final Gregtech_MetaItem setElectricStats(final int aMetaValue, final long aMaxCharge,
-        final long aTransferLimit, final long aTier, final long aSpecialData, final boolean aUseAnimations) {
+    public final GTMetaItem setElectricStats(final int aMetaValue, final long aMaxCharge, final long aTransferLimit,
+        final long aTier, final long aSpecialData, final boolean aUseAnimations) {
         if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length()))) {
             return this;
         }
@@ -215,8 +213,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
      *                       this Battery charge/discharge-able.
      * @return the Item itself for convenience in constructing.
      */
-    public final Gregtech_MetaItem setFluidContainerStats(final int aMetaValue, final long aCapacity,
-        final long aStacksize) {
+    public final GTMetaItem setFluidContainerStats(final int aMetaValue, final long aCapacity, final long aStacksize) {
         if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length()))) {
             return this;
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java
index 3c4418c2bf..3e7fcf1486 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.gregtech.api.items;
 
-import static gregtech.api.enums.GT_Values.D1;
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.D1;
+import static gregtech.api.enums.GTValues.V;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,22 +22,22 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
 import gregtech.api.enums.SubTag;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IItemBehaviour;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import ic2.api.item.IElectricItemManager;
 import ic2.api.item.ISpecialElectricItem;
 
-public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
+public abstract class GTMetaItemBase extends GTGenericItem
     implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem {
 
     /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
-    private final HashMap<Short, ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>>> mItemBehaviors = new HashMap<>();
+    private final HashMap<Short, ArrayList<IItemBehaviour<GTMetaItemBase>>> mItemBehaviors = new HashMap<>();
 
     /**
      * Creates the Item using these Parameters.
@@ -45,7 +45,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
      * @param aUnlocalized         The Unlocalized Name of this Item.
      * @param aGeneratedPrefixList The OreDict Prefixes you want to have generated.
      */
-    public Gregtech_MetaItem_Base(final String aUnlocalized) {
+    public GTMetaItemBase(final String aUnlocalized) {
         super(aUnlocalized, "Generated Item", null, false);
         this.setHasSubtypes(true);
         this.setMaxDamage(0);
@@ -60,12 +60,11 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
      * @param aBehavior  the Click Behavior you want to add.
      * @return the Item itself for convenience in constructing.
      */
-    public final Gregtech_MetaItem_Base addItemBehavior(final int aMetaValue,
-        final Interface_ItemBehaviour<Gregtech_MetaItem_Base> aBehavior) {
+    public final GTMetaItemBase addItemBehavior(final int aMetaValue, final IItemBehaviour<GTMetaItemBase> aBehavior) {
         if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) {
             return this;
         }
-        ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors.get((short) aMetaValue);
+        ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) aMetaValue);
         if (tList == null) {
             tList = new ArrayList<>(1);
             this.mItemBehaviors.put((short) aMetaValue, tList);
@@ -80,10 +79,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
 
     @Override
     public boolean hasProjectile(final SubTag aProjectileType, final ItemStack aStack) {
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 if (tBehavior.hasProjectile(this, aProjectileType, aStack)) {
                     return true;
                 }
@@ -95,10 +93,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
     @Override
     public EntityArrow getProjectile(final SubTag aProjectileType, final ItemStack aStack, final World aWorld,
         final double aX, final double aY, final double aZ) {
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 final EntityArrow rArrow = tBehavior.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ);
                 if (rArrow != null) {
                     return rArrow;
@@ -111,10 +108,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
     @Override
     public EntityArrow getProjectile(final SubTag aProjectileType, final ItemStack aStack, final World aWorld,
         final EntityLivingBase aEntity, final float aSpeed) {
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 final EntityArrow rArrow = tBehavior
                     .getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed);
                 if (rArrow != null) {
@@ -127,10 +123,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
 
     @Override
     public ItemStack onDispense(final IBlockSource aSource, final ItemStack aStack) {
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 if (tBehavior.canDispense(this, aSource, aStack)) {
                     return tBehavior.onDispense(this, aSource, aStack);
                 }
@@ -141,10 +136,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
 
     @Override
     public boolean isItemStackUsable(final ItemStack aStack) {
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 if (!tBehavior.isItemStackUsable(this, aStack)) {
                     return false;
                 }
@@ -157,10 +151,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
     public boolean onLeftClickEntity(final ItemStack aStack, final EntityPlayer aPlayer, final Entity aEntity) {
         this.use(aStack, 0, aPlayer);
         this.isItemStackUsable(aStack);
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 try {
                     if (tBehavior.onLeftClickEntity(this, aStack, aPlayer, aEntity)) {
                         if (aStack.stackSize <= 0) {
@@ -174,7 +167,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
                     }
                 } catch (final Throwable e) {
                     if (D1) {
-                        e.printStackTrace(GT_Log.err);
+                        e.printStackTrace(GTLog.err);
                     }
                 }
             }
@@ -187,10 +180,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
         final int aY, final int aZ, final int ordinalSide, final float hitX, final float hitY, final float hitZ) {
         this.use(aStack, 0, aPlayer);
         this.isItemStackUsable(aStack);
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 try {
                     if (tBehavior.onItemUse(this, aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ)) {
                         if (aStack.stackSize <= 0) {
@@ -204,7 +196,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
                     }
                 } catch (final Throwable e) {
                     if (D1) {
-                        e.printStackTrace(GT_Log.err);
+                        e.printStackTrace(GTLog.err);
                     }
                 }
             }
@@ -217,10 +209,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
         final int aY, final int aZ, final int ordinalSide, final float hitX, final float hitY, final float hitZ) {
         this.use(aStack, 0, aPlayer);
         this.isItemStackUsable(aStack);
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 try {
                     if (tBehavior
                         .onItemUseFirst(this, aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ)) {
@@ -235,7 +226,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
                     }
                 } catch (final Throwable e) {
                     if (D1) {
-                        e.printStackTrace(GT_Log.err);
+                        e.printStackTrace(GTLog.err);
                     }
                 }
             }
@@ -247,15 +238,14 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
     public ItemStack onItemRightClick(ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) {
         this.use(aStack, 0, aPlayer);
         this.isItemStackUsable(aStack);
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 try {
                     aStack = tBehavior.onItemRightClick(this, aStack, aWorld, aPlayer);
                 } catch (final Throwable e) {
                     if (D1) {
-                        e.printStackTrace(GT_Log.err);
+                        e.printStackTrace(GTLog.err);
                     }
                 }
             }
@@ -267,8 +257,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
     public final void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList,
         final boolean aF3_H) {
         final String tKey = this.getUnlocalizedName(aStack) + ".tooltip",
-            tString = GT_LanguageManager.getTranslation(tKey);
-        if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) {
+            tString = GTLanguageManager.getTranslation(tKey);
+        if (GTUtility.isStringValid(tString) && !tKey.equals(tString)) {
             aList.add(tString);
         }
 
@@ -277,7 +267,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
             if (tStats[3] > 0) {
                 aList.add(
                     EnumChatFormatting.AQUA + "Contains "
-                        + GT_Utility.formatNumbers(tStats[3])
+                        + GTUtility.formatNumbers(tStats[3])
                         + " EU   Tier: "
                         + (tStats[2] >= 0 ? tStats[2] : 0)
                         + EnumChatFormatting.GRAY);
@@ -289,11 +279,11 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
                 } else {
                     aList.add(
                         EnumChatFormatting.AQUA + ""
-                            + GT_Utility.formatNumbers(tCharge)
+                            + GTUtility.formatNumbers(tCharge)
                             + " / "
-                            + GT_Utility.formatNumbers(Math.abs(tStats[0]))
+                            + GTUtility.formatNumbers(Math.abs(tStats[0]))
                             + " EU - Voltage: "
-                            + GT_Utility.formatNumbers(
+                            + GTUtility.formatNumbers(
                                 V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)])
                             + EnumChatFormatting.GRAY);
                 }
@@ -305,20 +295,19 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
             final FluidStack tFluid = this.getFluidContent(aStack);
             aList.add(
                 EnumChatFormatting.BLUE
-                    + ((tFluid == null ? "No Fluids Contained" : GT_Utility.getFluidName(tFluid, true)))
+                    + ((tFluid == null ? "No Fluids Contained" : GTUtility.getFluidName(tFluid, true)))
                     + EnumChatFormatting.GRAY);
             aList.add(
                 EnumChatFormatting.BLUE
-                    + (GT_Utility.formatNumbers(tFluid == null ? 0 : tFluid.amount) + "L / "
-                        + GT_Utility.formatNumbers(tStats[0])
+                    + (GTUtility.formatNumbers(tFluid == null ? 0 : tFluid.amount) + "L / "
+                        + GTUtility.formatNumbers(tStats[0])
                         + "L")
                     + EnumChatFormatting.GRAY);
         }
 
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 aList = tBehavior.getAdditionalToolTips(this, aList, aStack);
             }
         }
@@ -329,10 +318,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
     @Override
     public void onUpdate(final ItemStack aStack, final World aWorld, final Entity aPlayer, final int aTimer,
         final boolean aIsInHand) {
-        final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
-            .get((short) this.getDamage(aStack));
+        final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
         if (tList != null) {
-            for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
+            for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) {
                 tBehavior.onUpdate(this, aStack, aWorld, aPlayer, aTimer, aIsInHand);
             }
         }
@@ -446,7 +434,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
         }
         for (int i = 1; i < 5; i++) {
             final ItemStack tArmor = aPlayer.getEquipmentInSlot(i);
-            if (GT_ModHandler.isElectricItem(tArmor)) {
+            if (GTModHandler.isElectricItem(tArmor)) {
                 final IElectricItem tArmorItem = (IElectricItem) tArmor.getItem();
                 if (tArmorItem.canProvideEnergy(tArmor) && (tArmorItem.getTier(tArmor) >= this.getTier(aStack))) {
                     final double tCharge = ElectricItem.manager.discharge(
@@ -533,11 +521,11 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
             return 0;
         }
 
-        final ItemStack tStack = GT_Utility.fillFluidContainer(aFluid, aStack, false, false);
+        final ItemStack tStack = GTUtility.fillFluidContainer(aFluid, aStack, false, false);
         if (tStack != null) {
             aStack.setItemDamage(tStack.getItemDamage());
             aStack.func_150996_a(tStack.getItem());
-            return GT_Utility.getFluidForFilledItem(tStack, false).amount;
+            return GTUtility.getFluidForFilledItem(tStack, false).amount;
         }
 
         final Long[] tStats = this.getFluidContainerStats(aStack);
@@ -592,9 +580,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
             return null;
         }
 
-        FluidStack tFluid = GT_Utility.getFluidForFilledItem(aStack, false);
+        FluidStack tFluid = GTUtility.getFluidForFilledItem(aStack, false);
         if ((tFluid != null) && (maxDrain >= tFluid.amount)) {
-            final ItemStack tStack = GT_Utility.getContainerItem(aStack, false);
+            final ItemStack tStack = GTUtility.getContainerItem(aStack, false);
             if (tStack == null) {
                 aStack.stackSize = 0;
                 return tFluid;
@@ -631,7 +619,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
     public FluidStack getFluidContent(final ItemStack aStack) {
         final Long[] tStats = this.getFluidContainerStats(aStack);
         if ((tStats == null) || (tStats[0] <= 0)) {
-            return GT_Utility.getFluidForFilledItem(aStack, false);
+            return GTUtility.getFluidForFilledItem(aStack, false);
         }
         final NBTTagCompound tNBT = aStack.getTagCompound();
         return tNBT == null ? null : FluidStack.loadFluidStackFromNBT(tNBT.getCompoundTag("GT.FluidContent"));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java
index c04acb9537..31cdac4770 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java
@@ -10,14 +10,14 @@ import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 
@@ -36,7 +36,7 @@ import gtPlusPlus.core.util.math.MathUtils;
  *         These Items can also have special RightClick abilities, electric Charge or even be set to become a Food alike
  *         Item.
  */
-public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
+public abstract class GTMetaItemX32 extends GTMetaItem {
 
     protected final OrePrefixes[] mGeneratedPrefixList;
 
@@ -46,7 +46,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
      * @param aUnlocalized         The Unlocalized Name of this Item.
      * @param aGeneratedPrefixList The OreDict Prefixes you want to have generated.
      */
-    public Gregtech_MetaItem_X32(final String aUnlocalized, final OrePrefixes... aGeneratedPrefixList) {
+    public GTMetaItemX32(final String aUnlocalized, final OrePrefixes... aGeneratedPrefixList) {
         super(aUnlocalized, (short) 32000, (short) 766);
         this.mGeneratedPrefixList = Arrays.copyOf(aGeneratedPrefixList, 32);
 
@@ -55,27 +55,27 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
             if (tPrefix == null) {
                 continue;
             }
-            final Materials tMaterial = GregTech_API.sGeneratedMaterials[i % 1000];
+            final Materials tMaterial = GregTechAPI.sGeneratedMaterials[i % 1000];
             if (tMaterial == null) {
                 continue;
             }
             if (this.doesMaterialAllowGeneration(tPrefix, tMaterial)) {
                 final ItemStack tStack = new ItemStack(this, 1, i);
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     this.getUnlocalizedName(tStack) + ".name",
                     this.getDefaultLocalization(tPrefix, tMaterial, i));
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     this.getUnlocalizedName(tStack) + ".tooltip",
-                    tMaterial.getToolTip(tPrefix.mMaterialAmount / GT_Values.M));
+                    tMaterial.getToolTip(tPrefix.mMaterialAmount / GTValues.M));
                 if (tPrefix.mIsUnificatable) {
-                    GT_OreDictUnificator.set(tPrefix, tMaterial, tStack);
+                    GTOreDictUnificator.set(tPrefix, tMaterial, tStack);
                 } else {
-                    GT_OreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack);
+                    GTOreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack);
                 }
                 if (((tPrefix == OrePrefixes.stick) || (tPrefix == OrePrefixes.wireFine))
                     && ((tMaterial == Materials.Lead) || (tMaterial == Materials.Tin)
                         || (tMaterial == Materials.SolderingAlloy))) {
-                    GregTech_API.sSolderingMetalList.add(tStack);
+                    GregTechAPI.sSolderingMetalList.add(tStack);
                 }
             }
         }
@@ -88,7 +88,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
      */
     @Override
     public short[] getRGBa(final ItemStack aStack) {
-        final Materials tMaterial = GregTech_API.sGeneratedMaterials[this.getDamage(aStack) % 1000];
+        final Materials tMaterial = GregTechAPI.sGeneratedMaterials[this.getDamage(aStack) % 1000];
         return tMaterial == null ? Materials._NULL.mRGBa : tMaterial.mRGBa;
     }
 
@@ -146,11 +146,11 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
     public ItemStack getContainerItem(final ItemStack aStack) {
         final int aDamage = aStack.getItemDamage();
         if ((aDamage < 32000) && (aDamage >= 0)) {
-            final Materials aMaterial = GregTech_API.sGeneratedMaterials[aDamage % 1000];
+            final Materials aMaterial = GregTechAPI.sGeneratedMaterials[aDamage % 1000];
             if ((aMaterial != null) && (aMaterial != Materials.Empty) && (aMaterial != Materials._NULL)) {
                 final OrePrefixes aPrefix = this.mGeneratedPrefixList[aDamage / 1000];
                 if (aPrefix != null) {
-                    return GT_Utility.copyAmount(1, aPrefix.mContainerItem);
+                    return GTUtility.copyAmount(1, aPrefix.mContainerItem);
                 }
             }
         }
@@ -159,8 +159,8 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
 
     @Override
     public final IIconContainer getIconContainer(final int aMetaData) {
-        return GregTech_API.sGeneratedMaterials[aMetaData % 1000] == null ? null
-            : this.getIconContainer(aMetaData, GregTech_API.sGeneratedMaterials[aMetaData % 1000]);
+        return GregTechAPI.sGeneratedMaterials[aMetaData % 1000] == null ? null
+            : this.getIconContainer(aMetaData, GregTechAPI.sGeneratedMaterials[aMetaData % 1000]);
     }
 
     @Override
@@ -169,11 +169,11 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
         for (int i = 0; i < 32000; i++) {
             if (this.doesMaterialAllowGeneration(
                 this.mGeneratedPrefixList[i / 1000],
-                GregTech_API.sGeneratedMaterials[i % 1000])
+                GregTechAPI.sGeneratedMaterials[i % 1000])
                 && this.doesShowInCreative(
                     this.mGeneratedPrefixList[i / 1000],
-                    GregTech_API.sGeneratedMaterials[i % 1000],
-                    GregTech_API.sDoShowAllItemsInCreative)) {
+                    GregTechAPI.sGeneratedMaterials[i % 1000],
+                    GregTechAPI.sDoShowAllItemsInCreative)) {
                 final ItemStack tStack = new ItemStack(this, 1, i);
                 this.isItemStackUsable(tStack);
                 aList.add(tStack);
@@ -188,7 +188,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
             return null;
         }
         if (aMetaData < 32000) {
-            final Materials tMaterial = GregTech_API.sGeneratedMaterials[aMetaData % 1000];
+            final Materials tMaterial = GregTechAPI.sGeneratedMaterials[aMetaData % 1000];
             if (tMaterial == null) {
                 return null;
             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaTool.java
index fcfa5fae50..f47ef56e9a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaTool.java
@@ -25,16 +25,15 @@ import net.minecraftforge.event.world.BlockEvent;
 
 import buildcraft.api.tools.IToolWrench;
 import cpw.mods.fml.common.Optional;
-import gregtech.api.enchants.Enchantment_Radioactivity;
+import gregtech.api.enchants.EnchantmentRadioactivity;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
 import gregtech.api.interfaces.IDamagableItem;
-import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IToolStats;
 import mods.railcraft.api.core.items.IToolCrowbar;
 
 /**
@@ -47,8 +46,7 @@ import mods.railcraft.api.core.items.IToolCrowbar;
     @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = Mods.Names.RAILCRAFT),
     @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"),
     @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O) })
-public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
-    implements IDamagableItem, IToolCrowbar, IToolWrench {
+public abstract class GTMetaTool extends MetaGeneratedTool implements IDamagableItem, IToolCrowbar, IToolWrench {
 
     /**
      * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this
@@ -56,33 +54,33 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
      * <p/>
      * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item.
      */
-    public static final HashMap<String, Gregtech_MetaTool> sInstances = new HashMap<>();
+    public static final HashMap<String, GTMetaTool> sInstances = new HashMap<>();
 
     /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
 
-    public final HashMap<Short, IToolStats> mToolStats = new HashMap<>();
+    public final HashMap<Short, gregtech.api.interfaces.IToolStats> mToolStats = new HashMap<>();
 
     /**
      * Creates the Item using these Parameters.
      *
      * @param aUnlocalized The Unlocalized Name of this Item.
      */
-    public Gregtech_MetaTool(final String aUnlocalized) {
+    public GTMetaTool(final String aUnlocalized) {
         super(aUnlocalized);
-        GT_ModHandler.registerBoxableItemToToolBox(new ItemStack(this));
+        GTModHandler.registerBoxableItemToToolBox(new ItemStack(this));
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         this.setMaxStackSize(1);
         sInstances.put(this.getUnlocalizedName(), this);
     }
 
     /**
-     * Called by the Block Harvesting Event within the GT_Proxy
+     * Called by the Block Harvesting Event within the GTProxy
      */
     @Override
     public void onHarvestBlockEvent(final ArrayList<ItemStack> aDrops, final ItemStack aStack,
         final EntityPlayer aPlayer, final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData,
         final int aFortune, final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) {
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if (this.isItemStackUsable(aStack) && (this.getDigSpeed(aStack, aBlock, aMetaData) > 0.0F)) {
             this.doDamage(
                 aStack,
@@ -103,11 +101,11 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
 
     @Override
     public boolean onLeftClickEntity(final ItemStack aStack, final EntityPlayer aPlayer, final Entity aEntity) {
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if ((tStats == null) || !this.isItemStackUsable(aStack)) {
             return true;
         }
-        GT_Utility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F);
+        GTUtility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F);
         if (super.onLeftClickEntity(aStack, aPlayer, aEntity)) {
             return true;
         }
@@ -184,7 +182,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
 
     @Override
     public ItemStack onItemRightClick(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) {
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if ((tStats != null) && tStats.canBlock()) {
             aPlayer.setItemInUse(aStack, 72000);
         }
@@ -195,7 +193,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
     public void addAdditionalToolTips(final List aList, final ItemStack aStack) {
         final long tMaxDamage = getToolMaxDamage(aStack);
         final Materials tMaterial = getPrimaryMaterial(aStack);
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         final int tOffset = this.getElectricStats(aStack) != null ? 2 : 1;
         if (tStats != null) {
             final String name = aStack.getUnlocalizedName();
@@ -289,7 +287,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
     public void addAdditionalToolTips(final List aList, final ItemStack aStack, final EntityPlayer aPlayer) {
         final long tMaxDamage = getToolMaxDamage(aStack);
         final Materials tMaterial = getPrimaryMaterial(aStack);
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         final int tOffset = this.getElectricStats(aStack) != null ? 2 : 1;
         if (tStats != null) {
             final String name = aStack.getUnlocalizedName();
@@ -427,7 +425,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
 
     @Override
     public float getToolCombatDamage(final ItemStack aStack) {
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if (tStats == null) {
             return 0;
         }
@@ -439,7 +437,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
         if (!this.isItemStackUsable(aStack)) {
             return 0.0F;
         }
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if ((tStats == null) || (Math.max(0, this.getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData))) {
             return 0.0F;
         }
@@ -454,11 +452,11 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
         if (!this.isItemStackUsable(aStack)) {
             return false;
         }
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if (tStats == null) {
             return false;
         }
-        GT_Utility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F);
+        GTUtility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F);
         this.doDamage(
             aStack,
             (int) Math.max(1, aBlock.getBlockHardness(aWorld, aX, aY, aZ) * tStats.getToolDamagePerBlockBreak()));
@@ -469,8 +467,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
         if (!this.isItemStackUsable(aStack)) {
             return null;
         }
-        aStack = GT_Utility.copyAmount(1, aStack);
-        final IToolStats tStats = this.getToolStats(aStack);
+        aStack = GTUtility.copyAmount(1, aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if (tStats == null) {
             return null;
         }
@@ -481,13 +479,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
     }
 
     @Override
-    public Interface_ToolStats getToolStats(final ItemStack aStack) {
+    public IToolStats getToolStats(final ItemStack aStack) {
         this.isItemStackUsable(aStack);
         return this.getToolStatsInternal(aStack);
     }
 
-    private Interface_ToolStats getToolStatsInternal(final ItemStack aStack) {
-        return (Interface_ToolStats) (aStack == null ? null : this.mToolStats.get((short) aStack.getItemDamage()));
+    private IToolStats getToolStatsInternal(final ItemStack aStack) {
+        return (IToolStats) (aStack == null ? null : this.mToolStats.get((short) aStack.getItemDamage()));
     }
 
     @Override
@@ -496,13 +494,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
         if (!this.isItemStackUsable(aStack)) {
             return false;
         }
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         return (tStats != null) && tStats.isCrowbar();
     }
 
     @Override
     public void onWhack(final EntityPlayer aPlayer, final ItemStack aStack, final int aX, final int aY, final int aZ) {
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if (tStats != null) {
             this.doDamage(aStack, tStats.getToolDamagePerEntityAttack());
         }
@@ -520,7 +518,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
         if (!this.isItemStackUsable(player.getCurrentEquippedItem())) {
             return false;
         }
-        final Interface_ToolStats tStats = this.getToolStats(player.getCurrentEquippedItem());
+        final IToolStats tStats = this.getToolStats(player.getCurrentEquippedItem());
         return (tStats != null) && tStats.isWrench();
     }
 
@@ -532,7 +530,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
         if (player.getCurrentEquippedItem() == null) {
             return;
         }
-        final IToolStats tStats = this.getToolStats(player.getCurrentEquippedItem());
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(player.getCurrentEquippedItem());
         if (tStats != null) {
             this.doDamage(player.getCurrentEquippedItem(), tStats.getToolDamagePerEntityAttack());
         }
@@ -543,13 +541,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
         if (!this.isItemStackUsable(aStack)) {
             return false;
         }
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         return (tStats != null) && tStats.isCrowbar();
     }
 
     @Override
     public void onLink(final EntityPlayer aPlayer, final ItemStack aStack, final EntityMinecart cart) {
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if (tStats != null) {
             this.doDamage(aStack, tStats.getToolDamagePerEntityAttack());
         }
@@ -560,13 +558,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
         if (!this.isItemStackUsable(aStack)) {
             return false;
         }
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         return (tStats != null) && tStats.isCrowbar();
     }
 
     @Override
     public void onBoost(final EntityPlayer aPlayer, final ItemStack aStack, final EntityMinecart cart) {
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if (tStats != null) {
             this.doDamage(aStack, tStats.getToolDamagePerEntityAttack());
         }
@@ -574,7 +572,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
 
     @Override
     public void onCreated(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) {
-        final IToolStats tStats = this.getToolStats(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack);
         if ((tStats != null) && (aPlayer != null)) {
             tStats.onToolCrafted(aStack, aPlayer);
         }
@@ -588,7 +586,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
 
     @Override
     public boolean isItemStackUsable(final ItemStack aStack) {
-        final IToolStats tStats = this.getToolStatsInternal(aStack);
+        final gregtech.api.interfaces.IToolStats tStats = this.getToolStatsInternal(aStack);
         if (((aStack.getItemDamage() % 2) == 1) || (tStats == null)) {
             final NBTTagCompound aNBT = aStack.getTagCompound();
             if (aNBT != null) {
@@ -622,7 +620,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
         }
         for (final Entry<Integer, Integer> tEntry : tMap.entrySet()) {
             if ((tEntry.getKey() == 33) || ((tEntry.getKey() == 20) && (tEntry.getValue() > 2))
-                || (tEntry.getKey() == Enchantment_Radioactivity.INSTANCE.effectId)) {
+                || (tEntry.getKey() == EnchantmentRadioactivity.INSTANCE.effectId)) {
                 tResult.put(tEntry.getKey(), tEntry.getValue());
             } else {
                 switch (Enchantment.enchantmentsList[tEntry.getKey()].type) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTECable.java
index 9b1408ba51..9025dad232 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTECable.java
@@ -10,17 +10,17 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTECable;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTUtility;
 
-public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implements IMetaTileEntityCable {
+public class GTPPMTECable extends MTECable implements IMetaTileEntityCable {
 
     private static Textures.BlockIcons INSULATION_MEDIUM_PLUS;
 
     static {
         try {
-            INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GT_Utility
+            INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GTUtility
                 .getField(Textures.BlockIcons.class, "INSULATION_MEDIUM_PLUS")
                 .get(null);
         } catch (IllegalAccessException | NullPointerException e) {
@@ -30,9 +30,9 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
 
     private short[] vRGB = null;
 
-    public GregtechMetaPipeEntity_Cable(final int aID, final String aName, final String aNameRegional,
-        final float aThickNess, final Materials aMaterial, final long aCableLossPerMeter, final long aAmperage,
-        final long aVoltage, final boolean aInsulated, final boolean aCanShock, final short[] aRGB) {
+    public GTPPMTECable(final int aID, final String aName, final String aNameRegional, final float aThickNess,
+        final Materials aMaterial, final long aCableLossPerMeter, final long aAmperage, final long aVoltage,
+        final boolean aInsulated, final boolean aCanShock, final short[] aRGB) {
         super(
             aID,
             aName,
@@ -47,16 +47,16 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
         this.vRGB = aRGB == null || aRGB.length != 4 ? Materials.Iron.mRGBa : aRGB;
     }
 
-    public GregtechMetaPipeEntity_Cable(final String aName, final float aThickNess, final Materials aMaterial,
+    public GTPPMTECable(final String aName, final float aThickNess, final Materials aMaterial,
         final long aCableLossPerMeter, final long aAmperage, final long aVoltage, final boolean aInsulated,
         final boolean aCanShock, final short[] aRGB) {
         super(aName, aThickNess, aMaterial, aCableLossPerMeter, aAmperage, aVoltage, aInsulated, aCanShock);
         this.vRGB = aRGB == null || aRGB.length != 4 ? Materials.Iron.mRGBa : aRGB;
     }
 
-    public GregtechMetaPipeEntity_Cable(final int aID, final String aName, final String aNameRegional,
-        final float aThickNess, final long aCableLossPerMeter, final long aAmperage, final long aVoltage,
-        final boolean aInsulated, final boolean aCanShock, final short[] aRGB) {
+    public GTPPMTECable(final int aID, final String aName, final String aNameRegional, final float aThickNess,
+        final long aCableLossPerMeter, final long aAmperage, final long aVoltage, final boolean aInsulated,
+        final boolean aCanShock, final short[] aRGB) {
         this(
             aID,
             aName,
@@ -71,15 +71,14 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
             aRGB);
     }
 
-    public GregtechMetaPipeEntity_Cable(final String aName, final float aThickNess, final long aCableLossPerMeter,
-        final long aAmperage, final long aVoltage, final boolean aInsulated, final boolean aCanShock,
-        final short[] aRGB) {
+    public GTPPMTECable(final String aName, final float aThickNess, final long aCableLossPerMeter, final long aAmperage,
+        final long aVoltage, final boolean aInsulated, final boolean aCanShock, final short[] aRGB) {
         this(aName, aThickNess, null, aCableLossPerMeter, aAmperage, aVoltage, aInsulated, aCanShock, aRGB);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaPipeEntity_Cable(
+        return new GTPPMTECable(
             this.mName,
             this.mThickNess,
             this.mMaterial,
@@ -105,51 +104,50 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
             wireMaterial = Materials.Iron;
         }
 
-        if (!mInsulated) return new ITexture[] { new GT_RenderedTexture(
+        if (!mInsulated) return new ITexture[] { new GTRenderedTexture(
             wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire],
             Dyes.getModulation(aColorIndex, vRGB)) };
         if (aConnected) {
             float tThickNess = getThickNess();
-            if (tThickNess < 0.124F) return new ITexture[] { new GT_RenderedTexture(
+            if (tThickNess < 0.124F) return new ITexture[] { new GTRenderedTexture(
                 Textures.BlockIcons.INSULATION_FULL,
                 Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
             if (tThickNess < 0.374F) // 0.375 x1
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    new GTRenderedTexture(
                         Textures.BlockIcons.INSULATION_TINY,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
             if (tThickNess < 0.499F) // 0.500 x2
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    new GTRenderedTexture(
                         Textures.BlockIcons.INSULATION_SMALL,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
             if (tThickNess < 0.624F) // 0.625 x4
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    new GTRenderedTexture(
                         Textures.BlockIcons.INSULATION_MEDIUM,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
             if (tThickNess < 0.749F) // 0.750 x8
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    new GTRenderedTexture(
                         INSULATION_MEDIUM_PLUS,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
             if (tThickNess < 0.874F) // 0.825 x12
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    new GTRenderedTexture(
                         Textures.BlockIcons.INSULATION_LARGE,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
-            return new ITexture[] {
-                new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                new GT_RenderedTexture(
+            return new ITexture[] { new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                new GTRenderedTexture(
                     Textures.BlockIcons.INSULATION_HUGE,
                     Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
         }
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             Textures.BlockIcons.INSULATION_FULL,
             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTEFluid.java
index e9f9a2dda4..550e5e409c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTEFluid.java
@@ -8,34 +8,34 @@ import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
+import gregtech.api.metatileentity.implementations.MTEFluid;
 import gregtech.api.render.TextureFactory;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
-public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
+public class GTPPMTEFluid extends MTEFluid {
 
     public final GT_Materials mMaterial;
 
-    public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess,
-        GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof) {
+    public GTPPMTEFluid(int aID, String aName, String aNameRegional, float aThickNess, GT_Materials aMaterial,
+        int aCapacity, int aHeatResistance, boolean aGasProof) {
         this(aID, aName, aNameRegional, aThickNess, aMaterial, aCapacity, aHeatResistance, aGasProof, 1);
     }
 
-    public GregtechMetaPipeEntityFluid(final String aName, final float aThickNess, final GT_Materials aMaterial,
-        final int aCapacity, final int aHeatResistance, final boolean aGasProof) {
+    public GTPPMTEFluid(final String aName, final float aThickNess, final GT_Materials aMaterial, final int aCapacity,
+        final int aHeatResistance, final boolean aGasProof) {
         this(aName, aThickNess, aMaterial, aCapacity, aHeatResistance, aGasProof, 1);
     }
 
-    public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess,
-        GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) {
+    public GTPPMTEFluid(int aID, String aName, String aNameRegional, float aThickNess, GT_Materials aMaterial,
+        int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) {
         super(aID, aName, aNameRegional, aThickNess, null, aCapacity, aHeatResistance, aGasProof, aFluidTypes);
         this.mLastReceivedFrom = 0;
         this.oLastReceivedFrom = 0;
         this.mMaterial = aMaterial;
     }
 
-    public GregtechMetaPipeEntityFluid(String aName, float aThickNess, GT_Materials aMaterial, int aCapacity,
-        int aHeatResistance, boolean aGasProof, int aFluidTypes) {
+    public GTPPMTEFluid(String aName, float aThickNess, GT_Materials aMaterial, int aCapacity, int aHeatResistance,
+        boolean aGasProof, int aFluidTypes) {
         super(aName, aThickNess, null, aCapacity, aHeatResistance, aGasProof, aFluidTypes);
         this.mLastReceivedFrom = 0;
         this.oLastReceivedFrom = 0;
@@ -51,7 +51,7 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaPipeEntityFluid(
+        return new GTPPMTEFluid(
             this.mName,
             this.mThickNess,
             this.mMaterial,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java
index bab504910e..e475037c63 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java
@@ -7,24 +7,23 @@ import net.minecraftforge.fluids.Fluid;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 
-public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_FluidGenerator {
+public class METHatchAirIntake extends MTEHatchFluidGenerator {
 
-    public GT_MetaTileEntity_Hatch_AirIntake(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public METHatchAirIntake(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String[] aDescription,
+    public METHatchAirIntake(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new METHatchAirIntake(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -71,30 +70,30 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_F
             .isServerSide()) {
             return;
         }
-        final float ran1 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat();
+        final float ran1 = METHatchAirIntake.floatGen.nextFloat();
         float ran2 = 0.0f;
         float ran3 = 0.0f;
-        ran2 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat();
-        ran3 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat();
+        ran2 = METHatchAirIntake.floatGen.nextFloat();
+        ran3 = METHatchAirIntake.floatGen.nextFloat();
 
         final IGregTechTileEntity aMuffler = this.getBaseMetaTileEntity();
         final ForgeDirection aDir = aMuffler.getFrontFacing();
         final float xPos = aDir.offsetX * 0.76f + aMuffler.getXCoord() + 0.25f;
         float yPos = aDir.offsetY * 0.76f + aMuffler.getYCoord() + 0.65f;
         final float zPos = aDir.offsetZ * 0.76f + aMuffler.getZCoord() + 0.25f;
-        float ySpd = aDir.offsetY * 0.1f + 0.2f + 0.1f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat();
+        float ySpd = aDir.offsetY * 0.1f + 0.2f + 0.1f * METHatchAirIntake.floatGen.nextFloat();
         float xSpd;
         float zSpd;
         if (aDir.offsetY == -1) {
             // Logger.INFO("Y = -1");
-            final float temp = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 2.0f * CORE.PI;
+            final float temp = METHatchAirIntake.floatGen.nextFloat() * 2.0f * GTPPCore.PI;
             xSpd = (float) Math.sin(temp) * 0.1f;
             zSpd = (float) Math.cos(temp) * 0.1f;
             ySpd = -ySpd;
             yPos = yPos - 0.8f;
         } else {
-            xSpd = aDir.offsetX * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat());
-            zSpd = aDir.offsetZ * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat());
+            xSpd = aDir.offsetX * (0.1f + 0.2f * METHatchAirIntake.floatGen.nextFloat());
+            zSpd = aDir.offsetZ * (0.1f + 0.2f * METHatchAirIntake.floatGen.nextFloat());
 
             xSpd = -xSpd;
             zSpd = -zSpd;
@@ -103,24 +102,24 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_F
         aWorld.spawnParticle(
             name,
             (double) (xPos + ran1 * 0.5f),
-            (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
-            (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
             (double) xSpd,
             (double) -ySpd,
             (double) zSpd);
         aWorld.spawnParticle(
             name,
             (double) (xPos + ran2 * 0.5f),
-            (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
-            (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
             (double) xSpd,
             (double) -ySpd,
             (double) zSpd);
         aWorld.spawnParticle(
             name,
             (double) (xPos + ran3 * 0.5f),
-            (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
-            (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
+            (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f),
             (double) xSpd,
             (double) -ySpd,
             (double) zSpd);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchAirIntakeExtreme.java
index 007310fc06..a03f8bada1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchAirIntakeExtreme.java
@@ -4,25 +4,20 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_Hatch_AirIntake_Extreme extends GT_MetaTileEntity_Hatch_AirIntake {
+public class MTEHatchAirIntakeExtreme extends METHatchAirIntake {
 
-    public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTEHatchAirIntakeExtreme(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final String aName, final int aTier, final String[] aDescription,
+    public MTEHatchAirIntakeExtreme(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_AirIntake_Extreme(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEHatchAirIntakeExtreme(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ChiselBus.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchChiselBus.java
index 3009c80c80..e9d13f3c48 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ChiselBus.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchChiselBus.java
@@ -11,15 +11,15 @@ 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.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
 
-public class GT_MetaTileEntity_ChiselBus extends GT_MetaTileEntity_Hatch_InputBus implements IAddUIWidgets {
+public class MTEHatchChiselBus extends MTEHatchInputBus implements IAddUIWidgets {
 
-    public GT_MetaTileEntity_ChiselBus(int id, String name, String nameRegional, int tier) {
+    public MTEHatchChiselBus(int id, String name, String nameRegional, int tier) {
         super(id, name, nameRegional, tier);
     }
 
-    public GT_MetaTileEntity_ChiselBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchChiselBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, getSlots(aTier), aDescription, aTextures);
     }
 
@@ -34,7 +34,7 @@ public class GT_MetaTileEntity_ChiselBus extends GT_MetaTileEntity_Hatch_InputBu
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ChiselBus(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEHatchChiselBus(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchDynamoBuffer.java
index f375900800..90b3648583 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchDynamoBuffer.java
@@ -1,21 +1,20 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatch_Dynamo {
+public class MTEHatchDynamoBuffer extends MTEHatchDynamo {
 
-    public GT_MetaTileEntity_Hatch_DynamoBuffer(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTEHatchDynamoBuffer(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription,
+    public MTEHatchDynamoBuffer(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
@@ -37,12 +36,12 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc
 
     @Override
     public long maxEUStore() {
-        return 512L + GT_Values.V[this.mTier + 1] * 2048L;
+        return 512L + GTValues.V[this.mTier + 1] * 2048L;
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_DynamoBuffer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEHatchDynamoBuffer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -50,7 +49,7 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc
         String[] g;
         g = new String[] { "Dynamo with internal storage and additional Amp capacity",
             "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
-            CORE.GT_Tooltip.get() };
+            GTPPCore.GT_Tooltip.get() };
 
         return g;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java
index a33994402b..0043819b23 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java
@@ -12,23 +12,22 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 
 import gregtech.api.enums.ItemList;
-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.IConfigurationCircuitSupport;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileEntity_Hatch
-    implements IConfigurationCircuitSupport {
+public class MTEHatchElementalDataOrbHolder extends MTEHatch implements IConfigurationCircuitSupport {
 
-    public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchElementalDataOrbHolder(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -36,27 +35,25 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
             aTier,
             17,
             new String[] { "Holds Data Orbs for the Elemental Duplicator", "Can insert/extract the circuit slot",
-                "A circuit must be used to select a slot (1-16)", CORE.GT_Tooltip.get() });
+                "A circuit must be used to select a slot (1-16)", GTPPCore.GT_Tooltip.get() });
     }
 
-    public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchElementalDataOrbHolder(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 17, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchElementalDataOrbHolder(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 17, aDescription, aTextures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb) };
     }
 
     @Override
@@ -81,12 +78,12 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchElementalDataOrbHolder(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -215,7 +212,7 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
             SlotGroup.ofItemHandler(inventoryHandler, 4)
                 .startFromSlot(0)
                 .endAtSlot(15)
-                .background(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DATA_ORB)
+                .background(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_DATA_ORB)
                 .applyForWidget(
                     widget -> widget.setFilter(stack -> ItemList.Tool_DataOrb.isStackEqual(stack, false, true)))
                 .build()
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java
index b4e213e829..638176c4b5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java
@@ -13,24 +13,23 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 
-public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTileEntity_Hatch_Input {
+public abstract class MTEHatchFluidGenerator extends MTEHatchInput {
 
     protected static XSTR floatGen = new XSTR();
     public int mProgresstime = 0, mMaxProgresstime = 0;
 
-    public GT_MetaTileEntity_Hatch_FluidGenerator(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTEHatchFluidGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_Hatch_FluidGenerator(final String aName, final int aTier, final String[] aDescription,
+    public MTEHatchFluidGenerator(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
@@ -45,28 +44,28 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile
 
     @Override
     public synchronized String[] getDescription() {
-        mDescriptionArray[1] = "Capacity: " + GT_Utility.formatNumbers(getCapacity()) + "L";
-        final String[] hatchTierString = new String[] { "Hatch Tier: " + GT_Utility.getColoredTierNameFromTier(mTier) };
+        mDescriptionArray[1] = "Capacity: " + GTUtility.formatNumbers(getCapacity()) + "L";
+        final String[] hatchTierString = new String[] { "Hatch Tier: " + GTUtility.getColoredTierNameFromTier(mTier) };
 
         String[] aCustomTips = getCustomTooltip();
         final String[] desc = new String[mDescriptionArray.length + aCustomTips.length + 2];
         System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
         System.arraycopy(hatchTierString, 0, desc, mDescriptionArray.length, 1);
         System.arraycopy(aCustomTips, 0, desc, mDescriptionArray.length + 1, aCustomTips.length);
-        desc[mDescriptionArray.length + aCustomTips.length] = CORE.GT_Tooltip.get();
+        desc[mDescriptionArray.length + aCustomTips.length] = GTPPCore.GT_Tooltip.get();
         return desc;
     }
 
     @Override
     public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
         return new ITexture[] { aBaseTexture,
-            new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) };
+            new GTRenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
         return new ITexture[] { aBaseTexture,
-            new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) };
+            new GTRenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) };
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchInputBattery.java
index 31b332e7a5..99000edc8f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchInputBattery.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.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,30 +11,29 @@ import org.apache.commons.lang3.ArrayUtils;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.enums.GTValues;
+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.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.xmod.gregtech.api.gui.widget.ElectricSlotWidget;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatch {
+public class MTEHatchInputBattery extends MTEHatch {
 
     public final RecipeMap<?> mRecipeMap = null;
 
-    public GT_MetaTileEntity_Hatch_InputBattery(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchInputBattery(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Chargeable Item Bus for Multiblocks");
     }
 
-    public GT_MetaTileEntity_Hatch_InputBattery(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchInputBattery(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 4 : 16, aDescription, aTextures);
     }
 
@@ -48,7 +47,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
         } else {
             mSlots = 16;
         }
-        return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get());
+        return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -83,12 +82,12 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger) };
     }
 
     @Override
@@ -113,12 +112,12 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_InputBattery(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchInputBattery(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -135,10 +134,10 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
                         if (aBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) {
                             for (int u = 0; u < 10; u++) {
                                 aBaseMetaTileEntity.decreaseStoredEnergyUnits(
-                                    GT_ModHandler.chargeElectricItem(
+                                    GTModHandler.chargeElectricItem(
                                         mMetaTileEntity.mInventory[i],
                                         (int) Math.min(V[this.mTier] * 15, aBaseMetaTileEntity.getStoredEU()),
-                                        (int) Math.min(Integer.MAX_VALUE, GT_Values.V[u]),
+                                        (int) Math.min(Integer.MAX_VALUE, GTValues.V[u]),
                                         false,
                                         false),
                                     true);
@@ -163,8 +162,8 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
     protected void fillStacksIntoFirstSlots() {
         for (int i = 0; i < mInventory.length; i++)
             for (int j = i + 1; j < mInventory.length; j++) if (mInventory[j] != null
-                && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) {
-                    GT_Utility.moveStackFromSlotAToSlotB(
+                && (mInventory[i] == null || GTUtility.areStacksEqual(mInventory[i], mInventory[j]))) {
+                    GTUtility.moveStackFromSlotAToSlotB(
                         getBaseMetaTileEntity(),
                         getBaseMetaTileEntity(),
                         j,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java
index cc5f539a76..2cf1ed3efe 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java
@@ -10,24 +10,24 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.GT_Mod;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.GTMod;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.common.GT_Pollution;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.common.Pollution;
 import gtPlusPlus.core.item.general.ItemAirFilter;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
+import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch_Muffler implements IAddGregtechLogo {
+public class MTEHatchMufflerAdvanced extends MTEHatchMuffler implements IAddGregtechLogo {
 
     protected int SLOT_FILTER = 0;
 
@@ -35,7 +35,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
     public void onConfigLoad() {
         super.onConfigLoad();
         try {
-            int a1 = GT_Mod.gregtechproxy.mPollutionSmogLimit;
+            int a1 = GTMod.gregtechproxy.mPollutionSmogLimit;
             if (a1 > 0) {
                 mPollutionSmogLimit = a1;
             }
@@ -46,12 +46,11 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
 
     private int mPollutionSmogLimit = 500000;
 
-    public GT_MetaTileEntity_Hatch_Muffler_Adv(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchMufflerAdvanced(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1, new String[] { "" });
     }
 
-    public GT_MetaTileEntity_Hatch_Muffler_Adv(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchMufflerAdvanced(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures);
     }
 
@@ -61,7 +60,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
             : "Requires an Air Filter " + EnumChatFormatting.WHITE + "[Tier 2]" + EnumChatFormatting.GRAY,
         "Can take Air Filters from an input bus of the multiblock",
         "Reduces Pollution to " + calculatePollutionReduction(100, true) + "%",
-        "Recovers " + (100 - calculatePollutionReduction(100, true)) + "% of CO2/CO/SO2", CORE.GT_Tooltip.get() };
+        "Recovers " + (100 - calculatePollutionReduction(100, true)) + "% of CO2/CO/SO2", GTPPCore.GT_Tooltip.get() };
 
     @Override
     public String[] getDescription() {
@@ -70,12 +69,12 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv) };
     }
 
     @Override
@@ -91,12 +90,12 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Muffler_Adv(this.mName, this.mTier, mDescriptionArray, this.mTextures);
+        return new MTEHatchMufflerAdvanced(this.mName, this.mTier, mDescriptionArray, this.mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -112,7 +111,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
             // Revert to reduction of the basic muffler.
             emission = super.calculatePollutionReduction(emission);
         }
-        GT_Pollution.addPollution(getBaseMetaTileEntity(), emission);
+        Pollution.addPollution(getBaseMetaTileEntity(), emission);
         return true;
     }
 
@@ -199,7 +198,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
         if (mInventory[SLOT_FILTER] != null) return false; // Has a non-filter item in inventory.
         if (parentTileEntity == null) return false; // Unknown parent multiblock.
 
-        if (parentTileEntity instanceof GT_MetaTileEntity_MultiBlockBase GTMultiBase) {
+        if (parentTileEntity instanceof MTEMultiBlockBase GTMultiBase) {
             for (var inputBus : GTMultiBase.mInputBusses) {
                 for (ItemStack stack : inputBus.mInventory) {
                     if (isAirFilter(stack)) {
@@ -266,7 +265,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
 
     @Override
     public void pollutionParticles(World aWorld, String name) {
-        float ran1 = CORE.RANDOM.nextFloat();
+        float ran1 = GTPPCore.RANDOM.nextFloat();
         float ran2 = 0.0F;
         float ran3 = 0.0F;
         boolean chk1 = ran1 * 100.0F < (float) this.calculatePollutionReduction(100);
@@ -274,8 +273,8 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
         boolean chk3;
         int aPollutionAmount = PollutionUtils.getPollution(getBaseMetaTileEntity());
         if (aPollutionAmount >= mPollutionSmogLimit) {
-            ran2 = CORE.RANDOM.nextFloat();
-            ran3 = CORE.RANDOM.nextFloat();
+            ran2 = GTPPCore.RANDOM.nextFloat();
+            ran3 = GTPPCore.RANDOM.nextFloat();
             chk2 = ran2 * 100.0F < (float) this.calculatePollutionReduction(100);
             chk3 = ran3 * 100.0F < (float) this.calculatePollutionReduction(100);
             if (!chk1 && !chk2 && !chk3) {
@@ -295,24 +294,24 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
         float xPos = (float) aDir.offsetX * 0.76F + (float) aMuffler.getXCoord() + 0.25F;
         float yPos = (float) aDir.offsetY * 0.76F + (float) aMuffler.getYCoord() + 0.25F;
         float zPos = (float) aDir.offsetZ * 0.76F + (float) aMuffler.getZCoord() + 0.25F;
-        float ySpd = (float) aDir.offsetY * 0.1F + 0.2F + 0.1F * CORE.RANDOM.nextFloat();
+        float ySpd = (float) aDir.offsetY * 0.1F + 0.2F + 0.1F * GTPPCore.RANDOM.nextFloat();
         float xSpd;
         float zSpd;
         if (aDir.offsetY == -1) {
-            float temp = CORE.RANDOM.nextFloat() * 2.0F * CORE.PI;
+            float temp = GTPPCore.RANDOM.nextFloat() * 2.0F * GTPPCore.PI;
             xSpd = (float) Math.sin((double) temp) * 0.1F;
             zSpd = (float) Math.cos((double) temp) * 0.1F;
         } else {
-            xSpd = (float) aDir.offsetX * (0.1F + 0.2F * CORE.RANDOM.nextFloat());
-            zSpd = (float) aDir.offsetZ * (0.1F + 0.2F * CORE.RANDOM.nextFloat());
+            xSpd = (float) aDir.offsetX * (0.1F + 0.2F * GTPPCore.RANDOM.nextFloat());
+            zSpd = (float) aDir.offsetZ * (0.1F + 0.2F * GTPPCore.RANDOM.nextFloat());
         }
 
         if (chk1) {
             aWorld.spawnParticle(
                 name,
                 (double) (xPos + ran1 * 0.5F),
-                (double) (yPos + CORE.RANDOM.nextFloat() * 0.5F),
-                (double) (zPos + CORE.RANDOM.nextFloat() * 0.5F),
+                (double) (yPos + GTPPCore.RANDOM.nextFloat() * 0.5F),
+                (double) (zPos + GTPPCore.RANDOM.nextFloat() * 0.5F),
                 (double) xSpd,
                 (double) ySpd,
                 (double) zSpd);
@@ -322,8 +321,8 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
             aWorld.spawnParticle(
                 name,
                 (double) (xPos + ran2 * 0.5F),
-                (double) (yPos + CORE.RANDOM.nextFloat() * 0.5F),
-                (double) (zPos + CORE.RANDOM.nextFloat() * 0.5F),
+                (double) (yPos + GTPPCore.RANDOM.nextFloat() * 0.5F),
+                (double) (zPos + GTPPCore.RANDOM.nextFloat() * 0.5F),
                 (double) xSpd,
                 (double) ySpd,
                 (double) zSpd);
@@ -333,8 +332,8 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
             aWorld.spawnParticle(
                 name,
                 (double) (xPos + ran3 * 0.5F),
-                (double) (yPos + CORE.RANDOM.nextFloat() * 0.5F),
-                (double) (zPos + CORE.RANDOM.nextFloat() * 0.5F),
+                (double) (yPos + GTPPCore.RANDOM.nextFloat() * 0.5F),
+                (double) (zPos + GTPPCore.RANDOM.nextFloat() * 0.5F),
                 (double) xSpd,
                 (double) ySpd,
                 (double) zSpd);
@@ -346,12 +345,12 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
 
     @Override
     public GUITextureSet getGUITextureSet() {
-        return new GUITextureSet().setMainBackground(GTPP_UITextures.BACKGROUND_YELLOW)
-            .setItemSlot(GTPP_UITextures.SLOT_ITEM_YELLOW)
+        return new GUITextureSet().setMainBackground(GTPPUITextures.BACKGROUND_YELLOW)
+            .setItemSlot(GTPPUITextures.SLOT_ITEM_YELLOW)
             .setTitleTab(
-                GTPP_UITextures.TAB_TITLE_YELLOW,
-                GTPP_UITextures.TAB_TITLE_DARK_YELLOW,
-                GTPP_UITextures.TAB_TITLE_ANGULAR_YELLOW);
+                GTPPUITextures.TAB_TITLE_YELLOW,
+                GTPPUITextures.TAB_TITLE_DARK_YELLOW,
+                GTPPUITextures.TAB_TITLE_ANGULAR_YELLOW);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchNaquadah.java
index ad94907d4c..43e43a1d4e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchNaquadah.java
@@ -14,25 +14,24 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
-public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_Input {
+public class MTEHatchNaquadah extends MTEHatchInput {
 
     public final FluidStack[] mFluidsToUse = new FluidStack[3];
     public final int mFluidCapacity;
 
-    public GT_MetaTileEntity_Hatch_Naquadah(final int aID, final String aName, final String aNameRegional) {
+    public MTEHatchNaquadah(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional, 6);
         mFluidCapacity = 32000;
         initHatch();
     }
 
-    public GT_MetaTileEntity_Hatch_Naquadah(final String aName, final String[] aDescription,
-        final ITexture[][][] aTextures) {
+    public MTEHatchNaquadah(final String aName, final String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 6, aDescription[0], aTextures);
         mFluidCapacity = 32000;
         initHatch();
@@ -53,13 +52,13 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
     @Override
     public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
         return new ITexture[] { aBaseTexture,
-            new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) };
+            new GTRenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
         return new ITexture[] { aBaseTexture,
-            new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) };
+            new GTRenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) };
     }
 
     public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex,
@@ -67,7 +66,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
         if (side == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0) {
             for (FluidStack f : mFluidsToUse) {
                 if (f != null) {
-                    if (GT_Utility.getFluidForFilledItem(aStack, true)
+                    if (GTUtility.getFluidForFilledItem(aStack, true)
                         .getFluid() == f.getFluid()) {
                         return true;
                     }
@@ -96,7 +95,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Naquadah(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTEHatchNaquadah(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -115,7 +114,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
         String aNaquad = aDescCache[2];
         String[] s2 = new String[] { "Fluid Input for Multiblocks", "Capacity: " + getCapacity() + "L",
             "Accepted Fluid: " + aNaq, "Accepted Fluid: " + aEnrNaq, "Accepted Fluid: " + aNaquad,
-            CORE.GT_Tooltip.get() };
+            GTPPCore.GT_Tooltip.get() };
         return s2;
     }
 
@@ -188,7 +187,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
                 : BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1];
 
             return new ITexture[] { g,
-                new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE) };
+                new GTRenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE) };
         }
 
         return side != facing
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchOutputBattery.java
index 1d6507732c..54303503c0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchOutputBattery.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.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,26 +11,25 @@ import org.apache.commons.lang3.ArrayUtils;
 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.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.xmod.gregtech.api.gui.widget.ElectricSlotWidget;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hatch {
+public class MTEHatchOutputBattery extends MTEHatch {
 
-    public GT_MetaTileEntity_Hatch_OutputBattery(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchOutputBattery(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Dischargeable Item Bus for Multiblocks");
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBattery(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchOutputBattery(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 9 : 16, aDescription, aTextures);
     }
 
@@ -44,7 +43,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
         } else {
             mSlots = 16;
         }
-        return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get());
+        return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -74,12 +73,12 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger) };
     }
 
     @Override
@@ -104,12 +103,12 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_OutputBattery(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchOutputBattery(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -134,8 +133,8 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
     protected void fillStacksIntoFirstSlots() {
         for (int i = 0; i < mInventory.length; i++)
             for (int j = i + 1; j < mInventory.length; j++) if (mInventory[j] != null
-                && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) {
-                    GT_Utility.moveStackFromSlotAToSlotB(
+                && (mInventory[i] == null || GTUtility.areStacksEqual(mInventory[i], mInventory[j]))) {
+                    GTUtility.moveStackFromSlotAToSlotB(
                         getBaseMetaTileEntity(),
                         getBaseMetaTileEntity(),
                         j,
@@ -182,7 +181,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
                         if (mMetaTileEntity.mInventory[i] != null
                             && mMetaTileEntity.getEUVar() < aBaseMetaTileEntity.getEUCapacity()) {
                             aBaseMetaTileEntity.increaseStoredEnergyUnits(
-                                GT_ModHandler.dischargeElectricItem(
+                                GTModHandler.dischargeElectricItem(
                                     mMetaTileEntity.mInventory[i],
                                     (int) Math.min(
                                         V[mTier] * 15,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchReservoir.java
index bfe8290240..23231cc6e9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchReservoir.java
@@ -7,24 +7,23 @@ import net.minecraftforge.fluids.FluidRegistry;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_FluidGenerator {
+public class MTEHatchReservoir extends MTEHatchFluidGenerator {
 
-    public GT_MetaTileEntity_Hatch_Reservoir(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTEHatchReservoir(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_Hatch_Reservoir(final String aName, final int aTier, final String[] aDescription,
+    public MTEHatchReservoir(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Reservoir(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEHatchReservoir(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -65,11 +64,11 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
 
     @Override
     public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Water) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Water) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Solidifier.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java
index 2f8c704cad..ce3337c34b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Solidifier.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java
@@ -10,14 +10,14 @@ import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
 import gregtech.api.enums.ItemList;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_Input {
+public class MTEHatchSolidifier extends MTEHatchInput {
 
     static final int moldSlot = 2;
     static final ItemStack[] solidifierMolds = { ItemList.Shape_Mold_Bottle.get(1), ItemList.Shape_Mold_Plate.get(1),
@@ -32,7 +32,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_
         ItemList.Shape_Mold_Pipe_Large.get(1), ItemList.Shape_Mold_Pipe_Huge.get(1),
         ItemList.Shape_Mold_ToolHeadDrill.get(1) };
 
-    public GT_MetaTileEntity_Hatch_Solidifier(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchSolidifier(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
@@ -42,7 +42,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_
             "Fluid Input with Mold for " + EnumChatFormatting.YELLOW
                 + "Large Processing Factory"
                 + EnumChatFormatting.RESET,
-            "#22 Circuit is imprinted in Hatch", "Capacity: " + GT_Utility.formatNumbers(getCapacity()) + "L",
+            "#22 Circuit is imprinted in Hatch", "Capacity: " + GTUtility.formatNumbers(getCapacity()) + "L",
             "Added by: " + EnumChatFormatting.AQUA
                 + "Quetz4l"
                 + " - "
@@ -51,8 +51,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_
                 + EnumChatFormatting.RESET };
     }
 
-    public GT_MetaTileEntity_Hatch_Solidifier(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchSolidifier(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, getSlots(aTier), aTier, aDescription, aTextures);
     }
 
@@ -73,7 +72,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_
     public boolean isItemValidForSlot(int aIndex, ItemStack aStack) {
         if (aIndex == moldSlot && aStack != null) {
             for (final ItemStack itemStack : solidifierMolds) {
-                if (GT_Utility.areStacksEqual(itemStack, aStack, true)) {
+                if (GTUtility.areStacksEqual(itemStack, aStack, true)) {
                     return true;
                 }
             }
@@ -86,7 +85,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Solidifier(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchSolidifier(mName, mTier, mDescriptionArray, mTextures);
     }
 
     public ItemStack getMold() {
@@ -98,7 +97,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_
         super.addUIWidgets(builder, buildContext);
         builder.widget(
             new SlotWidget(new MoldSlot(inventoryHandler, moldSlot)).setPos(125, 35)
-                .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_MOLD)
+                .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_MOLD)
                 .setSize(18, 18));
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSteamBusOutput.java
index 5868995d49..52864b8bea 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSteamBusOutput.java
@@ -10,20 +10,20 @@ import net.minecraftforge.common.util.ForgeDirection;
 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.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.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.render.TextureFactory;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 
-public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_Hatch {
+public class MTEHatchSteamBusOutput extends MTEHatch {
 
-    public GT_MetaTileEntity_Hatch_Steam_BusOutput(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchSteamBusOutput(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -31,29 +31,27 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
             aTier,
             4,
             new String[] { "Item Output for Steam Multiblocks", "Does not automatically export items",
-                "Capacity: 4 stacks", "Does not work with non-steam multiblocks", CORE.GT_Tooltip.get() });
+                "Capacity: 4 stacks", "Does not work with non-steam multiblocks", GTPPCore.GT_Tooltip.get() });
     }
 
-    public GT_MetaTileEntity_Hatch_Steam_BusOutput(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchSteamBusOutput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Steam_BusOutput(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchSteamBusOutput(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
     @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) };
     }
@@ -80,12 +78,12 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Steam_BusOutput(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchSteamBusOutput(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -124,83 +122,83 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
     }
 
     public ITexture[] getSideFacingActive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
     }
 
     public ITexture[] getSideFacingInactive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
     }
 
     public ITexture[] getFrontFacingActive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
     }
 
     public ITexture[] getFrontFacingInactive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
     }
 
     public ITexture[] getTopFacingActive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) };
     }
 
     public ITexture[] getTopFacingInactive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) };
     }
 
     public ITexture[] getBottomFacingActive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) };
     }
 
     public ITexture[] getBottomFacingInactive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) };
     }
 
     public ITexture[] getBottomFacingPipeActive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     public ITexture[] getBottomFacingPipeInactive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     public ITexture[] getTopFacingPipeActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            new GTRenderedTexture(
                 mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     public ITexture[] getTopFacingPipeInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            new GTRenderedTexture(
                 mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     public ITexture[] getSideFacingPipeActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            new GTRenderedTexture(
                 mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     public ITexture[] getSideFacingPipeInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            new GTRenderedTexture(
                 mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSuperBusInput.java
index 5794e6adf8..e95cea2762 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSuperBusInput.java
@@ -8,16 +8,16 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gtPlusPlus.core.lib.GTPPCore;
 
-public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_InputBus {
+public class MTEHatchSuperBusInput extends MTEHatchInputBus {
 
-    public GT_MetaTileEntity_SuperBus_Input(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchSuperBusInput(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, getSlots(aTier) + 1);
     }
 
-    public GT_MetaTileEntity_SuperBus_Input(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchSuperBusInput(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, getSlots(aTier) + 1, aDescription, aTextures);
     }
 
@@ -33,13 +33,13 @@ public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_In
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_SuperBus_Input(this.mName, this.mTier, mDescriptionArray, this.mTextures);
+        return new MTEHatchSuperBusInput(this.mName, this.mTier, mDescriptionArray, this.mTextures);
     }
 
     @Override
     public String[] getDescription() {
         return new String[] { "Item Input for Multiblocks", "" + getSlots(this.mTier) + " Slots",
-            CORE.GT_Tooltip.get() };
+            GTPPCore.GT_Tooltip.get() };
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbine.java
index 6c545af332..09c3dd6efb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbine.java
@@ -14,43 +14,43 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.SoundResource;
-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.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargerTurbineBase;
 
 @SuppressWarnings("deprecation")
-public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
+public class MTEHatchTurbine extends MTEHatch {
 
     public boolean mHasController = false;
     public boolean mUsingAnimation = true;
     private String mControllerLocation;
     public int mEUt = 0;
 
-    public GT_MetaTileEntity_Hatch_Turbine(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchTurbine(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 16, "Turbine Rotor holder for XL Turbines");
     }
 
-    public GT_MetaTileEntity_Hatch_Turbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEHatchTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Turbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription[0], aTextures);
     }
 
@@ -63,7 +63,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
             "Right Click with a screwdriver for technical information",
             "Sneak + Right Click with a wrench to rotate",
             "Sneak + Right Click with a screwdriver to disable animations",
-            CORE.GT_Tooltip.get());
+            GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -106,7 +106,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
 
     public boolean hasTurbine() {
         ItemStack aStack = this.mInventory[0];
-        boolean aIsValid = GregtechMetaTileEntity_LargerTurbineBase.isValidTurbine(aStack);
+        boolean aIsValid = MTELargerTurbineBase.isValidTurbine(aStack);
         return aIsValid;
     }
 
@@ -122,7 +122,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
     }
 
     public boolean insertTurbine(ItemStack aTurbine) {
-        if (GregtechMetaTileEntity_LargerTurbineBase.isValidTurbine(aTurbine)) {
+        if (MTELargerTurbineBase.isValidTurbine(aTurbine)) {
             this.mInventory[0] = aTurbine;
             return true;
         }
@@ -131,12 +131,12 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Turbine(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchTurbine(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -164,7 +164,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
     public void damageTurbine(long aEUt, int damageFactorLow, float damageFactorHigh) {
         if (hasTurbine() && MathUtils.randInt(0, 1) == 0) {
             ItemStack aTurbine = getTurbine();
-            ((GT_MetaGenerated_Tool) aTurbine.getItem()).doDamage(
+            ((MetaGeneratedTool) aTurbine.getItem()).doDamage(
                 aTurbine,
                 (long) getDamageToComponent(aTurbine)
                     * (long) Math.min((float) aEUt / (float) damageFactorLow, Math.pow(aEUt, damageFactorHigh)));
@@ -214,7 +214,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
     }
 
     public boolean isControllerActive() {
-        GregtechMetaTileEntity_LargerTurbineBase x = getController();
+        MTELargerTurbineBase x = getController();
         if (x != null) {
             // Logger.INFO("Checking Status of Controller. Running? "+(x.mEUt > 0));
             return x.lEUt > 0;
@@ -223,16 +223,15 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
         return false;
     }
 
-    public GregtechMetaTileEntity_LargerTurbineBase getController() {
+    public MTELargerTurbineBase getController() {
         if (this.mHasController && this.mControllerLocation != null && this.mControllerLocation.length() > 0) {
             BlockPos p = BlockPos.generateBlockPos(mControllerLocation);
             if (p != null) {
                 // Logger.INFO(p.getLocationString());
                 IGregTechTileEntity tTileEntity = getBaseMetaTileEntity()
                     .getIGregTechTileEntity(p.xPos, p.yPos, p.zPos);
-                if (tTileEntity != null
-                    && tTileEntity.getMetaTileEntity() instanceof GregtechMetaTileEntity_LargerTurbineBase) {
-                    return (GregtechMetaTileEntity_LargerTurbineBase) tTileEntity.getMetaTileEntity();
+                if (tTileEntity != null && tTileEntity.getMetaTileEntity() instanceof MTELargerTurbineBase) {
+                    return (MTELargerTurbineBase) tTileEntity.getMetaTileEntity();
                 } else {
                     if (tTileEntity == null) {
                         Logger.INFO("Controller MTE is null, somehow?");
@@ -275,8 +274,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
     private ITexture getFrontFacingTurbineTexture() {
         if (!mHasController) {
             return this.getBaseMetaTileEntity()
-                .isActive() ? new GT_RenderedTexture(LARGETURBINE_ST_ACTIVE5)
-                    : new GT_RenderedTexture(LARGETURBINE_ST5);
+                .isActive() ? new GTRenderedTexture(LARGETURBINE_ST_ACTIVE5) : new GTRenderedTexture(LARGETURBINE_ST5);
         } else {
             if (usingAnimations()) {
                 if (isControllerActive()) {
@@ -313,7 +311,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return false;
     }
 
@@ -335,9 +333,9 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
                     .isActive());
             PlayerUtils.messagePlayer(aPlayer, "Has Turbine inserted? " + this.hasTurbine());
             if (this.hasTurbine()) {
-                Materials aMat = GT_MetaGenerated_Tool.getPrimaryMaterial(getTurbine());
-                String aSize = GregtechMetaTileEntity_LargerTurbineBase
-                    .getTurbineSizeString(GregtechMetaTileEntity_LargerTurbineBase.getTurbineSize(getTurbine()));
+                Materials aMat = MetaGeneratedTool.getPrimaryMaterial(getTurbine());
+                String aSize = MTELargerTurbineBase
+                    .getTurbineSizeString(MTELargerTurbineBase.getTurbineSize(getTurbine()));
                 PlayerUtils.messagePlayer(aPlayer, "Using: " + aMat.mLocalizedName + " " + aSize);
             }
         } else {
@@ -357,7 +355,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
             .isServerSide() && !aPlayer.isSneaking()) {
             ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
             if (tCurrentItem != null) {
-                if (tCurrentItem.getItem() instanceof GT_MetaGenerated_Tool) {
+                if (tCurrentItem.getItem() instanceof MetaGeneratedTool) {
                     return onToolClick(tCurrentItem, aPlayer, wrenchingSide);
                 }
             }
@@ -372,7 +370,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
             .isServerSide()) {
             ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
             if (tCurrentItem != null) {
-                if (tCurrentItem.getItem() instanceof GT_MetaGenerated_Tool) {
+                if (tCurrentItem.getItem() instanceof MetaGeneratedTool) {
                     return onToolClick(tCurrentItem, aPlayer, wrenchingSide);
                 }
             }
@@ -381,30 +379,30 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
     }
 
     public boolean onToolClick(ItemStack tCurrentItem, EntityPlayer aPlayer, ForgeDirection side) {
-        if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList)) {
+        if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList)) {
             boolean aHasTurbine = this.hasTurbine();
             if (aPlayer.inventory.getFirstEmptyStack() >= 0 && aHasTurbine) {
                 if (PlayerUtils.isCreative(aPlayer)
-                    || GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                    || GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
                     aPlayer.inventory.addItemStackToInventory((this.getTurbine()));
                     this.mInventory[0] = null;
-                    GT_Utility.sendChatToPlayer(aPlayer, "Removed turbine with wrench.");
+                    GTUtility.sendChatToPlayer(aPlayer, "Removed turbine with wrench.");
                     return true;
                 }
             } else {
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
                     aHasTurbine ? "Cannot remove turbine, no free inventory space." : "No turbine to remove.");
             }
-        } else if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)) {
+        } else if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList)) {
             if (mControllerLocation != null && mControllerLocation.length() > 0) {
                 if (setController(BlockPos.generateBlockPos(mControllerLocation))) {
                     if (PlayerUtils.isCreative(aPlayer)
-                        || GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                        || GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
                         String tChat = "Trying to Reset linked Controller";
                         IGregTechTileEntity g = this.getBaseMetaTileEntity();
-                        GT_Utility.sendChatToPlayer(aPlayer, tChat);
-                        GT_Utility.sendSoundToPlayers(
+                        GTUtility.sendChatToPlayer(aPlayer, tChat);
+                        GTUtility.sendSoundToPlayers(
                             g.getWorld(),
                             SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE,
                             1.0F,
@@ -423,7 +421,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new SlotWidget(inventoryHandler, 0).setFilter(GregtechMetaTileEntity_LargerTurbineBase::isValidTurbine)
+            new SlotWidget(inventoryHandler, 0).setFilter(MTELargerTurbineBase::isValidTurbine)
                 .setAccess(false, true)
                 .setPos(79, 34));
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbineProvider.java
index e9626a310c..6a501a2531 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbineProvider.java
@@ -14,34 +14,29 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbine;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargerTurbineBase;
 
-public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_Hatch_InputBus {
+public class MTEHatchTurbineProvider extends MTEHatchInputBus {
 
-    public GT_MetaTileEntity_Hatch_TurbineProvider(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchTurbineProvider(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_Hatch_TurbineProvider(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchTurbineProvider(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_TurbineProvider(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEHatchTurbineProvider(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -50,10 +45,10 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
             "Will attempt once per 1200 ticks to fill the turbine slot of it's parent turbine",
             "You may adjust this with a screwdriver", "Hold shift to adjust in finer amounts",
             "Hold control to adjust direction", "Left Click with Screwdriver to reset",
-            "This module assumes the entire turbine is in the same Chunk", CORE.GT_Tooltip.get() };
+            "This module assumes the entire turbine is in the same Chunk", GTPPCore.GT_Tooltip.get() };
     }
 
-    private GT_MetaTileEntity_LargeTurbine mParent = null;
+    private MTELargeTurbine mParent = null;
 
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
@@ -75,8 +70,8 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
                 if (aMetaTileEntity == null) {
                     continue;
                 }
-                if (aMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine aTurb) {
-                    for (GT_MetaTileEntity_Hatch_InputBus ee : aTurb.mInputBusses) {
+                if (aMetaTileEntity instanceof MTELargeTurbine aTurb) {
+                    for (MTEHatchInputBus ee : aTurb.mInputBusses) {
                         if (ee.equals(this)) {
                             mParent = aTurb;
                             Logger.INFO("Found a Parent to attach to this housing.");
@@ -114,7 +109,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
     }
 
     public boolean isItemStackTurbine(ItemStack aStack) {
-        if (aStack.getItem() instanceof GT_MetaGenerated_Tool) {
+        if (aStack.getItem() instanceof MetaGeneratedTool) {
             if (aStack.getItemDamage() >= 170 && aStack.getItemDamage() <= 176) {
                 return true;
             }
@@ -123,7 +118,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
     }
 
     public boolean isItemStackScrewdriver(ItemStack aStack) {
-        if (aStack.getItem() instanceof GT_MetaGenerated_Tool) {
+        if (aStack.getItem() instanceof MetaGeneratedTool) {
             if (aStack.getItemDamage() == 22 || aStack.getItemDamage() == 150) {
                 return true;
             }
@@ -214,7 +209,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new SlotWidget(inventoryHandler, 0).setFilter(GregtechMetaTileEntity_LargerTurbineBase::isValidTurbine)
+            new SlotWidget(inventoryHandler, 0).setFilter(MTELargerTurbineBase::isValidTurbine)
                 .setAccess(false, true)
                 .setPos(79, 34));
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTESuperBusOutput.java
index f5f80bed11..686589b38a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTESuperBusOutput.java
@@ -7,21 +7,21 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.Scrollable;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.gui.widgets.GT_PhantomItemButton;
+import gregtech.api.gui.widgets.PhantomItemButton;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTEHatchOutputBus;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 
-public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_OutputBus {
+public class MTESuperBusOutput extends MTEHatchOutputBus {
 
-    public GT_MetaTileEntity_SuperBus_Output(int id, String name, String nameRegional, int tier) {
+    public MTESuperBusOutput(int id, String name, String nameRegional, int tier) {
         super(id, name, nameRegional, tier, getSlots(tier));
     }
 
-    public GT_MetaTileEntity_SuperBus_Output(String name, int tier, String[] description, ITexture[][][] textures) {
+    public MTESuperBusOutput(String name, int tier, String[] description, ITexture[][][] textures) {
         super(name, tier, getSlots(tier), description, textures);
     }
 
@@ -42,7 +42,7 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_SuperBus_Output(this.mName, this.mTier, mDescriptionArray, this.mTextures);
+        return new MTESuperBusOutput(this.mName, this.mTier, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -66,8 +66,8 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O
         for (int i = 0; i < this.mInventory.length; ++i) {
             for (int j = i + 1; j < this.mInventory.length; ++j) {
                 if (this.mInventory[j] != null && (this.mInventory[i] == null
-                    || GT_Utility.areStacksEqual(this.mInventory[i], this.mInventory[j]))) {
-                    GT_Utility.moveStackFromSlotAToSlotB(
+                    || GTUtility.areStacksEqual(this.mInventory[i], this.mInventory[j]))) {
+                    GTUtility.moveStackFromSlotAToSlotB(
                         (IInventory) this.getBaseMetaTileEntity(),
                         (IInventory) this.getBaseMetaTileEntity(),
                         j,
@@ -85,7 +85,7 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O
     public String[] getDescription() {
         String[] aDesc = new String[] { "Item Output for Multiblocks", "" + getSlots(this.mTier) + " Slots",
             "Left click with data stick to save filter config", "Right click with data stick to load filter config",
-            CORE.GT_Tooltip.get() };
+            GTPPCore.GT_Tooltip.get() };
         return aDesc;
     }
 
@@ -106,8 +106,8 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O
 
         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/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTETreeFarmerStructural.java
index 0aaaa75584..dca1cfbfa4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTETreeFarmerStructural.java
@@ -6,24 +6,23 @@ 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.objects.GT_RenderedTexture;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaTreeFarmerBase;
+import gregtech.api.objects.GTRenderedTexture;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.MTETreeFarmerBase;
 
-public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase {
+public class MTETreeFarmerStructural extends MTETreeFarmerBase {
 
-    public GregtechMetaTreeFarmerStructural(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTETreeFarmerStructural(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "Structural Blocks for the Tree Farmer.");
     }
 
-    public GregtechMetaTreeFarmerStructural(final String aName, final int aTier, final int aInvSlotCount,
+    public MTETreeFarmerStructural(final String aName, final int aTier, final int aInvSlotCount,
         final String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTreeFarmerStructural(
+        return new MTETreeFarmerStructural(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -33,7 +32,7 @@ public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase
 
     @Override
     public ITexture getOverlayIcon() {
-        return new GT_RenderedTexture(Textures.BlockIcons.VOID);
+        return new GTRenderedTexture(Textures.BlockIcons.VOID);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MteHatchSteamBusInput.java
index 457eca1dad..5de87c4a50 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MteHatchSteamBusInput.java
@@ -11,25 +11,25 @@ import net.minecraftforge.common.util.ForgeDirection;
 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.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.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 
-public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Hatch {
+public class MteHatchSteamBusInput extends MTEHatch {
 
     public RecipeMap<?> mRecipeMap = null;
     public boolean disableSort;
 
-    public GT_MetaTileEntity_Hatch_Steam_BusInput(int aID, String aName, String aNameRegional, int aTier) {
+    public MteHatchSteamBusInput(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -38,29 +38,27 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
             getSlots(aTier),
             new String[] { "Item Input for Steam Multiblocks",
                 "Shift + right click with screwdriver to toggle automatic item shuffling", "Capacity: 4 stacks",
-                "Does not work with non-steam multiblocks", CORE.GT_Tooltip.get() });
+                "Does not work with non-steam multiblocks", GTPPCore.GT_Tooltip.get() });
     }
 
-    public GT_MetaTileEntity_Hatch_Steam_BusInput(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MteHatchSteamBusInput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Hatch_Steam_BusInput(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MteHatchSteamBusInput(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, 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) };
     }
@@ -87,12 +85,12 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Steam_BusInput(mName, mTier, mDescriptionArray, mTextures);
+        return new MteHatchSteamBusInput(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -116,8 +114,8 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
         } else {
             for (int i = 0; i < mInventory.length; i++)
                 for (int j = i + 1; j < mInventory.length; j++) if (mInventory[j] != null
-                    && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j])))
-                    GT_Utility.moveStackFromSlotAToSlotB(
+                    && (mInventory[i] == null || GTUtility.areStacksEqual(mInventory[i], mInventory[j])))
+                    GTUtility.moveStackFromSlotAToSlotB(
                         getBaseMetaTileEntity(),
                         getBaseMetaTileEntity(),
                         j,
@@ -145,10 +143,10 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
     public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aPlayer.isSneaking()) {
             disableSort = !disableSort;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
-                GT_Utility.trans("200.1", "Automatic Item Shuffling: ")
-                    + (disableSort ? GT_Utility.trans("087", "Disabled") : GT_Utility.trans("088", "Enabled")));
+                GTUtility.trans("200.1", "Automatic Item Shuffling: ")
+                    + (disableSort ? GTUtility.trans("087", "Disabled") : GTUtility.trans("088", "Enabled")));
         }
     }
 
@@ -188,83 +186,83 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
     }
 
     public ITexture[] getSideFacingActive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
     }
 
     public ITexture[] getSideFacingInactive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
     }
 
     public ITexture[] getFrontFacingActive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
     }
 
     public ITexture[] getFrontFacingInactive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
     }
 
     public ITexture[] getTopFacingActive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) };
     }
 
     public ITexture[] getTopFacingInactive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) };
     }
 
     public ITexture[] getBottomFacingActive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) };
     }
 
     public ITexture[] getBottomFacingInactive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) };
     }
 
     public ITexture[] getBottomFacingPipeActive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     public ITexture[] getBottomFacingPipeInactive(byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(
+        return new ITexture[] { new GTRenderedTexture(
             mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     public ITexture[] getTopFacingPipeActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            new GTRenderedTexture(
                 mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     public ITexture[] getTopFacingPipeInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            new GTRenderedTexture(
                 mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     public ITexture[] getSideFacingPipeActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            new GTRenderedTexture(
                 mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     public ITexture[] getSideFacingPipeInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            new GTRenderedTexture(
                 mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMetaTileEntity.java
index e260347ca5..f8bea768da 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMetaTileEntity.java
@@ -1,11 +1,11 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
 
-import static gregtech.api.enums.GT_Values.GT;
+import static gregtech.api.enums.GTValues.GT;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public abstract class GregtechMetaTileEntity extends MetaTileEntity {
+public abstract class GTPPMetaTileEntity extends MetaTileEntity {
 
     /**
      * Value between [0 - 9] to describe the Tier of this Machine.
@@ -22,7 +22,7 @@ public abstract class GregtechMetaTileEntity extends MetaTileEntity {
      */
     public final ITexture[][][] mTextures;
 
-    public GregtechMetaTileEntity(final int aID, final String aName, final String aNameRegional, final int aTier,
+    public GTPPMetaTileEntity(final int aID, final String aName, final String aNameRegional, final int aTier,
         final int aInvSlotCount, final String aDescription, final ITexture... aTextures) {
         super(aID, aName, aNameRegional, aInvSlotCount);
         this.mTier = (byte) Math.max(0, Math.min(aTier, 9));
@@ -36,8 +36,8 @@ public abstract class GregtechMetaTileEntity extends MetaTileEntity {
         }
     }
 
-    public GregtechMetaTileEntity(final String aName, final int aTier, final int aInvSlotCount,
-        final String aDescription, final ITexture[][][] aTextures) {
+    public GTPPMetaTileEntity(final String aName, final int aTier, final int aInvSlotCount, final String aDescription,
+        final ITexture[][][] aTextures) {
         super(aName, aInvSlotCount);
         this.mTier = (byte) aTier;
         this.mDescription = aDescription;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java
index 1417f53c01..dad53f54f6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
 
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -45,36 +45,36 @@ import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.VoidingMode;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 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.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchMaintenance;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutputBus;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.IGT_HatchAdder;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.ID_MetaTool_01;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.IGTHatchAdder;
+import gregtech.common.items.IDMetaTool01;
+import gregtech.common.items.MetaGeneratedTool01;
 import gregtech.common.tileentities.machines.IDualInputHatch;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.GTplusplus.INIT_PHASE;
@@ -83,12 +83,14 @@ import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 import gtPlusPlus.preloader.asm.AsmConfig;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBattery;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBattery;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchInputBattery;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchOutputBattery;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MteHatchSteamBusInput;
+import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoMulti;
+import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti;
 
 // Glee8e - 11/12/21 - 2:15pm
 // Yeah, now I see what's wrong. Someone inherited from GregtechMeta_MultiBlockBase instead of
@@ -96,28 +98,28 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEn
 // so any method in GregtechMetaTileEntity_IndustrialDehydrator would see generic field declared in
 // GregtechMeta_MultiBlockBase without generic parameter
 
-public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T>>
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> {
+public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBase<T>>
+    extends MTEExtendedPowerMultiBlockBase<T> {
 
     public static final boolean DEBUG_DISABLE_CORES_TEMPORARILY = true;
 
-    public GT_Recipe mLastRecipe;
+    public GTRecipe mLastRecipe;
 
     /**
      * Don't use this for recipe input check, otherwise you'll get duplicated fluids
      */
-    public ArrayList<GT_MetaTileEntity_Hatch_AirIntake> mAirIntakes = new ArrayList<>();
+    public ArrayList<METHatchAirIntake> mAirIntakes = new ArrayList<>();
 
-    public ArrayList<GT_MetaTileEntity_Hatch_InputBattery> mChargeHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_OutputBattery> mDischargeHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch> mAllEnergyHatches = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch> mAllDynamoHatches = new ArrayList<>();
+    public ArrayList<MTEHatchInputBattery> mChargeHatches = new ArrayList<>();
+    public ArrayList<MTEHatchOutputBattery> mDischargeHatches = new ArrayList<>();
+    public ArrayList<MTEHatch> mAllEnergyHatches = new ArrayList<>();
+    public ArrayList<MTEHatch> mAllDynamoHatches = new ArrayList<>();
 
-    public GregtechMeta_MultiBlockBase(final int aID, final String aName, final String aNameRegional) {
+    public GTPPMultiBlockBase(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMeta_MultiBlockBase(final String aName) {
+    public GTPPMultiBlockBase(final String aName) {
         super(aName);
     }
 
@@ -205,7 +207,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
                         + StatCollector.translateToLocal("GTPP.machines.tier")
                         + ": "
                         + EnumChatFormatting.YELLOW
-                        + GT_Values.VN[GT_Utility.getTier(getMaxInputVoltage())]
+                        + GTValues.VN[GTUtility.getTier(getMaxInputVoltage())]
                         + EnumChatFormatting.RESET));;
         }
         if (!this.mAllDynamoHatches.isEmpty()) {
@@ -300,7 +302,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     public int getPollutionReductionForAllMufflers() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             mPollutionReduction = Math.max(calculatePollutionReductionForHatch(tHatch, 100), mPollutionReduction);
         }
         return mPollutionReduction;
@@ -308,7 +310,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     public long getStoredEnergyInAllEnergyHatches() {
         long storedEnergy = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mAllEnergyHatches)) {
+        for (MTEHatch tHatch : filterValidMTEs(mAllEnergyHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
         }
@@ -317,7 +319,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     public long getMaxEnergyStorageOfAllEnergyHatches() {
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mAllEnergyHatches)) {
+        for (MTEHatch tHatch : filterValidMTEs(mAllEnergyHatches)) {
             maxEnergy += tHatch.getBaseMetaTileEntity()
                 .getEUCapacity();
         }
@@ -326,7 +328,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     public long getStoredEnergyInAllDynamoHatches() {
         long storedEnergy = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mAllDynamoHatches)) {
+        for (MTEHatch tHatch : filterValidMTEs(mAllDynamoHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
         }
@@ -335,7 +337,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     public long getMaxEnergyStorageOfAllDynamoHatches() {
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mAllDynamoHatches)) {
+        for (MTEHatch tHatch : filterValidMTEs(mAllDynamoHatches)) {
             maxEnergy += tHatch.getBaseMetaTileEntity()
                 .getEUCapacity();
         }
@@ -383,7 +385,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     public void log(String s) {
         if (!AsmConfig.disableAllLogging) {
-            if (CORE_Preloader.DEBUG_MODE) {
+            if (PreloaderCore.DEBUG_MODE) {
                 Logger.INFO(s);
             } else {
                 Logger.MACHINE_INFO(s);
@@ -393,7 +395,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+        logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
         logic.setAvailableAmperage(1L);
     }
 
@@ -404,11 +406,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
             return mEnergyHatches.get(0)
                 .getBaseMetaTileEntity()
                 .getInputVoltage();
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches))
-            rEnergy += tHatch.getBaseMetaTileEntity()
-                .getInputVoltage()
-                * tHatch.getBaseMetaTileEntity()
-                    .getInputAmperage();
+        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) rEnergy += tHatch.getBaseMetaTileEntity()
+            .getInputVoltage()
+            * tHatch.getBaseMetaTileEntity()
+                .getInputAmperage();
         return rEnergy;
     }
 
@@ -422,27 +423,27 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     @Override
     public void explodeMultiblock() {
         MetaTileEntity tTileEntity;
-        for (final Iterator<GT_MetaTileEntity_Hatch_InputBattery> localIterator = this.mChargeHatches
-            .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity()
-                .doExplosion(gregtech.api.enums.GT_Values.V[8])) {
+        for (final Iterator<MTEHatchInputBattery> localIterator = this.mChargeHatches.iterator(); localIterator
+            .hasNext(); tTileEntity.getBaseMetaTileEntity()
+                .doExplosion(GTValues.V[8])) {
             tTileEntity = localIterator.next();
         }
         tTileEntity = null;
-        for (final Iterator<GT_MetaTileEntity_Hatch_OutputBattery> localIterator = this.mDischargeHatches
-            .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity()
-                .doExplosion(gregtech.api.enums.GT_Values.V[8])) {
+        for (final Iterator<MTEHatchOutputBattery> localIterator = this.mDischargeHatches.iterator(); localIterator
+            .hasNext(); tTileEntity.getBaseMetaTileEntity()
+                .doExplosion(GTValues.V[8])) {
             tTileEntity = localIterator.next();
         }
         tTileEntity = null;
-        for (final Iterator<GT_MetaTileEntity_Hatch> localIterator = this.mTecTechDynamoHatches
-            .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity()
-                .doExplosion(gregtech.api.enums.GT_Values.V[8])) {
+        for (final Iterator<MTEHatch> localIterator = this.mTecTechDynamoHatches.iterator(); localIterator
+            .hasNext(); tTileEntity.getBaseMetaTileEntity()
+                .doExplosion(GTValues.V[8])) {
             tTileEntity = localIterator.next();
         }
         tTileEntity = null;
-        for (final Iterator<GT_MetaTileEntity_Hatch> localIterator = this.mTecTechEnergyHatches
-            .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity()
-                .doExplosion(gregtech.api.enums.GT_Values.V[8])) {
+        for (final Iterator<MTEHatch> localIterator = this.mTecTechEnergyHatches.iterator(); localIterator
+            .hasNext(); tTileEntity.getBaseMetaTileEntity()
+                .doExplosion(GTValues.V[8])) {
             tTileEntity = localIterator.next();
         }
 
@@ -470,7 +471,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     public ItemStack findItemInInventory(ItemStack aSearchStack) {
         if (aSearchStack != null && this.mInputBusses.size() > 0) {
-            for (GT_MetaTileEntity_Hatch_InputBus bus : this.mInputBusses) {
+            for (MTEHatchInputBus bus : this.mInputBusses) {
                 if (bus != null) {
                     for (ItemStack uStack : bus.mInventory) {
                         if (uStack != null) {
@@ -490,9 +491,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
      * Deplete fluid input from a set of restricted hatches. This assumes these hatches can store nothing else but your
      * expected fluid
      */
-    protected boolean depleteInputFromRestrictedHatches(Collection<GT_MetaTileEntity_Hatch_CustomFluidBase> aHatches,
-        int aAmount) {
-        for (final GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(aHatches)) {
+    protected boolean depleteInputFromRestrictedHatches(Collection<MTEHatchCustomFluidBase> aHatches, int aAmount) {
+        for (final MTEHatchCustomFluidBase tHatch : filterValidMTEs(aHatches)) {
             FluidStack tLiquid = tHatch.getFluid();
             if (tLiquid == null || tLiquid.amount < aAmount) {
                 continue;
@@ -508,10 +508,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     @Override
     public void updateSlots() {
-        for (final GT_MetaTileEntity_Hatch_InputBattery tHatch : filterValidMTEs(this.mChargeHatches)) {
+        for (final MTEHatchInputBattery tHatch : filterValidMTEs(this.mChargeHatches)) {
             tHatch.updateSlots();
         }
-        for (final GT_MetaTileEntity_Hatch_OutputBattery tHatch : filterValidMTEs(this.mDischargeHatches)) {
+        for (final MTEHatchOutputBattery tHatch : filterValidMTEs(this.mDischargeHatches)) {
             tHatch.updateSlots();
         }
         super.updateSlots();
@@ -554,18 +554,18 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         // Try setRecipeMap
 
         try {
-            if (aTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-                resetRecipeMapForHatch((GT_MetaTileEntity_Hatch) aTileEntity, getRecipeMap());
+            if (aTileEntity instanceof MTEHatchInput) {
+                resetRecipeMapForHatch((MTEHatch) aTileEntity, getRecipeMap());
             }
-            if (aTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
-                resetRecipeMapForHatch((GT_MetaTileEntity_Hatch) aTileEntity, getRecipeMap());
+            if (aTileEntity instanceof MTEHatchInputBus) {
+                resetRecipeMapForHatch((MTEHatch) aTileEntity, getRecipeMap());
             }
         } catch (Throwable t) {
             t.printStackTrace();
         }
 
         if (aList.isEmpty()) {
-            if (aTileEntity instanceof GT_MetaTileEntity_Hatch) {
+            if (aTileEntity instanceof MTEHatch) {
                 if (GTplusplus.CURRENT_LOAD_PHASE == INIT_PHASE.STARTED) {
                     log(
                         "Adding " + aTileEntity.getInventoryName()
@@ -600,7 +600,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
                     }
                 }
             }
-            if (aTileEntity instanceof GT_MetaTileEntity_Hatch) {
+            if (aTileEntity instanceof MTEHatch) {
                 if (GTplusplus.CURRENT_LOAD_PHASE == INIT_PHASE.STARTED) {
                     log("Adding " + aCur.getInventoryName() + " at " + aCurPos.getLocationString());
                 }
@@ -633,13 +633,13 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         boolean aDidAdd = false;
 
         // Handle Custom Hatches
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBattery) {
+        if (aMetaTileEntity instanceof MTEHatchInputBattery) {
             log("Found GT_MetaTileEntity_Hatch_InputBattery");
             aDidAdd = addToMachineListInternal(mChargeHatches, aMetaTileEntity, aBaseCasingIndex);
-        } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBattery) {
+        } else if (aMetaTileEntity instanceof MTEHatchOutputBattery) {
             log("Found GT_MetaTileEntity_Hatch_OutputBattery");
             aDidAdd = addToMachineListInternal(mDischargeHatches, aMetaTileEntity, aBaseCasingIndex);
-        } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_AirIntake) {
+        } else if (aMetaTileEntity instanceof METHatchAirIntake) {
             aDidAdd = addToMachineListInternal(mAirIntakes, aMetaTileEntity, aBaseCasingIndex)
                 && addToMachineListInternal(mInputHatches, aMetaTileEntity, aBaseCasingIndex);
         }
@@ -659,28 +659,28 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         }
 
         // Handle Fluid Hatches using seperate logic
-        else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input)
+        else if (aMetaTileEntity instanceof MTEHatchInput)
             aDidAdd = addToMachineListInternal(mInputHatches, aMetaTileEntity, aBaseCasingIndex);
-        else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output)
+        else if (aMetaTileEntity instanceof MTEHatchOutput)
             aDidAdd = addToMachineListInternal(mOutputHatches, aMetaTileEntity, aBaseCasingIndex);
 
         // Process Remaining hatches using Vanilla GT Logic
         else if (aMetaTileEntity instanceof IDualInputHatch hatch) {
             hatch.updateCraftingIcon(this.getMachineCraftingIcon());
             aDidAdd = addToMachineListInternal(mDualInputHatches, aMetaTileEntity, aBaseCasingIndex);
-        } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus)
+        } else if (aMetaTileEntity instanceof MTEHatchInputBus)
             aDidAdd = addToMachineListInternal(mInputBusses, aMetaTileEntity, aBaseCasingIndex);
-        else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus)
+        else if (aMetaTileEntity instanceof MTEHatchOutputBus)
             aDidAdd = addToMachineListInternal(mOutputBusses, aMetaTileEntity, aBaseCasingIndex);
-        else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) {
+        else if (aMetaTileEntity instanceof MTEHatchEnergy) {
             aDidAdd = addToMachineListInternal(mEnergyHatches, aMetaTileEntity, aBaseCasingIndex);
             updateMasterEnergyHatchList(aMetaTileEntity);
-        } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) {
+        } else if (aMetaTileEntity instanceof MTEHatchDynamo) {
             aDidAdd = addToMachineListInternal(mDynamoHatches, aMetaTileEntity, aBaseCasingIndex);
             updateMasterDynamoHatchList(aMetaTileEntity);
-        } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance)
+        } else if (aMetaTileEntity instanceof MTEHatchMaintenance)
             aDidAdd = addToMachineListInternal(mMaintenanceHatches, aMetaTileEntity, aBaseCasingIndex);
-        else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler)
+        else if (aMetaTileEntity instanceof MTEHatchMuffler)
             aDidAdd = addToMachineListInternal(mMufflerHatches, aMetaTileEntity, aBaseCasingIndex);
 
         // return super.addToMachineList(aTileEntity, aBaseCasingIndex);
@@ -690,7 +690,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     @Override
     public boolean addMaintenanceToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
+        if (aMetaTileEntity instanceof MTEHatchMaintenance) {
             return addToMachineList(aMetaTileEntity, aBaseCasingIndex);
         }
         return false;
@@ -699,7 +699,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     @Override
     public boolean addMufflerToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) {
+        if (aMetaTileEntity instanceof MTEHatchMuffler) {
             return addToMachineList(aMetaTileEntity, aBaseCasingIndex);
         }
         return false;
@@ -708,8 +708,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     @Override
     public boolean addInputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input
-            || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
+        if (aMetaTileEntity instanceof MTEHatchInput || aMetaTileEntity instanceof MTEHatchInputBus) {
             return addToMachineList(aMetaTileEntity, aBaseCasingIndex);
         }
         return false;
@@ -718,8 +717,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     @Override
     public boolean addOutputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output
-            || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) {
+        if (aMetaTileEntity instanceof MTEHatchOutput || aMetaTileEntity instanceof MTEHatchOutputBus) {
             return addToMachineList(aMetaTileEntity, aBaseCasingIndex);
         }
         return false;
@@ -727,7 +725,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     public boolean addAirIntakeToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) {
         IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_AirIntake) {
+        if (aMetaTileEntity instanceof METHatchAirIntake) {
             return addToMachineList(aMetaTileEntity, aBaseCasingIndex);
         }
         return false;
@@ -738,7 +736,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     }
 
     public boolean addFluidInputToMachineList(final IMetaTileEntity aMetaTileEntity, final int aBaseCasingIndex) {
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
+        if (aMetaTileEntity instanceof MTEHatchInput) {
             return addToMachineList(aMetaTileEntity, aBaseCasingIndex);
         }
         return false;
@@ -754,12 +752,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     public boolean resetRecipeMapForAllInputHatches(RecipeMap<?> aMap) {
         int cleared = 0;
-        for (GT_MetaTileEntity_Hatch_Input g : this.mInputHatches) {
+        for (MTEHatchInput g : this.mInputHatches) {
             if (resetRecipeMapForHatch(g, aMap)) {
                 cleared++;
             }
         }
-        for (GT_MetaTileEntity_Hatch_InputBus g : this.mInputBusses) {
+        for (MTEHatchInputBus g : this.mInputBusses) {
             if (resetRecipeMapForHatch(g, aMap)) {
                 cleared++;
             }
@@ -773,10 +771,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
             if (aMetaTileEntity == null) {
                 return false;
             }
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input
-                || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus
-                || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput) {
-                return resetRecipeMapForHatch((GT_MetaTileEntity_Hatch) aMetaTileEntity, aMap);
+            if (aMetaTileEntity instanceof MTEHatchInput || aMetaTileEntity instanceof MTEHatchInputBus
+                || aMetaTileEntity instanceof MteHatchSteamBusInput) {
+                return resetRecipeMapForHatch((MTEHatch) aMetaTileEntity, aMap);
             } else {
                 return false;
             }
@@ -786,33 +783,32 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         }
     }
 
-    public boolean resetRecipeMapForHatch(GT_MetaTileEntity_Hatch aTileEntity, RecipeMap<?> aMap) {
+    public boolean resetRecipeMapForHatch(MTEHatch aTileEntity, RecipeMap<?> aMap) {
         if (aTileEntity == null) {
             return false;
         }
         final IMetaTileEntity aMetaTileEntity = aTileEntity;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input
-            || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus
-            || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput) {
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-                ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = null;
-                ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = aMap;
+        if (aMetaTileEntity instanceof MTEHatchInput || aMetaTileEntity instanceof MTEHatchInputBus
+            || aMetaTileEntity instanceof MteHatchSteamBusInput) {
+            if (aMetaTileEntity instanceof MTEHatchInput) {
+                ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null;
+                ((MTEHatchInput) aMetaTileEntity).mRecipeMap = aMap;
                 if (aMap != null) {
                     log("Remapped Input Hatch to " + aMap.unlocalizedName + ".");
                 } else {
                     log("Cleared Input Hatch.");
                 }
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
-                ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = null;
-                ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = aMap;
+            } else if (aMetaTileEntity instanceof MTEHatchInputBus) {
+                ((MTEHatchInputBus) aMetaTileEntity).mRecipeMap = null;
+                ((MTEHatchInputBus) aMetaTileEntity).mRecipeMap = aMap;
                 if (aMap != null) {
                     log("Remapped Input Bus to " + aMap.unlocalizedName + ".");
                 } else {
                     log("Cleared Input Bus.");
                 }
             } else {
-                ((GT_MetaTileEntity_Hatch_Steam_BusInput) aMetaTileEntity).mRecipeMap = null;
-                ((GT_MetaTileEntity_Hatch_Steam_BusInput) aMetaTileEntity).mRecipeMap = aMap;
+                ((MteHatchSteamBusInput) aMetaTileEntity).mRecipeMap = null;
+                ((MteHatchSteamBusInput) aMetaTileEntity).mRecipeMap = aMap;
                 if (aMap != null) {
                     log("Remapped Input Bus to " + aMap.unlocalizedName + ".");
                 } else {
@@ -853,9 +849,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
             if (aMetaTileEntity == null) {
                 return false;
             }
-            Method mProper = ReflectionUtils.getMethod(GT_MetaTileEntity_Hatch.class, "updateTexture", int.class);
+            Method mProper = ReflectionUtils.getMethod(MTEHatch.class, "updateTexture", int.class);
             if (mProper != null) {
-                if (GT_MetaTileEntity_Hatch.class.isInstance(aMetaTileEntity)) {
+                if (MTEHatch.class.isInstance(aMetaTileEntity)) {
                     mProper.setAccessible(true);
                     mProper.invoke(aMetaTileEntity, aCasingID);
                     // log("Good Method Call for updateTexture.");
@@ -863,9 +859,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
                 }
             } else {
                 log("Bad Method Call for updateTexture.");
-                if (GT_MetaTileEntity_Hatch.class.isInstance(aMetaTileEntity)) {
+                if (MTEHatch.class.isInstance(aMetaTileEntity)) {
                     if (aCasingID <= Byte.MAX_VALUE) {
-                        ((GT_MetaTileEntity_Hatch) aTileEntity).updateTexture(aCasingID);
+                        ((MTEHatch) aTileEntity).updateTexture(aCasingID);
                         log(
                             "Good Method Call for updateTexture. Used fallback method of setting mMachineBlock as casing id was <= 128.");
                         return true;
@@ -893,12 +889,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     /**
      * This is the array Used to Store the Tectech Multi-Amp Dynamo hatches.
      */
-    public ArrayList<GT_MetaTileEntity_Hatch> mTecTechDynamoHatches = new ArrayList<>();
+    public ArrayList<MTEHatch> mTecTechDynamoHatches = new ArrayList<>();
 
     /**
      * This is the array Used to Store the Tectech Multi-Amp Energy hatches.
      */
-    public ArrayList<GT_MetaTileEntity_Hatch> mTecTechEnergyHatches = new ArrayList<>();
+    public ArrayList<MTEHatch> mTecTechEnergyHatches = new ArrayList<>();
 
     /**
      * TecTech Multi-Amp Dynamo Support
@@ -923,21 +919,13 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     }
 
     public boolean isThisHatchMultiDynamo(IMetaTileEntity aMetaTileEntity) {
-        Class<?> mDynamoClass;
-        mDynamoClass = ReflectionUtils
-            .getClass("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti");
-        if (mDynamoClass != null) {
-            if (mDynamoClass.isInstance(aMetaTileEntity)) {
-                return true;
-            }
-        }
-        return false;
+        return aMetaTileEntity instanceof MTEHatchDynamoMulti;
     }
 
     @Override
     public boolean addDynamoToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo || isThisHatchMultiDynamo(aMetaTileEntity)) {
+        if (aMetaTileEntity instanceof MTEHatchDynamo || isThisHatchMultiDynamo(aMetaTileEntity)) {
             return addToMachineList(aMetaTileEntity, aBaseCasingIndex);
         }
         return false;
@@ -947,7 +935,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         if (aMetaTileEntity == null) {
             return false;
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch aHatch) {
+        if (aMetaTileEntity instanceof MTEHatch aHatch) {
             return mAllDynamoHatches.add(aHatch);
         }
         return false;
@@ -976,21 +964,13 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     }
 
     public boolean isThisHatchMultiEnergy(IMetaTileEntity aMetaTileEntity) {
-        Class<?> mDynamoClass;
-        mDynamoClass = ReflectionUtils
-            .getClass("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti");
-        if (mDynamoClass != null) {
-            if (mDynamoClass.isInstance(aMetaTileEntity)) {
-                return true;
-            }
-        }
-        return false;
+        return aMetaTileEntity instanceof MTEHatchEnergyMulti;
     }
 
     @Override
     public boolean addEnergyInputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity);
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy || isThisHatchMultiEnergy(aMetaTileEntity)) {
+        if (aMetaTileEntity instanceof MTEHatchEnergy || isThisHatchMultiEnergy(aMetaTileEntity)) {
             return addToMachineList(aMetaTileEntity, aBaseCasingIndex);
         }
         return false;
@@ -1000,7 +980,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         if (aMetaTileEntity == null) {
             return false;
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch aHatch) {
+        if (aMetaTileEntity instanceof MTEHatch aHatch) {
             return mAllEnergyHatches.add(aHatch);
         }
         return false;
@@ -1009,7 +989,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     /**
      * Pollution Management
      */
-    public int calculatePollutionReductionForHatch(GT_MetaTileEntity_Hatch_Muffler hatch, int poll) {
+    public int calculatePollutionReductionForHatch(MTEHatchMuffler hatch, int poll) {
         return hatch.calculatePollutionReduction(poll);
     }
 
@@ -1039,7 +1019,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
             ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
             if (tCurrentItem != null) {
                 // Logger.INFO("Holding Item.");
-                if (tCurrentItem.getItem() instanceof GT_MetaGenerated_Tool) {
+                if (tCurrentItem.getItem() instanceof MetaGeneratedTool) {
                     // Logger.INFO("Is GT_MetaGenerated_Tool.");
                     int[] aOreID = OreDictionary.getOreIDs(tCurrentItem);
                     for (int id : aOreID) {
@@ -1061,7 +1041,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     public boolean onPlungerRightClick(EntityPlayer aPlayer, ForgeDirection side, float aX, float aY, float aZ) {
         int aHatchIndex = 0;
         PlayerUtils.messagePlayer(aPlayer, "Trying to clear " + mOutputHatches.size() + " output hatches.");
-        for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) {
+        for (MTEHatchOutput hatch : this.mOutputHatches) {
             if (hatch.mFluid != null) {
                 PlayerUtils.messagePlayer(
                     aPlayer,
@@ -1084,9 +1064,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         if (aPlayer.isSneaking()) {
             batchMode = !batchMode;
             if (batchMode) {
-                GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn"));
+                GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn"));
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff"));
+                GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff"));
             }
             return true;
         }
@@ -1099,7 +1079,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         if (supportsVoidProtection() && wrenchingSide == getBaseMetaTileEntity().getFrontFacing()) {
             Set<VoidingMode> allowed = getAllowedVoidingModes();
             setVoidingMode(getVoidingMode().nextInCollection(allowed));
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 StatCollector.translateToLocal("GT5U.gui.button.voiding_mode") + " "
                     + StatCollector.translateToLocal(getVoidingMode().getTransKey()));
@@ -1266,12 +1246,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     protected void addNoPlayerInventoryUI(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setPos(3, 4)
                 .setSize(152, 159));
         for (int i = 0; i < 9; i++) {
             builder.widget(
-                new DrawableWidget().setDrawable(GT_UITextures.BUTTON_STANDARD)
+                new DrawableWidget().setDrawable(GTUITextures.BUTTON_STANDARD)
                     .setPos(155, 3 + i * 18)
                     .setSize(18, 18));
         }
@@ -1333,7 +1313,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
         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))
             .widget(
@@ -1343,7 +1323,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
                             + StatCollector.translateToLocal("GTPP.machines.tier")
                             + ": "
                             + EnumChatFormatting.GREEN
-                            + GT_Values.VOLTAGE_NAMES[(int) getInputTier()])
+                            + GTValues.VOLTAGE_NAMES[(int) getInputTier()])
                     .setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> mMachine && getInputTier() > 0))
             .widget(
@@ -1353,7 +1333,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
                             + StatCollector.translateToLocal("GTPP.machines.tier")
                             + ": "
                             + EnumChatFormatting.GREEN
-                            + GT_Values.VOLTAGE_NAMES[(int) getOutputTier()])
+                            + GTValues.VOLTAGE_NAMES[(int) getOutputTier()])
                     .setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> mMachine && getOutputTier() > 0))
             .widget(
@@ -1450,7 +1430,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
                                 + StatCollector.translateToLocal("GTPP.machines.tier")
                                 + ": "
                                 + EnumChatFormatting.YELLOW
-                                + GT_Values.VN[GT_Utility.getTier(getMaxInputVoltage())]
+                                + GTValues.VN[GTUtility.getTier(getMaxInputVoltage())]
                                 + EnumChatFormatting.RESET))
                     .setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> mMachine))
@@ -1572,53 +1552,49 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
         mToolStacks.put(
             true + "WRENCH",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.WRENCH.ID, 1, GOOD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.WRENCH.ID, 1, GOOD, Materials.Tungsten, null));
         mToolStacks.put(
             true + "CROWBAR",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.CROWBAR.ID, 1, GOOD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.CROWBAR.ID, 1, GOOD, Materials.Tungsten, null));
         mToolStacks.put(
             true + "HARDHAMMER",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, GOOD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.HARDHAMMER.ID, 1, GOOD, Materials.Tungsten, null));
         mToolStacks.put(
             true + "SOFTHAMMER",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.SOFTMALLET.ID, 1, GOOD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.SOFTMALLET.ID, 1, GOOD, Materials.Tungsten, null));
         mToolStacks.put(
             true + "SCREWDRIVER",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.SCREWDRIVER.ID, 1, GOOD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.SCREWDRIVER.ID, 1, GOOD, Materials.Tungsten, null));
         mToolStacks.put(
             true + "SOLDERING_IRON_LV",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.SOLDERING_IRON_LV.ID, 1, GOOD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.SOLDERING_IRON_LV.ID, 1, GOOD, Materials.Tungsten, null));
 
         mToolStacks.put(
             false + "WRENCH",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.WRENCH.ID, 1, BAD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.WRENCH.ID, 1, BAD, Materials.Tungsten, null));
         mToolStacks.put(
             false + "CROWBAR",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.CROWBAR.ID, 1, BAD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.CROWBAR.ID, 1, BAD, Materials.Tungsten, null));
         mToolStacks.put(
             false + "HARDHAMMER",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, BAD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.HARDHAMMER.ID, 1, BAD, Materials.Tungsten, null));
         mToolStacks.put(
             false + "SOFTHAMMER",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.SOFTMALLET.ID, 1, BAD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.SOFTMALLET.ID, 1, BAD, Materials.Tungsten, null));
         mToolStacks.put(
             false + "SCREWDRIVER",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.SCREWDRIVER.ID, 1, BAD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.SCREWDRIVER.ID, 1, BAD, Materials.Tungsten, null));
         mToolStacks.put(
             false + "SOLDERING_IRON_LV",
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.SOLDERING_IRON_LV.ID, 1, BAD, Materials.Tungsten, null));
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.SOLDERING_IRON_LV.ID, 1, BAD, Materials.Tungsten, null));
 
         ItemStack aGlassPane1 = ItemUtils.getItemStackOfAmountFromOreDict("paneGlassRed", 1);
         ItemStack aGlassPane2 = ItemUtils.getItemStackOfAmountFromOreDict("paneGlassLime", 1);
@@ -1626,28 +1602,26 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         mToolStacks.put("trueGLASS", aGlassPane2);
     }
 
-    public enum GTPPHatchElement implements IHatchElement<GregtechMeta_MultiBlockBase<?>> {
+    public enum GTPPHatchElement implements IHatchElement<GTPPMultiBlockBase<?>> {
 
-        AirIntake(GregtechMeta_MultiBlockBase::addAirIntakeToMachineList, GT_MetaTileEntity_Hatch_AirIntake.class) {
+        AirIntake(GTPPMultiBlockBase::addAirIntakeToMachineList, METHatchAirIntake.class) {
 
             @Override
-            public long count(GregtechMeta_MultiBlockBase<?> t) {
+            public long count(GTPPMultiBlockBase<?> t) {
                 return t.mAirIntakes.size();
             }
         },
-        TTDynamo(GregtechMeta_MultiBlockBase::addMultiAmpDynamoToMachineList,
-            "com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti") {
+        TTDynamo(GTPPMultiBlockBase::addMultiAmpDynamoToMachineList, MTEHatchDynamoMulti.class) {
 
             @Override
-            public long count(GregtechMeta_MultiBlockBase<?> t) {
+            public long count(GTPPMultiBlockBase<?> t) {
                 return t.mTecTechDynamoHatches.size();
             }
         },
-        TTEnergy(GregtechMeta_MultiBlockBase::addMultiAmpEnergyToMachineList,
-            "com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti") {
+        TTEnergy(GTPPMultiBlockBase::addMultiAmpEnergyToMachineList, MTEHatchEnergyMulti.class) {
 
             @Override
-            public long count(GregtechMeta_MultiBlockBase<?> t) {
+            public long count(GTPPMultiBlockBase<?> t) {
                 return t.mTecTechEnergyHatches.size();
             }
         },;
@@ -1658,16 +1632,16 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         }
 
         private final List<? extends Class<? extends IMetaTileEntity>> mMteClasses;
-        private final IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> mAdder;
+        private final IGTHatchAdder<? super GTPPMultiBlockBase<?>> mAdder;
 
         @SafeVarargs
-        GTPPHatchElement(IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> aAdder,
+        GTPPHatchElement(IGTHatchAdder<? super GTPPMultiBlockBase<?>> aAdder,
             Class<? extends IMetaTileEntity>... aMteClasses) {
             this.mMteClasses = Arrays.asList(aMteClasses);
             this.mAdder = aAdder;
         }
 
-        GTPPHatchElement(IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> aAdder, String... aClassNames) {
+        GTPPHatchElement(IGTHatchAdder<? super GTPPMultiBlockBase<?>> aAdder, String... aClassNames) {
             this.mMteClasses = Arrays.stream(aClassNames)
                 .map(ReflectionUtils::getClass)
                 .filter(Objects::nonNull)
@@ -1682,7 +1656,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         }
 
         @Override
-        public IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> adder() {
+        public IGTHatchAdder<? super GTPPMultiBlockBase<?>> adder() {
             return mAdder;
         }
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTEHatchCustomFluidBase.java
index fd92983af4..b084651177 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTEHatchCustomFluidBase.java
@@ -12,25 +12,25 @@ import net.minecraftforge.fluids.FluidStack;
 
 import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
 
-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.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.metatileentity.implementations.MTEHatch;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 
-public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_Hatch {
+public class MTEHatchCustomFluidBase extends MTEHatch {
 
     public final Fluid mLockedFluid;
     public final int mFluidCapacity;
     protected FluidStack mLockedStack = null;
     protected String mTempMod = null;
 
-    public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final int aID, final String aName,
+    public MTEHatchCustomFluidBase(Fluid aFluid, int aAmount, final int aID, final String aName,
         final String aNameRegional, int aTier) {
         super(
             aID,
@@ -38,12 +38,12 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
             aNameRegional,
             aTier,
             3,
-            new String[] { "Fluid Input for Multiblocks", "Capacity: " + GT_Utility.formatNumbers(aAmount) + "L" });
+            new String[] { "Fluid Input for Multiblocks", "Capacity: " + GTUtility.formatNumbers(aAmount) + "L" });
         this.mLockedFluid = aFluid;
         this.mFluidCapacity = aAmount;
     }
 
-    public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final String aName, final int aTier,
+    public MTEHatchCustomFluidBase(Fluid aFluid, int aAmount, final String aName, final int aTier,
         final String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription[0], aTextures);
         this.mLockedFluid = aFluid;
@@ -53,7 +53,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
     public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex,
         final ForgeDirection side, final ItemStack aStack) {
         if (side == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0) {
-            FluidStack fs = GT_Utility.getFluidForFilledItem(aStack, true);
+            FluidStack fs = GTUtility.getFluidForFilledItem(aStack, true);
             return fs != null && fs.getFluid() == this.mLockedFluid;
         }
         return false;
@@ -67,14 +67,14 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
 
     @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) };
     }
@@ -96,7 +96,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -181,7 +181,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
             + (mLockedStack != null ? mLockedStack.getLocalizedName() : "Empty")
             + EnumChatFormatting.RESET;
         return new String[] { "Fluid Input for " + (isSteam ? "Steam " : "") + "Multiblocks",
-            "Capacity: " + getCapacity() + "L", aFluidName, CORE.GT_Tooltip.get() };
+            "Capacity: " + getCapacity() + "L", aFluidName, GTPPCore.GT_Tooltip.get() };
     }
 
     @Override
@@ -194,7 +194,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_CustomFluidBase(
+        return new MTEHatchCustomFluidBase(
             this.mLockedFluid,
             this.mFluidCapacity,
             this.mName,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTESteamMultiBase.java
index 689bdf52ba..9730b551d8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTESteamMultiBase.java
@@ -1,9 +1,9 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
 
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-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.util.GTStructureUtility.buildHatchAdder;
+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;
@@ -19,45 +19,44 @@ import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_HatchElementBuilder;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.GT_Waila;
-import gregtech.api.util.IGT_HatchAdder;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.GTWaila;
+import gregtech.api.util.HatchElementBuilder;
+import gregtech.api.util.IGTHatchAdder;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusOutput;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSteamBusOutput;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MteHatchSteamBusInput;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMultiBase<T>>
-    extends GregtechMeta_MultiBlockBase<T> {
+public abstract class MTESteamMultiBase<T extends MTESteamMultiBase<T>> extends GTPPMultiBlockBase<T> {
 
-    public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput> mSteamInputs = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput> mSteamOutputs = new ArrayList<>();
-    public ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mSteamInputFluids = new ArrayList<>();
+    public ArrayList<MteHatchSteamBusInput> mSteamInputs = new ArrayList<>();
+    public ArrayList<MTEHatchSteamBusOutput> mSteamOutputs = new ArrayList<>();
+    public ArrayList<MTEHatchCustomFluidBase> mSteamInputFluids = new ArrayList<>();
 
     protected static final String TT_steaminputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamInputBus");
     protected static final String TT_steamoutputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamOutputBus");
     protected static final String TT_steamhatch = StatCollector.translateToLocal("GTPP.MBTT.SteamHatch");
 
-    public GregtechMeta_SteamMultiBase(String aName) {
+    public MTESteamMultiBase(String aName) {
         super(aName);
     }
 
-    public GregtechMeta_SteamMultiBase(int aID, String aName, String aNameRegional) {
+    public MTESteamMultiBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
@@ -71,9 +70,9 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
         return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex()) };
     }
 
-    protected abstract GT_RenderedTexture getFrontOverlay();
+    protected abstract GTRenderedTexture getFrontOverlay();
 
-    protected abstract GT_RenderedTexture getFrontOverlayActive();
+    protected abstract GTRenderedTexture getFrontOverlayActive();
 
     public abstract int getTierRecipes();
 
@@ -170,22 +169,22 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
         // Use this to determine the correct value, then update the hatch texture after.
         boolean aDidAdd = false;
 
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase) {
+        if (aMetaTileEntity instanceof MTEHatchCustomFluidBase) {
             log("Adding Steam Input Hatch");
             aDidAdd = addToMachineListInternal(mSteamInputFluids, aMetaTileEntity, aBaseCasingIndex);
-        } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput) {
+        } else if (aMetaTileEntity instanceof MteHatchSteamBusInput) {
             log(
                 "Trying to set recipe map. Type: "
                     + (getRecipeMap() != null ? getRecipeMap().unlocalizedName : "Null"));
             this.resetRecipeMapForHatch(aTileEntity, getRecipeMap());
             log("Adding Steam Input Bus");
             aDidAdd = addToMachineListInternal(mSteamInputs, aMetaTileEntity, aBaseCasingIndex);
-        } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusOutput) {
+        } else if (aMetaTileEntity instanceof MTEHatchSteamBusOutput) {
             log("Adding Steam Output Bus");
             aDidAdd = addToMachineListInternal(mSteamOutputs, aMetaTileEntity, aBaseCasingIndex);
-        } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input)
+        } else if (aMetaTileEntity instanceof MTEHatchInput)
             aDidAdd = addToMachineListInternal(mInputHatches, aMetaTileEntity, aBaseCasingIndex);
-        else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output);
+        else if (aMetaTileEntity instanceof MTEHatchOutput);
 
         return aDidAdd;
     }
@@ -197,7 +196,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
     @Override
     public boolean depleteInput(FluidStack aLiquid) {
         if (aLiquid == null) return false;
-        for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) {
+        for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) {
             FluidStack tLiquid = tHatch.getFluid();
             if (tLiquid != null && tLiquid.isFluidEqual(aLiquid)) {
                 tLiquid = tHatch.drain(aLiquid.amount, false);
@@ -212,11 +211,11 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
 
     @Override
     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_CustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) {
-            if (GT_Utility.areStacksEqual(
+        for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) {
+            if (GTUtility.areStacksEqual(
                 aStack,
                 tHatch.getBaseMetaTileEntity()
                     .getStackInSlot(0))) {
@@ -228,11 +227,11 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
                 }
             }
         }
-        for (GT_MetaTileEntity_Hatch_Steam_BusInput tHatch : filterValidMTEs(mSteamInputs)) {
+        for (MteHatchSteamBusInput tHatch : filterValidMTEs(mSteamInputs)) {
             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))) {
@@ -251,12 +250,12 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
     @Override
     public ArrayList<FluidStack> getStoredFluids() {
         ArrayList<FluidStack> rList = new ArrayList<>();
-        for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) {
+        for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) {
             if (tHatch.getFillableStack() != null) {
                 rList.add(tHatch.getFillableStack());
             }
         }
-        for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) if (hatch.getFillableStack() != null) {
+        for (MTEHatchInput hatch : this.mInputHatches) if (hatch.getFillableStack() != null) {
             rList.add(hatch.getFillableStack());
         }
         return rList;
@@ -265,7 +264,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
     @Override
     public ArrayList<ItemStack> getStoredInputs() {
         ArrayList<ItemStack> rList = new ArrayList<>();
-        for (GT_MetaTileEntity_Hatch_Steam_BusInput tHatch : filterValidMTEs(mSteamInputs)) {
+        for (MteHatchSteamBusInput tHatch : filterValidMTEs(mSteamInputs)) {
             tHatch.mRecipeMap = getRecipeMap();
             for (int i = tHatch.getBaseMetaTileEntity()
                 .getSizeInventory() - 1; i >= 0; i--) {
@@ -282,13 +281,13 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
 
     @Override
     public boolean addOutput(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
-        aStack = GT_Utility.copy(aStack);
+        if (GTUtility.isStackInvalid(aStack)) return false;
+        aStack = GTUtility.copy(aStack);
         boolean outputSuccess = true;
         while (outputSuccess && aStack.stackSize > 0) {
             outputSuccess = false;
             ItemStack single = aStack.splitStack(1);
-            for (GT_MetaTileEntity_Hatch_Steam_BusOutput tHatch : filterValidMTEs(mSteamOutputs)) {
+            for (MTEHatchSteamBusOutput tHatch : filterValidMTEs(mSteamOutputs)) {
                 if (!outputSuccess) {
                     for (int i = tHatch.getSizeInventory() - 1; i >= 0 && !outputSuccess; i--) {
                         if (tHatch.getBaseMetaTileEntity()
@@ -296,7 +295,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
                     }
                 }
             }
-            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;
@@ -309,7 +308,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
     @Override
     public ArrayList<ItemStack> getStoredOutputs() {
         ArrayList<ItemStack> rList = new ArrayList<>();
-        for (GT_MetaTileEntity_Hatch_Steam_BusOutput tHatch : filterValidMTEs(mSteamOutputs)) {
+        for (MTEHatchSteamBusOutput tHatch : filterValidMTEs(mSteamOutputs)) {
             for (int i = tHatch.getBaseMetaTileEntity()
                 .getSizeInventory() - 1; i >= 0; i--) {
                 rList.add(
@@ -323,7 +322,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
     @Override
     public List<ItemStack> getItemOutputSlots(ItemStack[] toOutput) {
         List<ItemStack> ret = new ArrayList<>();
-        for (final GT_MetaTileEntity_Hatch tBus : filterValidMTEs(mSteamOutputs)) {
+        for (final MTEHatch tBus : filterValidMTEs(mSteamOutputs)) {
             final IInventory tBusInv = tBus.getBaseMetaTileEntity();
             for (int i = 0; i < tBusInv.getSizeInventory(); i++) {
                 ret.add(tBus.getStackInSlot(i));
@@ -334,8 +333,8 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
 
     @Override
     public void updateSlots() {
-        for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) tHatch.updateSlots();
-        for (GT_MetaTileEntity_Hatch_Steam_BusInput tHatch : filterValidMTEs(mSteamInputs)) tHatch.updateSlots();
+        for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) tHatch.updateSlots();
+        for (MteHatchSteamBusInput tHatch : filterValidMTEs(mSteamInputs)) tHatch.updateSlots();
     }
 
     @Override
@@ -355,12 +354,12 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
     @Override
     public boolean resetRecipeMapForAllInputHatches(RecipeMap<?> aMap) {
         boolean ret = super.resetRecipeMapForAllInputHatches(aMap);
-        for (GT_MetaTileEntity_Hatch_Steam_BusInput hatch : mSteamInputs) {
+        for (MteHatchSteamBusInput hatch : mSteamInputs) {
             if (resetRecipeMapForHatch(hatch, aMap)) {
                 ret = true;
             }
         }
-        for (GT_MetaTileEntity_Hatch_Input g : this.mInputHatches) {
+        for (MTEHatchInput g : this.mInputHatches) {
             if (resetRecipeMapForHatch(g, aMap)) {
                 ret = true;
             }
@@ -392,34 +391,33 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
                     StatCollector.translateToLocalFormatted("GTPP.waila.steam.use", formatNumbers(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");
         }
         super.getMTEWailaBody(itemStack, currentTip, accessor, config);
     }
 
-    protected static <T extends GregtechMeta_SteamMultiBase<T>> GT_HatchElementBuilder<T> buildSteamInput(
-        Class<T> typeToken) {
-        return buildHatchAdder(typeToken).adder(GregtechMeta_SteamMultiBase::addToMachineList)
+    protected static <T extends MTESteamMultiBase<T>> HatchElementBuilder<T> buildSteamInput(Class<T> typeToken) {
+        return buildHatchAdder(typeToken).adder(MTESteamMultiBase::addToMachineList)
             .hatchIds(31040)
             .shouldReject(t -> !t.mSteamInputFluids.isEmpty());
     }
 
-    protected enum SteamHatchElement implements IHatchElement<GregtechMeta_SteamMultiBase<?>> {
+    protected enum SteamHatchElement implements IHatchElement<MTESteamMultiBase<?>> {
 
         InputBus_Steam {
 
             @Override
             public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
-                return Collections.singletonList(GT_MetaTileEntity_Hatch_Steam_BusInput.class);
+                return Collections.singletonList(MteHatchSteamBusInput.class);
             }
 
             @Override
-            public long count(GregtechMeta_SteamMultiBase<?> t) {
+            public long count(MTESteamMultiBase<?> t) {
                 return t.mSteamInputs.size();
             }
         },
@@ -427,18 +425,18 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
 
             @Override
             public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
-                return Collections.singletonList(GT_MetaTileEntity_Hatch_Steam_BusOutput.class);
+                return Collections.singletonList(MTEHatchSteamBusOutput.class);
             }
 
             @Override
-            public long count(GregtechMeta_SteamMultiBase<?> t) {
+            public long count(MTESteamMultiBase<?> t) {
                 return t.mSteamOutputs.size();
             }
         },;
 
         @Override
-        public IGT_HatchAdder<? super GregtechMeta_SteamMultiBase<?>> adder() {
-            return GregtechMeta_SteamMultiBase::addToMachineList;
+        public IGTHatchAdder<? super MTESteamMultiBase<?>> adder() {
+            return MTESteamMultiBase::addToMachineList;
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTETransformerHiAmp.java
index c6a088fb1c..d2a6468f28 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTETransformerHiAmp.java
@@ -6,29 +6,30 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import org.apache.commons.lang3.ArrayUtils;
 
+import gregtech.api.enums.GTValues;
 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.metatileentity.implementations.GT_MetaTileEntity_Transformer;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTETransformer;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer {
+public class MTETransformerHiAmp extends MTETransformer {
 
     private boolean mHalfMode = false;
 
-    public GregtechMetaTransformerHiAmp(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
+    public MTETransformerHiAmp(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GregtechMetaTransformerHiAmp(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTETransformerHiAmp(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public long maxEUStore() {
-        return ((512L + gregtech.api.enums.GT_Values.V[(this.mTier + 1)] * 2L) * 8);
+        return ((512L + GTValues.V[(this.mTier + 1)] * 2L) * 8);
     }
 
     @Override
@@ -81,7 +82,7 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTransformerHiAmp(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTETransformerHiAmp(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -90,7 +91,7 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer
             this.mDescriptionArray,
             "Accepts 4A and outputs 16A",
             "Toggle 2A/8A half-mode with Screwdriver",
-            CORE.GT_Tooltip.get());
+            GTPPCore.GT_Tooltip.get());
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTEBoilerBase.java
index 3f0d8d1ec1..6387624a1c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTEBoilerBase.java
@@ -9,21 +9,21 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SoundResource;
-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.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.util.math.MathUtils;
 
-public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank {
+public abstract class MTEBoilerBase extends MTEBasicTank {
 
     public int mTemperature = 20;
     public int mProcessingEnergy = 0;
@@ -32,12 +32,12 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
     public boolean mHadNoWater = false;
     public long RI = MathUtils.randLong(5L, 30L);
 
-    public GregtechMetaBoilerBase(final int aID, final String aName, final String aNameRegional,
-        final String aDescription, final ITexture... aTextures) {
+    public MTEBoilerBase(final int aID, final String aName, final String aNameRegional, final String aDescription,
+        final ITexture... aTextures) {
         super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures);
     }
 
-    public GregtechMetaBoilerBase(final String aName, final int aTier, final String[] aDescription,
+    public MTEBoilerBase(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
@@ -104,12 +104,12 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
             return true;
         }
         if (aPlayer != null) {
-            if (GT_Utility.areStacksEqual(aPlayer.getCurrentEquippedItem(), new ItemStack(Items.water_bucket, 1))) {
+            if (GTUtility.areStacksEqual(aPlayer.getCurrentEquippedItem(), new ItemStack(Items.water_bucket, 1))) {
                 this.fill(Materials.Water.getFluid(1000 * aPlayer.getCurrentEquippedItem().stackSize), true);
                 aPlayer.getCurrentEquippedItem()
                     .func_150996_a(Items.bucket);
             } else {
-                GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+                GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             }
         }
         return true;
@@ -147,7 +147,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
 
     @Override
     public boolean isFluidInputAllowed(final FluidStack aFluid) {
-        return GT_ModHandler.isWater(aFluid);
+        return GTModHandler.isWater(aFluid);
     }
 
     @Override
@@ -167,8 +167,8 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
     }
 
     @Override
-    public boolean allowCoverOnSide(final ForgeDirection side, final GT_ItemStack aCover) {
-        return GregTech_API.getCoverBehaviorNew(aCover.toStack())
+    public boolean allowCoverOnSide(final ForgeDirection side, final GTItemStack aCover) {
+        return GregTechAPI.getCoverBehaviorNew(aCover.toStack())
             .isSimpleCover();
     }
 
@@ -225,7 +225,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
             }
             if ((aTick % 10L) == 0L) {
                 if (this.mTemperature > 100) {
-                    if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {
+                    if ((this.mFluid == null) || (!GTModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {
                         this.mHadNoWater = true;
                     } else {
                         if (this.mHadNoWater) {
@@ -234,11 +234,11 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
                         }
                         this.mFluid.amount -= 1;
                         if (this.mSteam == null) {
-                            this.mSteam = GT_ModHandler.getSteam(150L);
-                        } else if (GT_ModHandler.isSteam(this.mSteam)) {
+                            this.mSteam = GTModHandler.getSteam(150L);
+                        } else if (GTModHandler.isSteam(this.mSteam)) {
                             this.mSteam.amount += 150;
                         } else {
-                            this.mSteam = GT_ModHandler.getSteam(150L);
+                            this.mSteam = GTModHandler.getSteam(150L);
                         }
                     }
                 } else {
@@ -251,49 +251,48 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
             }
             if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork())
                 && (this.mInventory[2] != null)) {
-                if ((GT_OreDictUnificator
-                    .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal)))
-                    || (GT_OreDictUnificator
+                if ((GTOreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal)))
+                    || (GTOreDictUnificator
                         .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Coal)))
-                    || (GT_OreDictUnificator
+                    || (GTOreDictUnificator
                         .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Coal)))
-                    || (GT_OreDictUnificator
+                    || (GTOreDictUnificator
                         .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Coal)))) {
                     this.mProcessingEnergy += 160;
                     aBaseMetaTileEntity.decrStackSize(2, 1);
                     if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
                         aBaseMetaTileEntity
-                            .addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+                            .addStackToSlot(3, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
                     }
-                } else if (GT_OreDictUnificator
+                } else if (GTOreDictUnificator
                     .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Charcoal))) {
                         this.mProcessingEnergy += 160;
                         aBaseMetaTileEntity.decrStackSize(2, 1);
                         if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
                             aBaseMetaTileEntity
-                                .addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
+                                .addStackToSlot(3, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
                         }
-                    } else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")) {
+                    } else if (GTOreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")) {
                         this.mProcessingEnergy += 640;
                         aBaseMetaTileEntity.decrStackSize(2, 1);
                         if (aBaseMetaTileEntity.getRandomNumber(2) == 0) {
                             aBaseMetaTileEntity
-                                .addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
+                                .addStackToSlot(3, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
                         }
-                    } else if ((GT_OreDictUnificator
+                    } else if ((GTOreDictUnificator
                         .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Lignite)))
-                        || (GT_OreDictUnificator
+                        || (GTOreDictUnificator
                             .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Lignite)))
-                        || (GT_OreDictUnificator
+                        || (GTOreDictUnificator
                             .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Lignite)))
-                        || (GT_OreDictUnificator
+                        || (GTOreDictUnificator
                             .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Lignite)))) {
                                 this.mProcessingEnergy += 40;
                                 aBaseMetaTileEntity.decrStackSize(2, 1);
                                 if (aBaseMetaTileEntity.getRandomNumber(8) == 0) {
                                     aBaseMetaTileEntity.addStackToSlot(
                                         3,
-                                        GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+                                        GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
                                 }
                             }
             }
@@ -328,7 +327,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
     @Override
     public void doSound(final byte aIndex, final double aX, final double aY, final double aZ) {
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ);
             for (int l = 0; l < 8; l++) {
                 this.getBaseMetaTileEntity()
                     .getWorld()
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java
index 43ead231b3..386c5634f8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import java.util.Collection;
 
@@ -13,38 +13,38 @@ import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.ArrayUtils;
 
 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.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 
-public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_BasicTank implements RecipeMapWorkable {
+public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements RecipeMapWorkable {
 
     protected int pollMin, pollMax;
 
-    public GregtechRocketFuelGeneratorBase(final int aID, final String aName, final String aNameRegional,
-        final int aTier, final String aDescription, final ITexture... aTextures) {
+    public MTERocketFuelGeneratorBase(final int aID, final String aName, final String aNameRegional, final int aTier,
+        final String aDescription, final ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
-        pollMin = (int) (CORE.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator
-            * CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
-        pollMax = (int) (CORE.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator
-            * CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
+        pollMin = (int) (GTPPCore.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator
+            * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
+        pollMax = (int) (GTPPCore.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator
+            * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
     }
 
-    public GregtechRocketFuelGeneratorBase(final String aName, final int aTier, final String[] aDescription,
+    public MTERocketFuelGeneratorBase(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
-        pollMin = (int) (CORE.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator
-            * CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
-        pollMax = (int) (CORE.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator
-            * CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
+        pollMin = (int) (GTPPCore.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator
+            * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
+        pollMax = (int) (GTPPCore.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator
+            * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
     }
 
     @Override
@@ -80,12 +80,12 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
             this.mDescriptionArray,
             "Fuel Efficiency: " + this.getEfficiency() + "%",
             aPollution,
-            CORE.GT_Tooltip.get());
+            GTPPCore.GT_Tooltip.get());
     }
 
     @Override
     public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -239,7 +239,7 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
             if ((this.mInventory[this.getInputSlot()] != null)
                 && (aBaseMetaTileEntity.getUniversalEnergyStored()
                     < ((this.maxEUOutput() * 20) + this.getMinimumStoredEU()))
-                && (GT_Utility.getFluidForFilledItem(this.mInventory[this.getInputSlot()], true) == null)) {
+                && (GTUtility.getFluidForFilledItem(this.mInventory[this.getInputSlot()], true) == null)) {
                 final int tFuelValue = this.getFuelValue(this.mInventory[this.getInputSlot()]);
                 if (tFuelValue > 0) {
                     final ItemStack tEmptyContainer = this.getEmptyContainer(this.mInventory[this.getInputSlot()]);
@@ -277,9 +277,9 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
             return 0;
         }
         FluidStack tLiquid;
-        final Collection<GT_Recipe> tRecipeList = this.getRecipeMap()
+        final Collection<GTRecipe> tRecipeList = this.getRecipeMap()
             .getAllRecipes();
-        for (final GT_Recipe tFuel : tRecipeList) {
+        for (final GTRecipe tFuel : tRecipeList) {
             if ((tLiquid = tFuel.mFluidInputs[0]) != null) {
                 if (aLiquid.isFluidEqual(tLiquid)) {
                     int aperOp = this.consumedFluidPerOperation(tLiquid);
@@ -291,10 +291,10 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
     }
 
     public int getFuelValue(final ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack) || (this.getRecipeMap() == null)) {
+        if (GTUtility.isStackInvalid(aStack) || (this.getRecipeMap() == null)) {
             return 0;
         }
-        final GT_Recipe tFuel = this.getRecipeMap()
+        final GTRecipe tFuel = this.getRecipeMap()
             .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
         if (tFuel != null) {
             return (int) ((tFuel.mSpecialValue * 1000L * this.getEfficiency()) / 100);
@@ -303,22 +303,22 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
     }
 
     public ItemStack getEmptyContainer(final ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack) || (this.getRecipeMap() == null)) {
+        if (GTUtility.isStackInvalid(aStack) || (this.getRecipeMap() == null)) {
             return null;
         }
-        final GT_Recipe tFuel = this.getRecipeMap()
+        final GTRecipe tFuel = this.getRecipeMap()
             .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
         if (tFuel != null) {
-            return GT_Utility.copy(tFuel.getOutput(0));
+            return GTUtility.copy(tFuel.getOutput(0));
         }
-        return GT_Utility.getContainerItem(aStack, true);
+        return GTUtility.getContainerItem(aStack, true);
     }
 
     @Override
     public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex,
         final ForgeDirection side, final ItemStack aStack) {
         return super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack) && ((this.getFuelValue(aStack) > 0)
-            || (this.getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0));
+            || (this.getFuelValue(GTUtility.getFluidForFilledItem(aStack, true)) > 0));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTESolarGenerator.java
index 5e0588acfd..0d0cb67916 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTESolarGenerator.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -8,12 +8,12 @@ import net.minecraftforge.common.util.ForgeDirection;
 import org.apache.commons.lang3.ArrayUtils;
 
 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.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
 
-public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_BasicTank {
+public abstract class MTESolarGenerator extends MTEBasicTank {
 
     public int mEfficiency;
     public int mProcessingEnergy = 0;
@@ -21,12 +21,12 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic
     public int mLossTimer = 0;
     public static int sEnergyPerTick = 16;
 
-    public GregtechMetaSolarGenerator(final int aID, final String aName, final String aNameRegional, final int aTier,
+    public MTESolarGenerator(final int aID, final String aName, final String aNameRegional, final int aTier,
         final String aDescription, final ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
     }
 
-    public GregtechMetaSolarGenerator(final String aName, final int aTier, final String[] aDescription,
+    public MTESolarGenerator(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
@@ -67,7 +67,7 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic
         if (aBaseMetaTileEntity.isClientSide()) {
             return true;
         }
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java
index fe3253244a..dc0b4a5dd6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java
@@ -6,19 +6,19 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public abstract class GregtechMetaTreeFarmerBase extends GT_MetaTileEntity_TieredMachineBlock {
+public abstract class MTETreeFarmerBase extends MTETieredMachineBlock {
 
-    public GregtechMetaTreeFarmerBase(final int aID, final String aName, final String aNameRegional, final int aTier,
+    public MTETreeFarmerBase(final int aID, final String aName, final String aNameRegional, final int aTier,
         final int aInvSlotCount, final String aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GregtechMetaTreeFarmerBase(final String aName, final int aTier, final int aInvSlotCount,
-        final String[] aDescription, final ITexture[][][] aTextures) {
+    public MTETreeFarmerBase(final String aName, final int aTier, final int aInvSlotCount, final String[] aDescription,
+        final ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
@@ -139,23 +139,23 @@ public abstract class GregtechMetaTreeFarmerBase extends GT_MetaTileEntity_Tiere
     }
 
     public ITexture[] getFront(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) };
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log) };
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Podzol) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Podzol) };
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java
index b53e540044..13bb4b44f1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java
@@ -8,35 +8,35 @@ import org.apache.commons.lang3.ArrayUtils;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_NbtConsumable {
+public class MTEHatchCatalysts extends MTEHatchNbtConsumable {
 
-    public GT_MetaTileEntity_Hatch_Catalysts(int aID, String aName, String aNameRegional) {
+    public MTEHatchCatalysts(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, 0, 16, "Dedicated Catalyst Storage", false);
     }
 
-    public GT_MetaTileEntity_Hatch_Catalysts(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchCatalysts(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, 0, 16, aDescription, false, aTextures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst) };
     }
 
     @Override
     public String[] getDescription() {
-        return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get());
+        return ArrayUtils.add(this.mDescriptionArray, GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -46,7 +46,7 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Catalysts(mName, mDescriptionArray, mTextures);
+        return new MTEHatchCatalysts(mName, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java
index e3134f5812..a40ea08ec1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java
@@ -8,35 +8,35 @@ import org.apache.commons.lang3.ArrayUtils;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatch_NbtConsumable {
+public class MTEHatchMillingBalls extends MTEHatchNbtConsumable {
 
-    public GT_MetaTileEntity_Hatch_MillingBalls(int aID, String aName, String aNameRegional) {
+    public MTEHatchMillingBalls(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, 6, 4, "Dedicated Milling Ball Storage", false);
     }
 
-    public GT_MetaTileEntity_Hatch_MillingBalls(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchMillingBalls(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, 6, 4, aDescription, false, aTextures);
     }
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls) };
+        return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls) };
     }
 
     @Override
     public String[] getDescription() {
-        return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get());
+        return ArrayUtils.add(this.mDescriptionArray, GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -46,7 +46,7 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_MillingBalls(mName, mDescriptionArray, mTextures);
+        return new MTEHatchMillingBalls(mName, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java
index e18fc489b0..dbcef2d9e7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java
@@ -10,33 +10,32 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileEntity_Hatch
-    implements IAddGregtechLogo {
+public abstract class MTEHatchNbtConsumable extends MTEHatch implements IAddGregtechLogo {
 
     private final int mInputslotCount;
     private final int mTotalSlotCount;
     private final boolean mAllowDuplicateUsageTypes;
 
-    public GT_MetaTileEntity_Hatch_NbtConsumable(int aID, String aName, String aNameRegional, int aTier,
-        int aInputSlots, String aDescription, boolean aAllowDuplicateTypes) {
+    public MTEHatchNbtConsumable(int aID, String aName, String aNameRegional, int aTier, int aInputSlots,
+        String aDescription, boolean aAllowDuplicateTypes) {
         super(aID, aName, aNameRegional, aTier, aInputSlots * 2, aDescription);
         mInputslotCount = getInputSlotCount();
         mTotalSlotCount = getInputSlotCount() * 2;
         mAllowDuplicateUsageTypes = aAllowDuplicateTypes;
     }
 
-    public GT_MetaTileEntity_Hatch_NbtConsumable(String aName, int aTier, int aInputSlots, String[] aDescription,
+    public MTEHatchNbtConsumable(String aName, int aTier, int aInputSlots, String[] aDescription,
         boolean aAllowDuplicateTypes, ITexture[][][] aTextures) {
         super(aName, aTier, aInputSlots * 2, aDescription, aTextures);
         mInputslotCount = getInputSlotCount();
@@ -77,7 +76,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
 
     @Override
     public final boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -118,8 +117,8 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
         for (int i = 0; i <= getSlotID_LastInput(); i++) {
             for (int j = i + 1; j <= getSlotID_LastInput(); j++) {
                 if (mInventory[j] != null
-                    && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) {
-                    GT_Utility.moveStackFromSlotAToSlotB(
+                    && (mInventory[i] == null || GTUtility.areStacksEqual(mInventory[i], mInventory[j]))) {
+                    GTUtility.moveStackFromSlotAToSlotB(
                         getBaseMetaTileEntity(),
                         getBaseMetaTileEntity(),
                         j,
@@ -201,7 +200,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
                 // First check for duplicates
                 for (int i = getSlotID_FirstUsage(); i <= getSlotID_LastUsage(); i++) {
                     if (mInventory[i] != null) {
-                        if (GT_Utility.areStacksEqual(aStackToMove, mInventory[i], true)) {
+                        if (GTUtility.areStacksEqual(aStackToMove, mInventory[i], true)) {
                             Logger.INFO("Found matching stack in slot " + i + ".");
                             aFoundMatching = true;
                             break;
@@ -261,7 +260,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
     public boolean isItemValidForUsageSlot(ItemStack aStack) {
         if (aStack != null) {
             for (ItemStack aValid : getItemsValidForUsageSlots()) {
-                if (GT_Utility.areStacksEqual(aStack, aValid, true)) {
+                if (GTUtility.areStacksEqual(aStack, aValid, true)) {
                     return true;
                 }
             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPPCopiedBlockTexture.java
index 6a780d227c..117104b4f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPPCopiedBlockTexture.java
@@ -3,26 +3,26 @@ package gtPlusPlus.xmod.gregtech.api.objects;
 import net.minecraft.block.Block;
 
 import gregtech.api.enums.Dyes;
-import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.objects.GTCopiedBlockTexture;
 
 /**
  * Made this to get rid of deprecation warnings <i>everywhere</i>.
- * 
+ *
  * @author Alkalus
  *
  */
 @SuppressWarnings("deprecation")
-public class GTPP_CopiedBlockTexture extends GT_CopiedBlockTexture {
+public class GTPPCopiedBlockTexture extends GTCopiedBlockTexture {
 
-    public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) {
+    public GTPPCopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) {
         super(aBlock, aMeta, aMeta, aRGBa, aAllowAlpha);
     }
 
-    public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa) {
+    public GTPPCopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa) {
         this(aBlock, aSide, aMeta, aRGBa, true);
     }
 
-    public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta) {
+    public GTPPCopiedBlockTexture(Block aBlock, int aSide, int aMeta) {
         this(aBlock, aSide, aMeta, Dyes._NULL.mRGBa);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPPRenderedTexture.java
index 0da0136193..fda498d1f6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPPRenderedTexture.java
@@ -2,26 +2,26 @@ package gtPlusPlus.xmod.gregtech.api.objects;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 
 /**
  * Made this to get rid of deprecation warnings <i>everywhere</i>.
- * 
+ *
  * @author Alkalus
  *
  */
 @SuppressWarnings("deprecation")
-public class GTPP_RenderedTexture extends GT_RenderedTexture {
+public class GTPPRenderedTexture extends GTRenderedTexture {
 
-    public GTPP_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
+    public GTPPRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
         super(aIcon, aRGBa, aAllowAlpha);
     }
 
-    public GTPP_RenderedTexture(IIconContainer aIcon, short[] aRGBa) {
+    public GTPPRenderedTexture(IIconContainer aIcon, short[] aRGBa) {
         this(aIcon, aRGBa, true);
     }
 
-    public GTPP_RenderedTexture(IIconContainer aIcon) {
+    public GTPPRenderedTexture(IIconContainer aIcon) {
         this(aIcon, Dyes._NULL.mRGBa);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
index 967d3ae916..2cafd18a39 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
@@ -6,7 +6,7 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.objects.GT_ArrayList;
+import gregtech.api.objects.GTArrayList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
@@ -14,7 +14,7 @@ public class GregtechItemData {
 
     private static final GregtechMaterialStack[] EMPTY_GT_MaterialStack_ARRAY = new GregtechMaterialStack[0];
 
-    public final List<Object> mExtraData = new GT_ArrayList<>(false, 1);
+    public final List<Object> mExtraData = new GTArrayList<>(false, 1);
     public final GregtechOrePrefixes mPrefix;
     public final GregtechMaterialStack mMaterial;
     public final GregtechMaterialStack[] mByProducts;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPPConfig.java
index 65beea207a..1a32b75bb8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPPConfig.java
@@ -1,46 +1,46 @@
 package gtPlusPlus.xmod.gregtech.api.util;
 
-import static gregtech.api.enums.GT_Values.E;
+import static gregtech.api.enums.GTValues.E;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
-public class GTPP_Config implements Runnable {
+public class GTPPConfig implements Runnable {
 
     public static boolean troll = false;
 
     public static Configuration sConfigFileIDs;
     public final Configuration mConfig;
 
-    public GTPP_Config(Configuration aConfig) {
+    public GTPPConfig(Configuration aConfig) {
         mConfig = aConfig;
         mConfig.load();
         mConfig.save();
     }
 
     public static int addIDConfig(Object aCategory, String aName, int aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = sConfigFileIDs.get(
             aCategory.toString()
                 .replaceAll("\\|", "."),
             aName.replaceAll("\\|", "."),
             aDefault);
         int rResult = tProperty.getInt(aDefault);
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) sConfigFileIDs.save();
+        if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) sConfigFileIDs.save();
         return rResult;
     }
 
     public static String getStackConfigName(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return E;
-        Object rName = GT_OreDictUnificator.getAssociation(aStack);
+        if (GTUtility.isStackInvalid(aStack)) return E;
+        Object rName = GTOreDictUnificator.getAssociation(aStack);
         if (rName != null) return rName.toString();
         try {
-            if (GT_Utility.isStringValid(rName = aStack.getUnlocalizedName())) return rName.toString();
+            if (GTUtility.isStringValid(rName = aStack.getUnlocalizedName())) return rName.toString();
         } catch (Throwable e) {
             /* Do nothing */
         }
@@ -57,14 +57,14 @@ public class GTPP_Config implements Runnable {
     }
 
     public boolean get(Object aCategory, String aName, boolean aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = mConfig.get(
             aCategory.toString()
                 .replaceAll("\\|", "_"),
             (aName + "_" + aDefault).replaceAll("\\|", "_"),
             aDefault);
         boolean rResult = tProperty.getBoolean(aDefault);
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
+        if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) mConfig.save();
         return rResult;
     }
 
@@ -73,14 +73,14 @@ public class GTPP_Config implements Runnable {
     }
 
     public int get(Object aCategory, String aName, int aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = mConfig.get(
             aCategory.toString()
                 .replaceAll("\\|", "_"),
             (aName + "_" + aDefault).replaceAll("\\|", "_"),
             aDefault);
         int rResult = tProperty.getInt(aDefault);
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
+        if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) mConfig.save();
         return rResult;
     }
 
@@ -89,14 +89,14 @@ public class GTPP_Config implements Runnable {
     }
 
     public double get(Object aCategory, String aName, double aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = mConfig.get(
             aCategory.toString()
                 .replaceAll("\\|", "_"),
             (aName + "_" + aDefault).replaceAll("\\|", "_"),
             aDefault);
         double rResult = tProperty.getDouble(aDefault);
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
+        if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) mConfig.save();
         return rResult;
     }
 
@@ -105,14 +105,14 @@ public class GTPP_Config implements Runnable {
     }
 
     public String get(Object aCategory, String aName, String aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
+        if (GTUtility.isStringInvalid(aName)) return aDefault;
         Property tProperty = mConfig.get(
             aCategory.toString()
                 .replaceAll("\\|", "_"),
             (aName + "_" + aDefault).replaceAll("\\|", "_"),
             aDefault);
         String rResult = tProperty.getString();
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
+        if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) mConfig.save();
         return rResult;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java
index df95b7de2b..da6db942aa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java
@@ -7,7 +7,7 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class SpecialBehaviourTooltipHandler {
 
@@ -22,7 +22,7 @@ public class SpecialBehaviourTooltipHandler {
         if (event != null) {
             if (event.itemStack != null) {
                 for (ItemStack aKey : mTooltipCache.keySet()) {
-                    if (GT_Utility.areStacksEqual(aKey, event.itemStack, false)) {
+                    if (GTUtility.areStacksEqual(aKey, event.itemStack, false)) {
                         String s = mTooltipCache.get(aKey);
                         if (s != null && s.length() > 0) {
                             event.toolTip.add(EnumChatFormatting.RED + s);