132 files changed, 3695 insertions, 3849 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/MetaGTProxy.java
index c53e217560..fbef4832e5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/MetaGTProxy.java
@@ -8,7 +8,7 @@ import net.minecraftforge.fluids.FluidRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.TAE;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.handler.AchievementHandler;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -18,11 +18,11 @@ import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
 import ic2.core.init.BlocksItems;
 import ic2.core.init.InternalName;
 
-public class Meta_GT_Proxy {
+public class MetaGTProxy {
 
     public static AchievementHandler mAssemblyAchievements;
 
-    public Meta_GT_Proxy() {}
+    public MetaGTProxy() {}
 
     public static void preInit() {
         fixIC2FluidNames();
@@ -54,21 +54,21 @@ public class Meta_GT_Proxy {
                 .addStringLocalization("fluidHotWater", aNewHeatedWaterName);
             LanguageRegistry.instance()
                 .addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName);
-            GT_LanguageManager.addStringLocalization("fluidHotWater", aNewHeatedWaterName);
-            GT_LanguageManager.addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName);
+            GTLanguageManager.addStringLocalization("fluidHotWater", aNewHeatedWaterName);
+            GTLanguageManager.addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName);
 
             Block b = BlocksItems.getFluidBlock(InternalName.fluidHotWater);
             if (b != null) {
                 LanguageRegistry.addName(ItemUtils.getSimpleStack(b), aNewHeatedWaterName);
                 LanguageRegistry.instance()
                     .addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName);
-                GT_LanguageManager.addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName);
+                GTLanguageManager.addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName);
             }
             Fluid f = BlocksItems.getFluid(InternalName.fluidHotWater);
             if (f != null) {
                 LanguageRegistry.instance()
                     .addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName);
-                GT_LanguageManager.addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName);
+                GTLanguageManager.addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName);
                 int aDam = FluidRegistry.getFluidID(f);
                 ItemStack s = ItemList.Display_Fluid.getWithDamage(1, aDam);
                 if (s != null) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index ee0d040394..ef9274af1d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -8,10 +8,10 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.TAE;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Material_Casings;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.MaterialCasings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
 
 public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract {
@@ -19,32 +19,31 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract {
     CasingTextureHandler TextureHandler = new CasingTextureHandler();
 
     public GregtechMetaCasingBlocks() {
-        super(GregtechMetaCasingItems.class, "miscutils.blockcasings", GT_Material_Casings.INSTANCE);
+        super(GregtechMetaCasingItems.class, "miscutils.blockcasings", MaterialCasings.INSTANCE);
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             if (i == 2 || i == 3 || i == 4) {
                 continue;
             }
-            TAE.registerTexture(0, i, new GTPP_CopiedBlockTexture(this, 6, i));
+            TAE.registerTexture(0, i, new GTPPCopiedBlockTexture(this, 6, i));
         }
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Centrifuge Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Centrifuge Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Heat Resistant Coke Oven Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); // 60
-        GT_LanguageManager
-            .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Material Press Machine Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Electrolyzer Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Wire Factory Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Maceration Stack Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Matter Generation Coil"); // 65
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Matter Fabricator Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Iron Plated Bricks");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Multitank Exterior Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Hastelloy-N Reactor Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Zeron-100 Reactor Shielding");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); // 60
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Material Press Machine Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Electrolyzer Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Wire Factory Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Maceration Stack Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Matter Generation Coil"); // 65
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Matter Fabricator Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Iron Plated Bricks");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Multitank Exterior Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Hastelloy-N Reactor Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Zeron-100 Reactor Shielding");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".14.name", "Blast Smelter Heat Containment Coil ");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Blast Smelter Casing Block");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Blast Smelter Casing Block");
         GregtechItemList.Casing_Centrifuge1.set(new ItemStack(this, 1, 0));
         GregtechItemList.Casing_CokeOven.set(new ItemStack(this, 1, 1));
         GregtechItemList.Casing_CokeOven_Coil1.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
index 9d53c281a2..eefc983e21 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
@@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
 import gregtech.api.enums.TAE;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Material_Casings;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.MaterialCasings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler2;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController;
 
@@ -53,38 +53,38 @@ public class GregtechMetaCasingBlocks2 extends GregtechMetaCasingBlocksAbstract
             int tier = GregtechMetaTileEntity_PowerSubStationController.getCellTier(field_150939_a, meta);
             if (meta == 7 && tier > 0) {
                 long capacity = GregtechMetaTileEntity_PowerSubStationController.getCapacityFromCellTier(tier);
-                aList.add("Energy Storage: " + GT_Utility.formatNumbers(capacity));
+                aList.add("Energy Storage: " + GTUtility.formatNumbers(capacity));
             }
             super.addInformation(aStack, aPlayer, aList, aF3_H);
         }
     }
 
     public GregtechMetaCasingBlocks2() {
-        super(GregtechMetaCasingItemBlocks2.class, "gtplusplus.blockcasings.2", GT_Material_Casings.INSTANCE);
+        super(GregtechMetaCasingItemBlocks2.class, "gtplusplus.blockcasings.2", MaterialCasings.INSTANCE);
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             if (i == 4 || i == 10 || i == 11 || i == 12 || i == 14) {
                 continue;
             }
-            TAE.registerTexture(1, i, new GTPP_CopiedBlockTexture(this, 6, i));
+            TAE.registerTexture(1, i, new GTPPCopiedBlockTexture(this, 6, i));
         }
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Thermal Processing Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Hastelloy-N Sealant Block");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Hastelloy-X Structural Block");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Thermal Processing Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Hastelloy-N Sealant Block");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Hastelloy-X Structural Block");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Incoloy-DS Fluid Containment Block");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Wash Plant Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Industrial Sieve Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Large Sieve Grate");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Wash Plant Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Industrial Sieve Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Large Sieve Grate");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (EV)");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Sub-Station External Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Cyclotron Coil");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Cyclotron Outer Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Thermal Containment Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Bulk Production Frame");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cutting Factory Frame");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Sub-Station External Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Cyclotron Coil");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Cyclotron Outer Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Thermal Containment Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Bulk Production Frame");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cutting Factory Frame");
 
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Sterile Farm Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Sterile Farm Casing");
 
         GregtechItemList.Casing_ThermalCentrifuge.set(new ItemStack(this, 1, 0));
         GregtechItemList.Casing_Refinery_External.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index 76fb077de1..0a5399efdc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -11,11 +11,11 @@ import net.minecraft.world.IBlockAccess;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.TAE;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Material_Casings;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.MaterialCasings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler3;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController;
@@ -37,46 +37,45 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract
             int tier = GregtechMetaTileEntity_PowerSubStationController.getCellTier(field_150939_a, meta);
             if (tier > 0) {
                 long capacity = GregtechMetaTileEntity_PowerSubStationController.getCapacityFromCellTier(tier);
-                aList.add("Energy Storage: " + GT_Utility.formatNumbers(capacity));
+                aList.add("Energy Storage: " + GTUtility.formatNumbers(capacity));
             }
             super.addInformation(aStack, aPlayer, aList, aF3_H);
         }
     }
 
     public GregtechMetaCasingBlocks3() {
-        super(GregtechMetaCasingItemBlocks3.class, "gtplusplus.blockcasings.3", GT_Material_Casings.INSTANCE);
+        super(GregtechMetaCasingItemBlocks3.class, "gtplusplus.blockcasings.3", MaterialCasings.INSTANCE);
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             // Free up Redox casing in TAE
             if (i >= 4 && i <= 8) {
                 continue;
             }
-            TAE.registerTexture(2, i, new GTPP_CopiedBlockTexture(this, 6, i));
+            TAE.registerTexture(2, i, new GTPPCopiedBlockTexture(this, 6, i));
         }
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Aquatic Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel Reinforced Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Multi-Use Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Trinium Plated Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Aquatic Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel Reinforced Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Multi-Use Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Trinium Plated Casing");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Vanadium Redox Power Cell (IV)");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".5.name", "Vanadium Redox Power Cell (LuV)");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".6.name", "Vanadium Redox Power Cell (ZPM)");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (UHV)");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing");
-        GT_LanguageManager
-            .addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion Machine Casing MK III");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Advanced Fusion Coil");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Unnamed"); // Can Use, don't
-                                                                                                     // change texture
-                                                                                                     // (Used for Fusion
-                                                                                                     // MK4)
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Containment Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion Machine Casing MK III");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Advanced Fusion Coil");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Unnamed"); // Can Use, don't
+                                                                                                    // change texture
+                                                                                                    // (Used for Fusion
+                                                                                                    // MK4)
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Containment Casing");
         GregtechItemList.Casing_FishPond.set(new ItemStack(this, 1, 0));
         GregtechItemList.Casing_Extruder.set(new ItemStack(this, 1, 1));
         GregtechItemList.Casing_Multi_Use.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
index a150d7e828..d68653e73a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
@@ -9,30 +9,30 @@ import net.minecraft.util.IIcon;
 
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Material_Casings;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.MaterialCasings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GregtechMetaCasingBlocks4 extends GregtechMetaCasingBlocksAbstract {
 
     public GregtechMetaCasingBlocks4() {
-        super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.4", GT_Material_Casings.INSTANCE);
+        super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.4", MaterialCasings.INSTANCE);
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             if (i == 2 || i == 4 || i == 5 || i == 6 || i == 7 || i == 8 || i == 12 || i == 13 || i == 14 || i == 15) {
                 continue;
             }
-            TAE.registerTexture(3, i, new GTPP_CopiedBlockTexture(this, 6, i));
+            TAE.registerTexture(3, i, new GTPPCopiedBlockTexture(this, 6, i));
         }
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Naquadah Reactor Base");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reactor Piping");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Naquadah Containment Chamber");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Tempered Arc Furnace Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Naquadah Reactor Base");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reactor Piping");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Naquadah Containment Chamber");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Tempered Arc Furnace Casing");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Quantum Force Transformer Coil Casings");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Vacuum Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Turbodyne Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Vacuum Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Turbodyne Casing");
 
         GregtechItemList.Casing_Naq_Reactor_A.set(new ItemStack(this, 1, 0));
         GregtechItemList.Casing_Naq_Reactor_B.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
index cc573cd188..afe195d7aa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
@@ -8,10 +8,10 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Material_Casings;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.MaterialCasings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGrinderMultiblock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
@@ -23,37 +23,36 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract
     private static final TexturesGrinderMultiblock mGrinderOverlayHandler = new TexturesGrinderMultiblock();
 
     public GregtechMetaCasingBlocks5() {
-        super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.5", GT_Material_Casings.INSTANCE);
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "IsaMill Exterior Casing"); // IsaMill
-                                                                                                                    // Casing
-        TAE.registerTexture(0, 2, new GTPP_CopiedBlockTexture(this, 6, 0));
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "IsaMill Piping"); // IsaMill
-                                                                                                           // Pipe
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "IsaMill Gearbox"); // IsaMill
-                                                                                                            // Gearbox
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Elemental Confinement Shell"); // Duplicator
+        super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.5", MaterialCasings.INSTANCE);
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "IsaMill Exterior Casing"); // IsaMill
+                                                                                                                   // Casing
+        TAE.registerTexture(0, 2, new GTPPCopiedBlockTexture(this, 6, 0));
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "IsaMill Piping"); // IsaMill
+                                                                                                          // Pipe
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "IsaMill Gearbox"); // IsaMill
+                                                                                                           // Gearbox
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Elemental Confinement Shell"); // Duplicator
+                                                                                                                       // Casing
+        TAE.registerTexture(0, 3, new GTPPCopiedBlockTexture(this, 6, 3));
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Sparge Tower Exterior Casing"); // Sparge
+                                                                                                                        // Tower
                                                                                                                         // Casing
-        TAE.registerTexture(0, 3, new GTPP_CopiedBlockTexture(this, 6, 3));
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Sparge Tower Exterior Casing"); // Sparge
-                                                                                                                         // Tower
-                                                                                                                         // Casing
-        TAE.registerTexture(0, 4, new GTPP_CopiedBlockTexture(this, 6, 4));
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Sturdy Printer Casing"); // Unused
-        TAE.registerTexture(1, 10, new GTPP_CopiedBlockTexture(this, 6, 5));
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Forge Casing"); // Forge Hammer
-                                                                                                         // Casing
-        TAE.registerTexture(1, 11, new GTPP_CopiedBlockTexture(this, 6, 6));
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Neutron Pulse Manipulator");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Cosmic Fabric Manipulator");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Infinity Infused Manipulator");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "SpaceTime Continuum Ripper");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Neutron Shielding Core");
-        GT_LanguageManager
-            .addStringLocalization(this.getUnlocalizedName() + ".12.name", "Cosmic Fabric Shielding Core");
-        GT_LanguageManager
+        TAE.registerTexture(0, 4, new GTPPCopiedBlockTexture(this, 6, 4));
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Sturdy Printer Casing"); // Unused
+        TAE.registerTexture(1, 10, new GTPPCopiedBlockTexture(this, 6, 5));
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Forge Casing"); // Forge Hammer
+                                                                                                        // Casing
+        TAE.registerTexture(1, 11, new GTPPCopiedBlockTexture(this, 6, 6));
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Neutron Pulse Manipulator");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Cosmic Fabric Manipulator");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Infinity Infused Manipulator");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "SpaceTime Continuum Ripper");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Neutron Shielding Core");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Cosmic Fabric Shielding Core");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".13.name", "Infinity Infused Shielding Core");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "SpaceTime Bending Core");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Force Field Glass");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "SpaceTime Bending Core");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Force Field Glass");
 
         GregtechItemList.Casing_IsaMill_Casing.set(new ItemStack(this, 1, 0));
         GregtechItemList.Casing_IsaMill_Pipe.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java
index d257078461..c51d6e6afd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java
@@ -13,10 +13,10 @@ import net.minecraft.world.IBlockAccess;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.TAE;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Material_Casings;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.MaterialCasings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler6;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
@@ -45,13 +45,13 @@ public class GregtechMetaCasingBlocks6 extends GregtechMetaCasingBlocksAbstract
     }
 
     public GregtechMetaCasingBlocks6() {
-        super(GregtechMetaCasingItemBlocks3.class, "gtplusplus.blockcasings.6", GT_Material_Casings.INSTANCE);
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Fusion Machine Casing MK IV");
-        TAE.registerTexture(3, 4, new GTPP_CopiedBlockTexture(this, 6, 0));
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Advanced Fusion Coil II");
-        TAE.registerTexture(3, 5, new GTPP_CopiedBlockTexture(this, 6, 1));
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Unnamed");
-        TAE.registerTexture(3, 6, new GTPP_CopiedBlockTexture(this, 6, 2));
+        super(GregtechMetaCasingItemBlocks3.class, "gtplusplus.blockcasings.6", MaterialCasings.INSTANCE);
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Fusion Machine Casing MK IV");
+        TAE.registerTexture(3, 4, new GTPPCopiedBlockTexture(this, 6, 0));
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Advanced Fusion Coil II");
+        TAE.registerTexture(3, 5, new GTPPCopiedBlockTexture(this, 6, 1));
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Unnamed");
+        TAE.registerTexture(3, 6, new GTPPCopiedBlockTexture(this, 6, 2));
         GregtechItemList.Casing_Fusion_External2.set(new ItemStack(this, 1, 0));
         GregtechItemList.Casing_Fusion_Internal2.set(new ItemStack(this, 1, 1));
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
index 79d9e2c458..f286b4d628 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
@@ -19,20 +19,20 @@ 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.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Block_Casings_Abstract;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.BlockCasingsAbstract;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 
-public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_Abstract {
+public abstract class GregtechMetaCasingBlocksAbstract extends BlockCasingsAbstract {
 
     public GregtechMetaCasingBlocksAbstract(final Class<? extends ItemBlock> aItemClass, final String aName,
         final Material aMaterial) {
         super(aItemClass, aName, aMaterial);
         this.setStepSound(soundTypeMetal);
         this.setCreativeTab(AddToCreativeTab.tabMachines);
-        GregTech_API.registerMachineBlock(this, -1);
-        GT_LanguageManager
+        GregTechAPI.registerMachineBlock(this, -1);
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
     }
 
@@ -63,8 +63,8 @@ public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_
 
     @Override
     public void onBlockAdded(final World aWorld, final int aX, final int aY, final int aZ) {
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
@@ -106,8 +106,8 @@ public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_
     @Override
     public void breakBlock(final World aWorld, final int aX, final int aY, final int aZ, final Block aBlock,
         final int aMetaData) {
-        if (GregTech_API.isMachineBlock(this, aMetaData)) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aMetaData)) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java
index ad2b11f924..32f1f127d0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java
@@ -8,9 +8,9 @@ import net.minecraft.world.IBlockAccess;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Material_Casings;
-import gtPlusPlus.core.material.ALLOY;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.MaterialCasings;
+import gtPlusPlus.core.material.MaterialsAlloy;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlocksAbstract {
@@ -18,42 +18,41 @@ public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlock
     private static HashMap<Integer, Integer> sMaterialMapping = new HashMap<>();
 
     public GregtechMetaCasingBlocksPipeGearbox() {
-        super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.pipesgears", GT_Material_Casings.INSTANCE);
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Eglin Steel Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel-792 Gear Box Casing");
-        GT_LanguageManager
-            .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Incoloy MA956 Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Nitinol-60 Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Zeron-100 Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Pikyonium Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Titansteel Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Abyssal Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Babbit Alloy Pipe Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Inconel-690 Pipe Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Stellite Pipe Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Nitinol-60 Pipe Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Lafium Pipe Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cinobite Pipe Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Titansteel Pipe Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Abyssal Pipe Casing");
+        super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.pipesgears", MaterialCasings.INSTANCE);
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Eglin Steel Gear Box Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel-792 Gear Box Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Incoloy MA956 Gear Box Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Nitinol-60 Gear Box Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Zeron-100 Gear Box Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Pikyonium Gear Box Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Titansteel Gear Box Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Abyssal Gear Box Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Babbit Alloy Pipe Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Inconel-690 Pipe Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Stellite Pipe Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Nitinol-60 Pipe Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Lafium Pipe Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cinobite Pipe Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Titansteel Pipe Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Abyssal Pipe Casing");
 
         int aMappingID = 0;
-        sMaterialMapping.put(aMappingID++, ALLOY.EGLIN_STEEL.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.INCONEL_792.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.INCOLOY_MA956.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.NITINOL_60.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.ZERON_100.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.PIKYONIUM.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.TITANSTEEL.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.ABYSSAL.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.BABBIT_ALLOY.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.INCONEL_690.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.STELLITE.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.NITINOL_60.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.LAFIUM.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.CINOBITE.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.TITANSTEEL.getRgbAsHex());
-        sMaterialMapping.put(aMappingID++, ALLOY.ABYSSAL.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.EGLIN_STEEL.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.INCONEL_792.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.INCOLOY_MA956.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.NITINOL_60.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.ZERON_100.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.PIKYONIUM.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.TITANSTEEL.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.ABYSSAL.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.BABBIT_ALLOY.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.INCONEL_690.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.STELLITE.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.NITINOL_60.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.LAFIUM.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.CINOBITE.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.TITANSTEEL.getRgbAsHex());
+        sMaterialMapping.put(aMappingID++, MaterialsAlloy.ABYSSAL.getRgbAsHex());
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
index 23d9ab5007..a432212670 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
@@ -7,21 +7,21 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 public abstract class GregtechMetaItemCasingsAbstract extends ItemBlock {
 
-    protected final String mCasing_Centrifuge = GT_LanguageManager
+    protected final String mCasing_Centrifuge = GTLanguageManager
         .addStringLocalization("mu.centrifugecasing", "Warning! Standing in the Centrifuge not recommended");
-    protected final String mCasing_CokeOven = GT_LanguageManager
+    protected final String mCasing_CokeOven = GTLanguageManager
         .addStringLocalization("mu.cokeoven", "Sturdy and Strong");
-    protected final String mCasing_CokeCoil1 = GT_LanguageManager
+    protected final String mCasing_CokeCoil1 = GTLanguageManager
         .addStringLocalization("mu.coil01tooltip", "Base Heating Capacity = 1350 Kelvin");
-    protected final String mCasing_CokeCoil2 = GT_LanguageManager
+    protected final String mCasing_CokeCoil2 = GTLanguageManager
         .addStringLocalization("mu.coil02tooltip", "Base Heating Capacity = 2275 Kelvin");
-    protected final String mNoMobsToolTip = GT_LanguageManager
+    protected final String mNoMobsToolTip = GTLanguageManager
         .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
-    protected final String mNoTileEntityToolTip = GT_LanguageManager
+    protected final String mNoTileEntityToolTip = GTLanguageManager
         .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!");
 
     public GregtechMetaItemCasingsAbstract(final Block par1) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
index 473c13f3da..7c65de73bd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
@@ -11,10 +11,10 @@ import net.minecraft.util.IIcon;
 
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Material_Casings;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.MaterialCasings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksAbstract {
@@ -43,19 +43,18 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA
     }
 
     public GregtechMetaSpecialMachineCasings() {
-        super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.2", GT_Material_Casings.INSTANCE);
+        super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.2", MaterialCasings.INSTANCE);
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             // TAE.registerTextures(new GT_CopiedBlockTexture(this, 6, i));
             // Don't register these Textures, They already exist within vanilla GT. (May not exist in 5.08)
         }
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Strong Bronze Machine Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Strong Bronze Machine Casing");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".1.name", "Sturdy Aluminium Machine Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Vigorous Laurenium Machine Casing");
-        TAE.registerTexture(84, new GTPP_CopiedBlockTexture(this, 6, 2));
-        GT_LanguageManager
-            .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Rugged Botmium Machine Casing");
+        TAE.registerTexture(84, new GTPPCopiedBlockTexture(this, 6, 2));
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Rugged Botmium Machine Casing");
 
         GregtechItemList.Casing_Machine_Custom_1.set(new ItemStack(this, 1, 0));
         GregtechItemList.Casing_Machine_Custom_2.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
index 1d7c853e71..dba95455c8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
@@ -13,10 +13,10 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Material_Casings;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.MaterialCasings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.turbine.LargeTurbineTextureHandler;
 
@@ -39,32 +39,29 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
     }
 
     public GregtechMetaSpecialMultiCasings() {
-        super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.1", GT_Material_Casings.INSTANCE);
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Turbine Shaft");
-        GT_LanguageManager
+        super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.1", MaterialCasings.INSTANCE);
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Turbine Shaft");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reinforced Steam Turbine Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Reinforced HP Steam Turbine Casing");
-        GT_LanguageManager
-            .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Reinforced Gas Turbine Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Reinforced Gas Turbine Casing");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Reinforced Plasma Turbine Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Tesla Containment Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Structural Solar Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Salt Containment Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Thermally Insulated Casing");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Flotation Cell Casings");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Reinforced Engine Casing");
-        GT_LanguageManager
-            .addStringLocalization(this.getUnlocalizedName() + ".11.name", "Molecular Containment Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Tesla Containment Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Structural Solar Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Salt Containment Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Thermally Insulated Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Flotation Cell Casings");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Reinforced Engine Casing");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Molecular Containment Casing");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".12.name", "High Voltage Current Capacitor");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Particle Containment Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Particle Containment Casing");
+        GTLanguageManager
             .addStringLocalization(this.getUnlocalizedName() + ".14.name", "Reinforced Heat Exchanger Casing");
-        GT_LanguageManager
-            .addStringLocalization(this.getUnlocalizedName() + ".15.name", "Reinforced SC Turbine Casing");
-        TAE.registerTexture(1, 12, new GTPP_CopiedBlockTexture(this, 6, 14));
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Reinforced SC Turbine Casing");
+        TAE.registerTexture(1, 12, new GTPPCopiedBlockTexture(this, 6, 14));
 
         GregtechItemList.Casing_Turbine_Shaft.set(new ItemStack(this, 1, 0));
         GregtechItemList.Casing_Turbine_LP.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java
index 9a2912c2c5..4f34811289 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java
@@ -13,8 +13,8 @@ import net.minecraft.world.IBlockAccess;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Material_Casings;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.MaterialCasings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
@@ -47,19 +47,19 @@ public class GregtechMetaSpecialMultiCasings2 extends GregtechMetaCasingBlocksAb
     }
 
     public GregtechMetaSpecialMultiCasings2() {
-        super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.3", GT_Material_Casings.INSTANCE);
+        super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.3", MaterialCasings.INSTANCE);
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             // TAE.registerTextures(new GT_CopiedBlockTexture(this, 6, i));
             // Don't register these Textures, They already exist within vanilla GT. (May not exist in 5.08)
         }
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Resonance Chamber I");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Resonance Chamber II");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Resonance Chamber III");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Resonance Chamber IV");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Modulator I");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Modulator II");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Modulator III");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Modulator IV");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Resonance Chamber I");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Resonance Chamber II");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Resonance Chamber III");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Resonance Chamber IV");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Modulator I");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Modulator II");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Modulator III");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Modulator IV");
 
         GregtechItemList.ResonanceChamber_I.set(new ItemStack(this, 1, 0));
         GregtechItemList.ResonanceChamber_II.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
index 7ddab1c471..50780c5809 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
@@ -9,10 +9,10 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Material_Casings;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.MaterialCasings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
@@ -35,24 +35,24 @@ public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbs
         public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
             int aMeta = aStack.getItemDamage();
             if (aMeta < 10) {
-                aList.add("Tier: " + GT_Values.VN[aMeta]);
+                aList.add("Tier: " + GTValues.VN[aMeta]);
             }
             super.addInformation(aStack, aPlayer, aList, aF3_H);
         }
     }
 
     public GregtechMetaTieredCasingBlocks1() {
-        super(TieredCasingItemBlock.class, "gtplusplus.blocktieredcasings.1", GT_Material_Casings.INSTANCE);
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Integral Encasement I");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Integral Encasement II");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Integral Encasement III");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Integral Encasement IV");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Integral Encasement V");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Integral Framework I");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Integral Framework II");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Integral Framework III");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Integral Framework IV");
-        GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Integral Framework V");
+        super(TieredCasingItemBlock.class, "gtplusplus.blocktieredcasings.1", MaterialCasings.INSTANCE);
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Integral Encasement I");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Integral Encasement II");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Integral Encasement III");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Integral Encasement IV");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Integral Encasement V");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Integral Framework I");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Integral Framework II");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Integral Framework III");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Integral Framework IV");
+        GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Integral Framework V");
 
         GregtechItemList.GTPP_Casing_ULV.set(new ItemStack(this, 1, 0));
         GregtechItemList.GTPP_Casing_LV.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index 30658ab6ef..0f1c39d28e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -28,7 +28,7 @@ public class GregtechFluidHandler {
                 GT_Materials.Cryotheum,
                 4,
                 5,
-                GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L),
                 ItemUtils.getEmptyCell(),
                 1000);
         }
@@ -39,7 +39,7 @@ public class GregtechFluidHandler {
                 GT_Materials.Pyrotheum,
                 4,
                 4000,
-                GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L),
                 ItemUtils.getEmptyCell(),
                 1000);
         }
@@ -50,7 +50,7 @@ public class GregtechFluidHandler {
                 GT_Materials.Ender,
                 4,
                 4000,
-                GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L),
                 ItemUtils.getEmptyCell(),
                 1000);
         }
@@ -62,7 +62,7 @@ public class GregtechFluidHandler {
             GT_Materials.HydrofluoricAcid,
             1,
             120,
-            GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L),
+            GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L),
             ItemUtils.getEmptyCell(),
             1000,
             false);
@@ -80,7 +80,7 @@ public class GregtechFluidHandler {
             GT_Materials.SulfurousAcid,
             4,
             75,
-            GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L),
+            GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L),
             ItemUtils.getEmptyCell(),
             1000,
             false);
@@ -92,7 +92,7 @@ public class GregtechFluidHandler {
             GT_Materials.SulfuricApatite,
             4,
             500,
-            GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L),
+            GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L),
             ItemUtils.getEmptyCell(),
             1000,
             false);
@@ -106,7 +106,7 @@ public class GregtechFluidHandler {
                 GT_Materials.HydrogenChloride,
                 4,
                 75,
-                GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L),
                 ItemUtils.getEmptyCell(),
                 1000,
                 false);
@@ -119,7 +119,7 @@ public class GregtechFluidHandler {
             GT_Materials.SulfuricLithium,
             4,
             280,
-            GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L),
+            GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L),
             ItemUtils.getEmptyCell(),
             1000,
             false);
@@ -131,7 +131,7 @@ public class GregtechFluidHandler {
             GT_Materials.LithiumHydroxide,
             4,
             500,
-            GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L),
+            GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L),
             ItemUtils.getEmptyCell(),
             1000,
             false);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
index 058d2a7f1e..f4d3d22aba 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
@@ -9,7 +9,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCentrifuge;
 
 public class TexturesCentrifugeMultiblock {
 
@@ -67,8 +67,8 @@ public class TexturesCentrifugeMultiblock {
         ForgeDirection side) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0;
-        if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialCentrifuge
-            && tTile.getFrontFacing() == side) return tTile.isActive() ? 1 : 2;
+        if (tTile.getMetaTileEntity() instanceof MTEIndustrialCentrifuge && tTile.getFrontFacing() == side)
+            return tTile.isActive() ? 1 : 2;
         return 0;
     }
 
@@ -133,8 +133,8 @@ public class TexturesCentrifugeMultiblock {
 
     public boolean isUsingAnimatedTexture(IMetaTileEntity aMetaTileEntity) {
         if (aMetaTileEntity != null) {
-            if (aMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge) {
-                return ((GregtechMetaTileEntity_IndustrialCentrifuge) aMetaTileEntity).usingAnimations();
+            if (aMetaTileEntity instanceof MTEIndustrialCentrifuge) {
+                return ((MTEIndustrialCentrifuge) aMetaTileEntity).usingAnimations();
             }
         }
         return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
index e7d09bd308..128e9c95d7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
@@ -9,7 +9,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks5;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IsaMill;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIsaMill;
 
 public class TexturesGrinderMultiblock {
 
@@ -61,7 +61,7 @@ public class TexturesGrinderMultiblock {
     private static int isIsaControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection side) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0;
-        if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IsaMill && tTile.getFrontFacing() == side)
+        if (tTile.getMetaTileEntity() instanceof MTEIsaMill && tTile.getFrontFacing() == side)
             return tTile.isActive() ? 1 : 2;
         return 0;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index 7b58e35a68..57d01bcc5f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -6,17 +6,17 @@ import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 
 public class TexturesGtBlock {
 
-    private static final boolean mAnimated = CORE.ConfigSwitches.enableAnimatedTextures;
+    private static final boolean mAnimated = GTPPCore.ConfigSwitches.enableAnimatedTextures;
     private static final AutoMap<Runnable> mCustomiconMap = new AutoMap<>();
 
     /*
@@ -38,7 +38,7 @@ public class TexturesGtBlock {
             this.mModID = aModID;
             mCustomiconMap.put(this);
             Logger.WARNING("Constructing a Custom Texture. " + this.mIconName);
-            GregTech_API.sGTBlockIconload.add(this);
+            GregTechAPI.sGTBlockIconload.add(this);
         }
 
         @Override
@@ -53,7 +53,7 @@ public class TexturesGtBlock {
 
         @Override
         public void run() {
-            this.mIcon = GregTech_API.sBlockIcons.registerIcon(this.mModID + ":" + this.mIconName);
+            this.mIcon = GregTechAPI.sBlockIcons.registerIcon(this.mModID + ":" + this.mIconName);
             Logger.WARNING(
                 "FIND ME _ Processing texture: " + this.getTextureFile()
                     .getResourcePath());
@@ -565,16 +565,16 @@ public class TexturesGtBlock {
     public static final CustomIcon TEXTURE_TECH_PANEL_H = new CustomIcon("metro/TEXTURE_TECH_PANEL_H");
 
     public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[] {
-        new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }),
-        new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }),
-        new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 100, 0, 0 }),
-        new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 255, 30, 0 }),
-        new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 128, 128, 128, 0 }),
-        new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
-        new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
-        new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
-        new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
-        new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }) };
+        new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }),
+        new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }),
+        new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 100, 0, 0 }),
+        new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 255, 30, 0 }),
+        new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 128, 128, 128, 0 }),
+        new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
+        new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
+        new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
+        new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
+        new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }) };
 
     public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[] { TEXTURE_CASING_FUSION_COIL_II_1,
         TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3, TEXTURE_CASING_FUSION_COIL_II_4,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
index a9f74cd75d..bf16555e4f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
@@ -6,7 +6,7 @@ import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.IIconContainer;
 import gtPlusPlus.api.objects.Logger;
 
@@ -23,7 +23,7 @@ public final class TexturesGtTools {
         public CustomIcon(final String aIconName) {
             this.mIconName = aIconName;
             Logger.INFO("Constructing a Custom Texture. " + this.mIconName);
-            GregTech_API.sGTItemIconload.add(this);
+            GregTechAPI.sGTItemIconload.add(this);
         }
 
         @Override
@@ -38,9 +38,9 @@ public final class TexturesGtTools {
 
         @Override
         public void run() {
-            this.mIcon = GregTech_API.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName);
+            this.mIcon = GregTechAPI.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName);
             // Utils.LOG_INFO("Registering a Custom Texture. "+mIcon.g);
-            this.mOverlay = GregTech_API.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName + "_OVERLAY");
+            this.mOverlay = GregTechAPI.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName + "_OVERLAY");
         }
 
         @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java
index c983044319..dea287fde6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java
@@ -98,7 +98,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaSpecialMultiCasings;
 
 public class LargeTurbineTextureHandler {
@@ -206,7 +206,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[0];
                     }
@@ -217,7 +217,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[3];
                     }
@@ -228,7 +228,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[6];
                     }
@@ -238,7 +238,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[1];
                     }
@@ -248,7 +248,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[7];
                     }
@@ -259,7 +259,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[8];
                     }
@@ -270,7 +270,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[5];
                     }
@@ -281,7 +281,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[2];
                     }
@@ -295,7 +295,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[0];
                     }
@@ -306,7 +306,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[3];
                     }
@@ -317,7 +317,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[6];
                     }
@@ -327,7 +327,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[1];
                     }
@@ -337,7 +337,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[7];
                     }
@@ -348,7 +348,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[8];
                     }
@@ -359,7 +359,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[5];
                     }
@@ -370,7 +370,7 @@ public class LargeTurbineTextureHandler {
                     && ((tTileEntity instanceof IGregTechTileEntity))
                     && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side)
                     && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
-                    && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
+                    && ((tMetaTileEntity instanceof MTEHatchTurbine))) {
                     if (isUsingAnimatedTexture(tTileEntity)) {
                         return mGetCurrentTextureSet_ACTIVE[2];
                     }
@@ -388,8 +388,8 @@ public class LargeTurbineTextureHandler {
             aTile = (IGregTechTileEntity) tTileEntity;
             if (aTile != null) {
                 final IMetaTileEntity aMetaTileEntity = aTile.getMetaTileEntity();
-                if (aMetaTileEntity != null && aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine) {
-                    aVal = ((GT_MetaTileEntity_Hatch_Turbine) aMetaTileEntity).getBaseMetaTileEntity()
+                if (aMetaTileEntity != null && aMetaTileEntity instanceof MTEHatchTurbine) {
+                    aVal = ((MTEHatchTurbine) aMetaTileEntity).getBaseMetaTileEntity()
                         .isActive();
                     // Logger.INFO("Returning "+aVal+" as Rotor Assembly controller status");
                 }
@@ -398,11 +398,11 @@ public class LargeTurbineTextureHandler {
         return aVal;
     }
 
-    public static GT_MetaTileEntity_Hatch_Turbine isTurbineHatch(final IGregTechTileEntity aTileEntity) {
+    public static MTEHatchTurbine isTurbineHatch(final IGregTechTileEntity aTileEntity) {
         if (aTileEntity != null) {
             final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity != null && aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine) {
-                return (GT_MetaTileEntity_Hatch_Turbine) aMetaTileEntity;
+            if (aMetaTileEntity != null && aMetaTileEntity instanceof MTEHatchTurbine) {
+                return (MTEHatchTurbine) aMetaTileEntity;
             }
         }
         return null;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverOverflow.java
index a3341ea077..f93b371aa3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverOverflow.java
@@ -11,21 +11,21 @@ import net.minecraftforge.fluids.IFluidHandler;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
 
-public class GTPP_Cover_Overflow extends GT_CoverBehavior {
+public class CoverOverflow extends CoverBehavior {
 
     public final int mTransferRate;
     public final int mInitialTransferRate;
     public final int mMaxTransferRate;
 
-    public GTPP_Cover_Overflow(int aTransferRate) {
+    public CoverOverflow(int aTransferRate) {
         this.mTransferRate = aTransferRate * 1000 / 10;
         this.mInitialTransferRate = aTransferRate;
         this.mMaxTransferRate = aTransferRate * 1000;
@@ -67,7 +67,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
 
     public int onCoverScrewdriverclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        if (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
+        if (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
             aCoverVariable += (mMaxTransferRate * (aPlayer.isSneaking() ? 0.1f : 0.01f));
         } else {
             aCoverVariable -= (mMaxTransferRate * (aPlayer.isSneaking() ? 0.1f : 0.01f));
@@ -78,9 +78,9 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
         if (aCoverVariable <= 0) {
             aCoverVariable = mMaxTransferRate;
         }
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
-            GT_Utility.trans("322", "Overflow point: ") + aCoverVariable + GT_Utility.trans("323", "L"));
+            GTUtility.trans("322", "Overflow point: ") + aCoverVariable + GTUtility.trans("323", "L"));
         return aCoverVariable;
     }
 
@@ -88,7 +88,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         boolean aShift = aPlayer.isSneaking();
         int aAmount = aShift ? 128 : 8;
-        if (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
+        if (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
             aCoverVariable += aAmount;
         } else {
             aCoverVariable -= aAmount;
@@ -99,9 +99,9 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
         if (aCoverVariable <= 0) {
             aCoverVariable = mMaxTransferRate;
         }
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
-            GT_Utility.trans("322", "Overflow point: ") + aCoverVariable + GT_Utility.trans("323", "L"));
+            GTUtility.trans("322", "Overflow point: ") + aCoverVariable + GTUtility.trans("323", "L"));
         aTileEntity.setCoverDataAtSide(side, new ISerializableObject.LegacyCoverData(aCoverVariable));
         return true;
     }
@@ -158,7 +158,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new OverflowUIFactory(buildContext).createWindow();
     }
 
@@ -169,7 +169,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public OverflowUIFactory(GT_CoverUIBuildContext buildContext) {
+        public OverflowUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -180,9 +180,9 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
 
             builder
                 .widget(
-                    new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GTPP_Cover_Overflow.this)
+                    new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverOverflow.this)
                         .addFollower(
-                            new CoverDataFollower_NumericWidget<>(),
+                            new CoverDataFollowerNumericWidget<>(),
                             coverData -> (double) convert(coverData),
                             (coverData, state) -> new ISerializableObject.LegacyCoverData(state.intValue()),
                             widget -> widget.setBounds(0, mMaxTransferRate)
@@ -191,7 +191,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
                                 .setPos(startX + spaceX * 0, startY + spaceY * 1 + 8)
                                 .setSize(spaceX * 4 - 3, 12)))
                 .widget(
-                    new TextWidget(GT_Utility.trans("322", "Overflow point: ")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("322", "Overflow point: ")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX, 4 + startY + spaceY * 0 + 8));
         }
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverToggleVisual.java
index 42ab793c9c..2ba532d11f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverToggleVisual.java
@@ -12,14 +12,14 @@ import net.minecraftforge.fluids.Fluid;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
+public class CoverToggleVisual extends CoverBehavior {
 
     private static final Map<String, Integer> sConnectionStateForEntityMap = new ConcurrentHashMap<>();
     private static final Map<String, String> sPrefixMap = new ConcurrentHashMap<>();
@@ -41,7 +41,7 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
     public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         PlayerUtils
-            .messagePlayer(aPlayer, GT_Utility.trans("756", "Connectable: ") + getConnectionState(aCoverVariable));
+            .messagePlayer(aPlayer, GTUtility.trans("756", "Connectable: ") + getConnectionState(aCoverVariable));
         return super.onCoverRightclick(side, aCoverID, aCoverVariable, aTileEntity, aPlayer, aX, aY, aZ);
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
index 924484e098..e11f4fae02 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.helpers;
 
-import static gregtech.api.GregTech_API.mEUtoRF;
+import static gregtech.api.GregTechAPI.mEUtoRF;
 import static gregtech.api.enums.Mods.Baubles;
 import static gregtech.api.enums.Mods.COFHCore;
 
@@ -20,26 +20,26 @@ import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
-import gregtech.common.items.GT_MetaGenerated_Item_02;
-import gregtech.common.items.GT_MetaGenerated_Item_03;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTModHandler;
+import gregtech.common.items.MetaGeneratedItem01;
+import gregtech.common.items.MetaGeneratedItem02;
+import gregtech.common.items.MetaGeneratedItem03;
+import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEWirelessCharger;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 
 public class ChargingHelper {
 
-    private static final Map<String, Pair<GregtechMetaWirelessCharger, Byte>> mValidPlayers = new HashMap<>();
-    protected static Map<BlockPos, GregtechMetaWirelessCharger> mChargerMap = new HashMap<>();
+    private static final Map<String, Pair<MTEWirelessCharger, Byte>> mValidPlayers = new HashMap<>();
+    protected static Map<BlockPos, MTEWirelessCharger> mChargerMap = new HashMap<>();
     private int mTickTimer = 0;
     private static final int mTickMultiplier = 20;
 
@@ -75,7 +75,7 @@ public class ChargingHelper {
                     }
                 }
 
-                for (GregtechMetaWirelessCharger mEntityTemp : mChargerMap.values()) {
+                for (MTEWirelessCharger mEntityTemp : mChargerMap.values()) {
                     if (mEntityTemp != null) {
                         if (mEntityTemp.getBaseMetaTileEntity() == null || !mEntityTemp.getBaseMetaTileEntity()
                             .isAllowedToWork()) continue;
@@ -96,11 +96,11 @@ public class ChargingHelper {
                                 if (mStartingEu - mEntityTemp.getEUVar() <= 0) {
                                     long mMaxDistance;
                                     if (mEntityTemp.getMode() == 0) {
-                                        mMaxDistance = (4 * GT_Values.V[mEntityTemp.getTier()]);
+                                        mMaxDistance = (4 * GTValues.V[mEntityTemp.getTier()]);
                                     } else if (mEntityTemp.getMode() == 1) {
                                         mMaxDistance = (mEntityTemp.getTier() * 10L);
                                     } else {
-                                        mMaxDistance = (4 * GT_Values.V[mEntityTemp.getTier()] / 2);
+                                        mMaxDistance = (4 * GTValues.V[mEntityTemp.getTier()] / 2);
                                     }
                                     double mDistance = calculateDistance(mEntityTemp, mPlayerMan);
                                     long mVoltageCost = MathUtils.findPercentageOfInt(mMaxDistance, (float) mDistance);
@@ -121,7 +121,7 @@ public class ChargingHelper {
         } catch (Throwable t) {
             if (!mChargerMap.isEmpty()) {
                 for (BlockPos aPos : mChargerMap.keySet()) {
-                    GregtechMetaWirelessCharger r = mChargerMap.get(aPos);
+                    MTEWirelessCharger r = mChargerMap.get(aPos);
                     if (r == null || r.getBaseMetaTileEntity()
                         .isInvalidTileEntity()) {
                         mChargerMap.remove(aPos);
@@ -131,11 +131,11 @@ public class ChargingHelper {
         }
     }
 
-    public static GregtechMetaWirelessCharger getEntry(BlockPos mPos) {
+    public static MTEWirelessCharger getEntry(BlockPos mPos) {
         return mChargerMap.get(mPos);
     }
 
-    public static boolean addEntry(BlockPos mPos, GregtechMetaWirelessCharger mEntity) {
+    public static boolean addEntry(BlockPos mPos, MTEWirelessCharger mEntity) {
         if (mEntity == null) {
             return false;
         }
@@ -143,7 +143,7 @@ public class ChargingHelper {
         return true;
     }
 
-    public static boolean removeEntry(BlockPos mPos, GregtechMetaWirelessCharger mEntity) {
+    public static boolean removeEntry(BlockPos mPos, MTEWirelessCharger mEntity) {
         if (mEntity == null) {
             return false;
         }
@@ -154,31 +154,31 @@ public class ChargingHelper {
         }
     }
 
-    public static boolean addValidPlayer(EntityPlayer mPlayer, GregtechMetaWirelessCharger mEntity) {
+    public static boolean addValidPlayer(EntityPlayer mPlayer, MTEWirelessCharger mEntity) {
         if (mEntity == null) {
             return false;
         }
         if (mValidPlayers.containsKey(mPlayer.getDisplayName())) {
             return false;
         } else {
-            Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode());
+            Pair<MTEWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode());
             return mValidPlayers.put(mPlayer.getDisplayName(), mEntry) == null;
         }
     }
 
-    public static boolean removeValidPlayer(EntityPlayer mPlayer, GregtechMetaWirelessCharger mEntity) {
+    public static boolean removeValidPlayer(EntityPlayer mPlayer, MTEWirelessCharger mEntity) {
         if (mEntity == null) {
             return false;
         }
         if (mValidPlayers.containsKey(mPlayer.getDisplayName())) {
-            Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode());
+            Pair<MTEWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode());
             return mValidPlayers.remove(mPlayer.getDisplayName(), mEntry);
         } else {
             return false;
         }
     }
 
-    private boolean canCharge(GregtechMetaWirelessCharger charger, EntityPlayer chargeablePlayer,
+    private boolean canCharge(MTEWirelessCharger charger, EntityPlayer chargeablePlayer,
         Map<String, UUID> longRangeChargers, Map<String, UUID> shortRangeChargers) {
         if (charger.getMode() == 0) {
             return !longRangeChargers.isEmpty() && longRangeChargers.containsKey(chargeablePlayer.getDisplayName());
@@ -192,7 +192,7 @@ public class ChargingHelper {
         }
     }
 
-    private double calculateDistance(GregtechMetaWirelessCharger mEntityTemp, EntityPlayer mPlayerMan) {
+    private double calculateDistance(MTEWirelessCharger mEntityTemp, EntityPlayer mPlayerMan) {
         if (mEntityTemp == null || mPlayerMan == null) {
             return 0;
         }
@@ -201,14 +201,14 @@ public class ChargingHelper {
             mEntityTemp.getPositionOfEntity(mPlayerMan));
     }
 
-    private void chargeItems(@Nonnull GregtechMetaWirelessCharger mEntity, ItemStack[] mItems) {
+    private void chargeItems(@Nonnull MTEWirelessCharger mEntity, ItemStack[] mItems) {
         if (mItems == null || mItems.length == 0) {
             return;
         }
         chargeItemsEx(mEntity, mItems);
     }
 
-    private void chargeItemsEx(@Nonnull GregtechMetaWirelessCharger mEntity, ItemStack[] mItems) {
+    private void chargeItemsEx(@Nonnull MTEWirelessCharger mEntity, ItemStack[] mItems) {
         // Bad Inventory
         if (mItems == null || mItems.length == 0) {
             return;
@@ -234,19 +234,18 @@ public class ChargingHelper {
                     }
 
                     // Try to get charge direct from NBT for GT and IC2 stacks
-                    if (mTemp.getItem() instanceof GT_MetaGenerated_Tool_01
-                        || mTemp.getItem() instanceof GT_MetaGenerated_Item_01
-                        || mTemp.getItem() instanceof GT_MetaGenerated_Item_02
-                        || mTemp.getItem() instanceof GT_MetaGenerated_Item_03
+                    if (mTemp.getItem() instanceof MetaGeneratedTool01 || mTemp.getItem() instanceof MetaGeneratedItem01
+                        || mTemp.getItem() instanceof MetaGeneratedItem02
+                        || mTemp.getItem() instanceof MetaGeneratedItem03
                         || mTemp.getItem()
                             .getClass()
                             .getName()
-                            .equalsIgnoreCase(GT_MetaGenerated_Tool_01.class.getName())) {
+                            .equalsIgnoreCase(MetaGeneratedTool01.class.getName())) {
                         if (!NBTUtils.hasKey(mTemp, "GT.ItemCharge")) {
                             if (!mTemp.getDisplayName()
                                 .toLowerCase()
                                 .contains("battery")) {
-                                if (!GT_ModHandler.isElectricItem(mTemp)) {
+                                if (!GTModHandler.isElectricItem(mTemp)) {
                                     continue;
                                 }
                             } else {
@@ -284,8 +283,7 @@ public class ChargingHelper {
                     int mMultiVoltage = (int) (mMulti * mVoltageIncrease);
 
                     if ((mitemCurrentCharge + mMultiVoltage) <= mItemMaxCharge) {
-                        if (GT_ModHandler.chargeElectricItem(mTemp, mMultiVoltage, Integer.MAX_VALUE, true, false)
-                            > 0) {
+                        if (GTModHandler.chargeElectricItem(mTemp, mMultiVoltage, Integer.MAX_VALUE, true, false) > 0) {
                             for (int i = 0; i < mMulti; i++) {
                                 ElectricItem.manager.charge(mTemp, mVoltageIncrease, Integer.MAX_VALUE, false, false);
                             }
@@ -300,7 +298,7 @@ public class ChargingHelper {
                     mitemCurrentCharge = ElectricItem.manager.getCharge(mTemp);
                     if (mitemCurrentCharge < mItemMaxCharge && mitemCurrentCharge >= (mItemMaxCharge - mVoltage)) {
                         int xDif = (int) (mItemMaxCharge - mitemCurrentCharge);
-                        if (GT_ModHandler.chargeElectricItem(mTemp, xDif, Integer.MAX_VALUE, true, false) >= 0) {
+                        if (GTModHandler.chargeElectricItem(mTemp, xDif, Integer.MAX_VALUE, true, false) >= 0) {
                             if (ElectricItem.manager.getCharge(mTemp) >= mItemMaxCharge) {
                                 mEntity.setEUVar(mEntity.getEUVar() - (xDif));
                                 mEuStored = mEntity.getEUVar();
@@ -334,7 +332,7 @@ public class ChargingHelper {
         if (itemstack == null) {
             return false;
         }
-        if (GT_ModHandler.isElectricItem(itemstack)) {
+        if (GTModHandler.isElectricItem(itemstack)) {
             return true;
         }
         return itemstack.getItem() instanceof IElectricItem;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
index 8cbb473a42..773bf0127e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
@@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.material.Material;
 
@@ -31,14 +31,14 @@ public class FlotationRecipeHandler {
     public static Material getMaterialOfMilledProduct(ItemStack aMilled) {
         for (String aKey : sMilledMap.keySet()) {
             ItemStack aTempMilledStack = sMilledMap.get(aKey);
-            if (GT_Utility.areStacksEqual(aTempMilledStack, aMilled, true)) {
+            if (GTUtility.areStacksEqual(aTempMilledStack, aMilled, true)) {
                 return sMaterialMap.get(aKey);
             }
         }
         return null;
     }
 
-    public static ItemStack findMilledStack(GT_Recipe aRecipe) {
+    public static ItemStack findMilledStack(GTRecipe aRecipe) {
         if (aRecipe == null || aRecipe.mInputs == null || aRecipe.mInputs.length <= 0) {
             return null;
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GTMethodHelper.java
index ced9b46c3e..357764c820 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GTMethodHelper.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.Textures.BlockIcons;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
 
-public class GT_MethodHelper {
+public class GTMethodHelper {
 
     public static ITexture[] getTexture(TileEntity tTileEntity, Block aBlock, ForgeDirection side) {
         if (tTileEntity instanceof ITexturedTileEntity) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
index 2b0e2a7a4d..57a985f3f3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
@@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.ItemList;
-import gregtech.common.items.GT_VolumetricFlask;
+import gregtech.common.items.ItemVolumetricFlask;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class VolumetricFlaskHelper {
@@ -42,8 +42,8 @@ public class VolumetricFlaskHelper {
     public static int getMaxFlaskCapacity(ItemStack aStack) {
         if (aStack != null) {
             Item aItem = aStack.getItem();
-            if (aItem instanceof GT_VolumetricFlask) {
-                return ((GT_VolumetricFlask) aItem).getMaxCapacity();
+            if (aItem instanceof ItemVolumetricFlask) {
+                return ((ItemVolumetricFlask) aItem).getMaxCapacity();
             }
         }
         return 0;
@@ -120,6 +120,6 @@ public class VolumetricFlaskHelper {
     }
 
     public static Item generateNewFlask(String unlocalized, String english, int maxCapacity) {
-        return new GT_VolumetricFlask(unlocalized, english, maxCapacity);
+        return new ItemVolumetricFlask(unlocalized, english, maxCapacity);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
index 3717f17554..03a4ace32f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.gregtech.common.helpers.tesseract;
 
-import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap;
-import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap;
+import static gtPlusPlus.core.lib.GTPPCore.sTesseractGeneratorOwnershipMap;
+import static gtPlusPlus.core.lib.GTPPCore.sTesseractTerminalOwnershipMap;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,8 +12,8 @@ import java.util.UUID;
 import net.minecraft.entity.player.EntityPlayer;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractTerminal;
 
 public class TesseractHelper {
 
@@ -25,8 +25,7 @@ public class TesseractHelper {
      */
 
     // Checks if a Generator is owned by a player.
-    public static final boolean isGeneratorOwnedByPlayer(EntityPlayer player,
-        GT_MetaTileEntity_TesseractGenerator generator) {
+    public static final boolean isGeneratorOwnedByPlayer(EntityPlayer player, MTETesseractGenerator generator) {
         if (player == null) {
             Logger.WARNING("Failed. [isGeneratorOwnedByPlayer]");
             return false;
@@ -35,9 +34,9 @@ public class TesseractHelper {
         UUID playerIdentifier = player.getUniqueID();
         if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
             // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 2");
-            Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
-            Set<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> players = generators.entrySet();
-            for (Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current : players) {
+            Map<Integer, MTETesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
+            Set<Entry<Integer, MTETesseractGenerator>> players = generators.entrySet();
+            for (Entry<Integer, MTETesseractGenerator> current : players) {
                 // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 3");
                 if (current.getValue()
                     .equals(generator)) {
@@ -52,23 +51,22 @@ public class TesseractHelper {
 
     // Saves A Generator to the Players UUID map along with the Freq.
     public static final boolean setGeneratorOwnershipByPlayer(EntityPlayer player, int freq,
-        GT_MetaTileEntity_TesseractGenerator generator) {
+        MTETesseractGenerator generator) {
         if (player == null) {
             return false;
         }
         UUID playerIdentifier = player.getUniqueID();
         Logger.WARNING("Setting Generator on " + freq + " for " + player.getDisplayName() + ".");
         if (playerIdentifier != null) {
-            Map<Integer, GT_MetaTileEntity_TesseractGenerator> playerOwned = sTesseractGeneratorOwnershipMap
-                .get(playerIdentifier);
+            Map<Integer, MTETesseractGenerator> playerOwned = sTesseractGeneratorOwnershipMap.get(playerIdentifier);
             if (playerOwned == null || playerOwned.isEmpty()) {
-                Map<Integer, GT_MetaTileEntity_TesseractGenerator> newOwnershipMap = new HashMap<>();
+                Map<Integer, MTETesseractGenerator> newOwnershipMap = new HashMap<>();
                 newOwnershipMap.put(freq, generator);
                 sTesseractGeneratorOwnershipMap.put(playerIdentifier, newOwnershipMap);
                 Logger.WARNING("Success! [Empty Map]");
                 return true;
             } else if (sTesseractGeneratorOwnershipMap.containsKey(playerIdentifier)) {
-                Map<Integer, GT_MetaTileEntity_TesseractGenerator> ownershipMap = sTesseractGeneratorOwnershipMap
+                Map<Integer, MTETesseractGenerator> ownershipMap = sTesseractGeneratorOwnershipMap
                     .get(playerIdentifier);
                 if (!ownershipMap.containsKey(freq)) {
                     ownershipMap.put(freq, generator);
@@ -84,7 +82,7 @@ public class TesseractHelper {
     }
 
     // Gets Generator based on Frequency.
-    public static final GT_MetaTileEntity_TesseractGenerator getGeneratorByFrequency(EntityPlayer player, int freq) {
+    public static final MTETesseractGenerator getGeneratorByFrequency(EntityPlayer player, int freq) {
         if (player == null) {
             return null;
         }
@@ -92,9 +90,9 @@ public class TesseractHelper {
         Logger.WARNING("Getting Generator on " + freq + " for " + player.getDisplayName() + ".");
         if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
             // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 1");
-            Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
-            Set<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> players = generators.entrySet();
-            for (Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current : players) {
+            Map<Integer, MTETesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
+            Set<Entry<Integer, MTETesseractGenerator>> players = generators.entrySet();
+            for (Entry<Integer, MTETesseractGenerator> current : players) {
                 // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 2");
                 if (current.getKey()
                     .equals(freq)) {
@@ -131,16 +129,15 @@ public class TesseractHelper {
      */
 
     // Checks if a Terminal is owned by a player.
-    public static final boolean isTerminalOwnedByPlayer(EntityPlayer player,
-        GT_MetaTileEntity_TesseractTerminal generator) {
+    public static final boolean isTerminalOwnedByPlayer(EntityPlayer player, MTETesseractTerminal generator) {
         if (player == null) {
             return false;
         }
         UUID playerIdentifier = player.getUniqueID();
         if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
-            Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
-            Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet();
-            for (Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current : players) {
+            Map<Integer, MTETesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
+            Set<Entry<Integer, MTETesseractTerminal>> players = generators.entrySet();
+            for (Entry<Integer, MTETesseractTerminal> current : players) {
                 if (current.getValue()
                     .equals(generator)) {
                     return true;
@@ -152,24 +149,22 @@ public class TesseractHelper {
 
     // Saves A Terminal to the Players UUID map along with the Freq.
     public static final boolean setTerminalOwnershipByPlayer(EntityPlayer player, int freq,
-        GT_MetaTileEntity_TesseractTerminal generator) {
+        MTETesseractTerminal generator) {
         if (player == null) {
             return false;
         }
         UUID playerIdentifier = player.getUniqueID();
         if (playerIdentifier != null) {
             Logger.WARNING("Setting Terminal on " + freq + " for " + player.getDisplayName() + ".");
-            Map<Integer, GT_MetaTileEntity_TesseractTerminal> playerOwned = sTesseractTerminalOwnershipMap
-                .get(playerIdentifier);
+            Map<Integer, MTETesseractTerminal> playerOwned = sTesseractTerminalOwnershipMap.get(playerIdentifier);
             if (playerOwned == null || playerOwned.isEmpty()) {
-                Map<Integer, GT_MetaTileEntity_TesseractTerminal> newOwnershipMap = new HashMap<>();
+                Map<Integer, MTETesseractTerminal> newOwnershipMap = new HashMap<>();
                 newOwnershipMap.put(freq, generator);
                 sTesseractTerminalOwnershipMap.put(playerIdentifier, newOwnershipMap);
                 Logger.WARNING("Success! [Empty Map]");
                 return true;
             } else if (sTesseractTerminalOwnershipMap.containsKey(playerIdentifier)) {
-                Map<Integer, GT_MetaTileEntity_TesseractTerminal> ownershipMap = sTesseractTerminalOwnershipMap
-                    .get(playerIdentifier);
+                Map<Integer, MTETesseractTerminal> ownershipMap = sTesseractTerminalOwnershipMap.get(playerIdentifier);
                 if (!ownershipMap.containsKey(freq)) {
                     ownershipMap.put(freq, generator);
                 }
@@ -183,16 +178,16 @@ public class TesseractHelper {
     }
 
     // Gets Terminal based on Frequency.
-    public static final GT_MetaTileEntity_TesseractTerminal getTerminalByFrequency(EntityPlayer player, int freq) {
+    public static final MTETesseractTerminal getTerminalByFrequency(EntityPlayer player, int freq) {
         if (player == null) {
             return null;
         }
         UUID playerIdentifier = player.getUniqueID();
         Logger.WARNING("Getting Terminal on " + freq + " for " + player.getDisplayName() + ".");
         if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
-            Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
-            Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet();
-            for (Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current : players) {
+            Map<Integer, MTETesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
+            Set<Entry<Integer, MTETesseractTerminal>> players = generators.entrySet();
+            for (Entry<Integer, MTETesseractTerminal> current : players) {
                 if (current.getKey()
                     .equals(freq)) {
                     Logger.WARNING("Success!");
@@ -223,13 +218,11 @@ public class TesseractHelper {
      * Internal Methods
      *
      */
-    private static Map<Integer, GT_MetaTileEntity_TesseractGenerator> getGeneratorOwnershipByPlayer(
-        EntityPlayer player) {
+    private static Map<Integer, MTETesseractGenerator> getGeneratorOwnershipByPlayer(EntityPlayer player) {
         UUID playerIdentifier = player.getUniqueID();
         if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
-            Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>> players = sTesseractGeneratorOwnershipMap
-                .entrySet();
-            for (Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> current : players) {
+            Set<Entry<UUID, Map<Integer, MTETesseractGenerator>>> players = sTesseractGeneratorOwnershipMap.entrySet();
+            for (Entry<UUID, Map<Integer, MTETesseractGenerator>> current : players) {
                 if (current.getKey()
                     .compareTo(playerIdentifier) == 0) {
                     return current.getValue();
@@ -239,12 +232,11 @@ public class TesseractHelper {
         return null;
     }
 
-    private static Map<Integer, GT_MetaTileEntity_TesseractTerminal> getTerminalOwnershipByPlayer(EntityPlayer player) {
+    private static Map<Integer, MTETesseractTerminal> getTerminalOwnershipByPlayer(EntityPlayer player) {
         UUID playerIdentifier = player.getUniqueID();
         if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
-            Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>> players = sTesseractTerminalOwnershipMap
-                .entrySet();
-            for (Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> current : players) {
+            Set<Entry<UUID, Map<Integer, MTETesseractTerminal>>> players = sTesseractTerminalOwnershipMap.entrySet();
+            for (Entry<UUID, Map<Integer, MTETesseractTerminal>> current : players) {
                 if (current.getKey()
                     .compareTo(playerIdentifier) == 0) {
                     return current.getValue();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
index 8edb8c2cf9..a6cd63ca19 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
@@ -16,17 +16,17 @@ import net.minecraft.world.World;
 import org.apache.commons.lang3.StringUtils;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_MultiTexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTMultiTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
-import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual;
+import gtPlusPlus.xmod.gregtech.common.covers.CoverToggleVisual;
 
 public class MetaCustomCoverItem extends Item {
 
@@ -72,10 +72,10 @@ public class MetaCustomCoverItem extends Item {
             if (i > 0 && hide()) {
                 ItemUtils.hideItemFromNEI(thisStack);
             }
-            GregTech_API.registerCover(
+            GregTechAPI.registerCover(
                 thisStack,
-                new GT_MultiTexture(new ITexture[] { new GT_RenderedTexture(mTextures[i]) }),
-                new GTPP_Cover_ToggleVisual());
+                new GTMultiTexture(new ITexture[] { new GTRenderedTexture(mTextures[i]) }),
+                new CoverToggleVisual());
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index ec9416be02..a787e4c4ce 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -1,64 +1,64 @@
 package gtPlusPlus.xmod.gregtech.common.items;
 
-import static gregtech.api.util.GT_RecipeConstants.RTG_DURATION_IN_DAYS;
-import static gregtech.client.GT_TooltipHandler.Tier.EV;
-import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
+import static gregtech.api.util.GTRecipeConstants.RTG_DURATION_IN_DAYS;
+import static gregtech.client.GTTooltipHandler.Tier.EV;
+import static gregtech.client.GTTooltipHandler.registerTieredTooltip;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.rtgFuels;
 import static gtPlusPlus.core.util.Utils.getTcAspectStack;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_1;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_2;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_3;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_4;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_1;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_2;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_3;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_4;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Cadmium;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Lithium;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Sodium;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Compressed_Fusion_Reactor;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_EV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_HV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_IV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_LV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_MV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Distillus_Upgrade_Chip;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Gregtech_Computer_Cube;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Laser_Lens_Special;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Laser_Lens_WoodsGlass;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Maceration_Upgrade_Chip;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_AM241;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_PO210;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_PU238;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_SR90;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Shape_Extruder_WindmillShaft;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_EV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_HV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_IV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_LV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_LuV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_MV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_UHV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_UV;
-import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_ZPM;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_1;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_2;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_3;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_4;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_1;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_2;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_3;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_4;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Cadmium;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Lithium;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Sodium;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Compressed_Fusion_Reactor;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_EV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_HV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_IV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_LV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_MV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Distillus_Upgrade_Chip;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Gregtech_Computer_Cube;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Laser_Lens_Special;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Laser_Lens_WoodsGlass;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Maceration_Upgrade_Chip;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_AM241;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_PO210;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_PU238;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_SR90;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Shape_Extruder_WindmillShaft;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_EV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_HV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_IV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_LV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_LuV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_MV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_UHV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_UV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_ZPM;
+
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TC_Aspects;
+import gregtech.api.enums.TCAspects;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.TierEU;
-import gregtech.api.objects.GT_MultiTexture;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.objects.GTMultiTexture;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTModHandler;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32;
+import gtPlusPlus.xmod.gregtech.api.items.GTMetaItemX32;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow;
+import gtPlusPlus.xmod.gregtech.common.covers.CoverOverflow;
 
-public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
+public class MetaGeneratedGregtechItems extends GTMetaItemX32 {
 
     public static final MetaGeneratedGregtechItems INSTANCE;
 
@@ -85,27 +85,27 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 Battery_RE_EV_Sodium.ID,
                 "Quad Cell Sodium Battery",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                getTcAspectStack(TC_Aspects.METALLUM, 2L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 2L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 2L),
+                getTcAspectStack(TCAspects.METALLUM, 2L),
+                getTcAspectStack(TCAspects.POTENTIA, 2L)));
 
         GregtechItemList.Battery_RE_EV_Cadmium.set(
             this.addItem(
                 Battery_RE_EV_Cadmium.ID,
                 "Quad Cell Cadmium Battery",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.METALLUM, 1L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.METALLUM, 1L),
+                getTcAspectStack(TCAspects.POTENTIA, 1L)));
 
         GregtechItemList.Battery_RE_EV_Lithium.set(
             this.addItem(
                 Battery_RE_EV_Lithium.ID,
                 "Quad Cell Lithium Battery",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 3L),
-                getTcAspectStack(TC_Aspects.METALLUM, 3L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 3L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 3L),
+                getTcAspectStack(TCAspects.METALLUM, 3L),
+                getTcAspectStack(TCAspects.POTENTIA, 3L)));
 
         /**
          * Power Gems
@@ -115,27 +115,27 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 Battery_Gem_1.ID,
                 "Proton Cell",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                getTcAspectStack(TC_Aspects.METALLUM, 24L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 16L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 8L),
+                getTcAspectStack(TCAspects.METALLUM, 24L),
+                getTcAspectStack(TCAspects.POTENTIA, 16L)));
 
         GregtechItemList.Battery_Gem_2.set(
             this.addItem(
                 Battery_Gem_2.ID,
                 "Electron Cell",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
-                getTcAspectStack(TC_Aspects.METALLUM, 32L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 32L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 16L),
+                getTcAspectStack(TCAspects.METALLUM, 32L),
+                getTcAspectStack(TCAspects.POTENTIA, 32L)));
 
         GregtechItemList.Battery_Gem_3.set(
             this.addItem(
                 Battery_Gem_3.ID,
                 "Quark Entanglement",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 32L),
-                getTcAspectStack(TC_Aspects.METALLUM, 48L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 64L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 32L),
+                getTcAspectStack(TCAspects.METALLUM, 48L),
+                getTcAspectStack(TCAspects.POTENTIA, 64L)));
 
         // RTG Pellet
         GregtechItemList.Pellet_RTG_PU238.set(
@@ -143,36 +143,36 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 Pellet_RTG_PU238.ID,
                 StringUtils.superscript("238") + "Pu Pellet",
                 "",
-                getTcAspectStack(TC_Aspects.RADIO, 4L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 2L),
-                getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+                getTcAspectStack(TCAspects.RADIO, 4L),
+                getTcAspectStack(TCAspects.POTENTIA, 2L),
+                getTcAspectStack(TCAspects.METALLUM, 2L)));
 
         GregtechItemList.Pellet_RTG_SR90.set(
             this.addItem(
                 Pellet_RTG_SR90.ID,
                 StringUtils.superscript("90") + "Sr Pellet",
                 "",
-                getTcAspectStack(TC_Aspects.RADIO, 4L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 2L),
-                getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+                getTcAspectStack(TCAspects.RADIO, 4L),
+                getTcAspectStack(TCAspects.POTENTIA, 2L),
+                getTcAspectStack(TCAspects.METALLUM, 2L)));
 
         GregtechItemList.Pellet_RTG_PO210.set(
             this.addItem(
                 Pellet_RTG_PO210.ID,
                 StringUtils.superscript("210") + "Po Pellet",
                 "",
-                getTcAspectStack(TC_Aspects.RADIO, 4L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 2L),
-                getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+                getTcAspectStack(TCAspects.RADIO, 4L),
+                getTcAspectStack(TCAspects.POTENTIA, 2L),
+                getTcAspectStack(TCAspects.METALLUM, 2L)));
 
         GregtechItemList.Pellet_RTG_AM241.set(
             this.addItem(
                 Pellet_RTG_AM241.ID,
                 StringUtils.superscript("241") + "Am Pellet",
                 "",
-                getTcAspectStack(TC_Aspects.RADIO, 4L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 2L),
-                getTcAspectStack(TC_Aspects.METALLUM, 2L)));
+                getTcAspectStack(TCAspects.RADIO, 4L),
+                getTcAspectStack(TCAspects.POTENTIA, 2L),
+                getTcAspectStack(TCAspects.METALLUM, 2L)));
 
         // Computer Cube
         GregtechItemList.Gregtech_Computer_Cube.set(
@@ -180,59 +180,59 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 Gregtech_Computer_Cube.ID,
                 "Gregtech Computer Cube",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                getTcAspectStack(TC_Aspects.METALLUM, 8L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 8L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 8L),
+                getTcAspectStack(TCAspects.METALLUM, 8L),
+                getTcAspectStack(TCAspects.POTENTIA, 8L)));
 
         GregtechItemList.Cover_Overflow_LV.set(
             this.addItem(
                 Cover_Overflow_LV.ID,
                 "Overflow Valve (LV)",
                 "Maximum void amount: 64,000",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                getTcAspectStack(TC_Aspects.ITER, 1L),
-                getTcAspectStack(TC_Aspects.AQUA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.MACHINA, 1L),
+                getTcAspectStack(TCAspects.ITER, 1L),
+                getTcAspectStack(TCAspects.AQUA, 1L)));
 
         GregtechItemList.Cover_Overflow_MV.set(
             this.addItem(
                 Cover_Overflow_MV.ID,
                 "Overflow Valve (MV)",
                 "Maximum void amount: 512,000",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                getTcAspectStack(TC_Aspects.ITER, 1L),
-                getTcAspectStack(TC_Aspects.AQUA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.MACHINA, 1L),
+                getTcAspectStack(TCAspects.ITER, 1L),
+                getTcAspectStack(TCAspects.AQUA, 1L)));
 
         GregtechItemList.Cover_Overflow_HV.set(
             this.addItem(
                 Cover_Overflow_HV.ID,
                 "Overflow Valve (HV)",
                 "Maximum void amount: 4,096,000",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                getTcAspectStack(TC_Aspects.ITER, 1L),
-                getTcAspectStack(TC_Aspects.AQUA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.MACHINA, 1L),
+                getTcAspectStack(TCAspects.ITER, 1L),
+                getTcAspectStack(TCAspects.AQUA, 1L)));
 
         GregtechItemList.Cover_Overflow_EV.set(
             this.addItem(
                 Cover_Overflow_EV.ID,
                 "Overflow Valve (EV)",
                 "Maximum void amount: 32,768,000",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                getTcAspectStack(TC_Aspects.ITER, 1L),
-                getTcAspectStack(TC_Aspects.AQUA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.MACHINA, 1L),
+                getTcAspectStack(TCAspects.ITER, 1L),
+                getTcAspectStack(TCAspects.AQUA, 1L)));
 
         GregtechItemList.Cover_Overflow_IV.set(
             this.addItem(
                 Cover_Overflow_IV.ID,
                 "Overflow Valve (IV)",
                 "Maximum void amount: 262,144,000",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                getTcAspectStack(TC_Aspects.ITER, 1L),
-                getTcAspectStack(TC_Aspects.AQUA, 1L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 1L),
+                getTcAspectStack(TCAspects.MACHINA, 1L),
+                getTcAspectStack(TCAspects.ITER, 1L),
+                getTcAspectStack(TCAspects.AQUA, 1L)));
 
         // Fusion Reactor MK4 Singularity
         GregtechItemList.Compressed_Fusion_Reactor.set(
@@ -258,9 +258,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 Battery_Gem_4.ID,
                 "Graviton Anomaly",
                 "Reusable",
-                getTcAspectStack(TC_Aspects.ELECTRUM, 64L),
-                getTcAspectStack(TC_Aspects.METALLUM, 64L),
-                getTcAspectStack(TC_Aspects.POTENTIA, 64L)));
+                getTcAspectStack(TCAspects.ELECTRUM, 64L),
+                getTcAspectStack(TCAspects.METALLUM, 64L),
+                getTcAspectStack(TCAspects.POTENTIA, 64L)));
 
         /*
          * High Tier 'Saws' for the tree Farm
@@ -285,11 +285,11 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
             aTransParts[tier - 1].set(
                 this.addItem(
                     IDs[tier - 1],
-                    "Transmission Component (" + GT_Values.VN[tier] + ")",
+                    "Transmission Component (" + GTValues.VN[tier] + ")",
                     "",
-                    getTcAspectStack(TC_Aspects.ELECTRUM, tier),
-                    getTcAspectStack(TC_Aspects.MACHINA, tier),
-                    getTcAspectStack(TC_Aspects.MAGNETO, tier)));
+                    getTcAspectStack(TCAspects.ELECTRUM, tier),
+                    getTcAspectStack(TCAspects.MACHINA, tier),
+                    getTcAspectStack(TCAspects.MAGNETO, tier)));
         }
 
         // Distillus Chip
@@ -308,17 +308,17 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
     }
 
     private void setAllElectricStats() {
-        this.setElectricStats(32000 + Battery_RE_EV_Cadmium.ID, 4800000L, GT_Values.V[4], 4L, -3L, true);
-        this.setElectricStats(32000 + Battery_RE_EV_Sodium.ID, 3200000L, GT_Values.V[4], 4L, -3L, true);
-        this.setElectricStats(32000 + Battery_RE_EV_Lithium.ID, 6400000L, GT_Values.V[4], 4L, -3L, true);
-        this.setElectricStats(32000 + Battery_Gem_1.ID, GT_Values.V[6] * 20 * 300 / 4, GT_Values.V[6], 6L, -3L, false);
-        this.setElectricStats(32000 + Battery_Gem_2.ID, GT_Values.V[7] * 20 * 300 / 4, GT_Values.V[7], 7L, -3L, false);
-        this.setElectricStats(32000 + Battery_Gem_3.ID, GT_Values.V[8] * 20 * 300 / 4, GT_Values.V[8], 8L, -3L, false);
-        this.setElectricStats(32000 + Battery_Casing_Gem_4.ID, (64000000000L * 16), GT_Values.V[9], 9L, -3L, false);
+        this.setElectricStats(32000 + Battery_RE_EV_Cadmium.ID, 4800000L, GTValues.V[4], 4L, -3L, true);
+        this.setElectricStats(32000 + Battery_RE_EV_Sodium.ID, 3200000L, GTValues.V[4], 4L, -3L, true);
+        this.setElectricStats(32000 + Battery_RE_EV_Lithium.ID, 6400000L, GTValues.V[4], 4L, -3L, true);
+        this.setElectricStats(32000 + Battery_Gem_1.ID, GTValues.V[6] * 20 * 300 / 4, GTValues.V[6], 6L, -3L, false);
+        this.setElectricStats(32000 + Battery_Gem_2.ID, GTValues.V[7] * 20 * 300 / 4, GTValues.V[7], 7L, -3L, false);
+        this.setElectricStats(32000 + Battery_Gem_3.ID, GTValues.V[8] * 20 * 300 / 4, GTValues.V[8], 8L, -3L, false);
+        this.setElectricStats(32000 + Battery_Casing_Gem_4.ID, (64000000000L * 16), GTValues.V[9], 9L, -3L, false);
         this.setElectricStats(
             32000 + Gregtech_Computer_Cube.ID,
-            GT_Values.V[6] * 10 * 60 * 20,
-            GT_Values.V[5],
+            GTValues.V[6] * 10 * 60 * 20,
+            GTValues.V[5],
             5L,
             -3L,
             false);
@@ -331,36 +331,36 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
     }
 
     private void registerFuelRTGRecipes() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(GregtechItemList.Pellet_RTG_PU238.get(1))
             .duration(0)
             .eut(64)
             .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(87.7f))
             .addTo(rtgFuels);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(GregtechItemList.Pellet_RTG_SR90.get(1))
             .duration(0)
             .eut(TierEU.RECIPE_LV)
             .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(28.8f))
             .addTo(rtgFuels);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(GregtechItemList.Pellet_RTG_PO210.get(1))
             .duration(0)
             .eut(TierEU.RECIPE_HV)
             .metadata(RTG_DURATION_IN_DAYS, 1)
             .addTo(rtgFuels);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(GregtechItemList.Pellet_RTG_AM241.get(1))
             .duration(0)
             .eut(16)
             .metadata(RTG_DURATION_IN_DAYS, 216)
             .addTo(rtgFuels);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("RTGPellets", 1))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTModHandler.getIC2Item("RTGPellets", 1))
             .duration(0)
             .eut(8)
             .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(2.6f))
@@ -368,36 +368,36 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
     }
 
     private void registerCovers() {
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             GregtechItemList.Cover_Overflow_LV.get(1L),
-            new GT_MultiTexture(
+            new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[4][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(64));
-        GregTech_API.registerCover(
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new CoverOverflow(64));
+        GregTechAPI.registerCover(
             GregtechItemList.Cover_Overflow_MV.get(1L),
-            new GT_MultiTexture(
+            new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[5][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(512));
-        GregTech_API.registerCover(
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new CoverOverflow(512));
+        GregTechAPI.registerCover(
             GregtechItemList.Cover_Overflow_HV.get(1L),
-            new GT_MultiTexture(
+            new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[5][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(4096));
-        GregTech_API.registerCover(
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new CoverOverflow(4096));
+        GregTechAPI.registerCover(
             GregtechItemList.Cover_Overflow_EV.get(1L),
-            new GT_MultiTexture(
+            new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[8][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(32768));
-        GregTech_API.registerCover(
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new CoverOverflow(32768));
+        GregTechAPI.registerCover(
             GregtechItemList.Cover_Overflow_IV.get(1L),
-            new GT_MultiTexture(
+            new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[8][0],
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
-            new GTPP_Cover_Overflow(262144));
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
+            new CoverOverflow(262144));
     }
 
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index 30250a46f3..ddc90a0183 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -1,24 +1,24 @@
 package gtPlusPlus.xmod.gregtech.common.items;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.TC_Aspects;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.TCAspects;
 import gregtech.api.enums.ToolDictNames;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames;
-import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_AngleGrinder;
-import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricSnips;
+import gtPlusPlus.xmod.gregtech.common.tools.ToolAngleGrinder;
+import gtPlusPlus.xmod.gregtech.common.tools.ToolElectricSnips;
 
-public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
+public class MetaGeneratedGregtechTools extends MetaGeneratedTool {
 
     public static final short ANGLE_GRINDER = 7834;
     public static final short ELECTRIC_SNIPS = 7934;
-    public static GT_MetaGenerated_Tool INSTANCE;
+    public static MetaGeneratedTool INSTANCE;
 
     static {
         INSTANCE = new MetaGeneratedGregtechTools();
     }
 
-    public static GT_MetaGenerated_Tool getInstance() {
+    public static MetaGeneratedTool getInstance() {
         return INSTANCE;
     }
 
@@ -30,25 +30,25 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
             ANGLE_GRINDER,
             "Angle Grinder",
             "Hand-held electric filing device",
-            new TOOL_Gregtech_AngleGrinder(),
+            new ToolAngleGrinder(),
             GregtechToolDictNames.craftingToolAngleGrinder,
             ToolDictNames.craftingToolFile,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L));
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L));
 
         // Electric Wire Cutter
-        GregTech_API.registerWireCutter(
+        GregTechAPI.registerWireCutter(
             this.addTool(
                 ELECTRIC_SNIPS,
                 "Automatic Snips",
                 "Hand-held electric wire cutter",
-                new TOOL_Gregtech_ElectricSnips(),
+                new ToolElectricSnips(),
                 GregtechToolDictNames.craftingToolElectricSnips,
                 ToolDictNames.craftingToolWireCutter,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 4L)));
 
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/Ids_MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedItemIDs.java
index 5a9e9db772..72f5c66c58 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/Ids_MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedItemIDs.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.items;
 
-public enum Ids_MetaGeneratedGregtechItems {
+public enum MetaGeneratedItemIDs {
 
     Shape_Extruder_WindmillShaft(40),
     Pellet_RTG_PU238(41),
@@ -41,7 +41,7 @@ public enum Ids_MetaGeneratedGregtechItems {
 
     public final int ID;
 
-    Ids_MetaGeneratedGregtechItems(int ID) {
+    MetaGeneratedItemIDs(int ID) {
         this.ID = ID;
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
index f85822750d..be7a0f1c99 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
@@ -7,31 +7,31 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.items.behaviors.Behaviour_None;
-import gregtech.common.items.behaviors.Behaviour_Wrench;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.items.behaviors.BehaviourNone;
+import gregtech.common.items.behaviors.BehaviourWrench;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class Behaviour_Choocher extends Behaviour_None {
+public class Behaviour_Choocher extends BehaviourNone {
 
     private boolean isWrench = true;
-    private final Behaviour_Wrench wrench = new Behaviour_Wrench(150);
+    private final BehaviourWrench wrench = new BehaviourWrench(150);
     private final Behaviour_Prospecting_Ex prospecting = new Behaviour_Prospecting_Ex(10, 1250);
-    private final String mTooltip1 = GT_LanguageManager
+    private final String mTooltip1 = GTLanguageManager
         .addStringLocalization("gt.behaviour.choochering1", "Current tool mode: ");
-    private final String mTooltip2 = GT_LanguageManager
+    private final String mTooltip2 = GTLanguageManager
         .addStringLocalization("gt.behaviour.choochering2", "Change tool mode using Shift+Rightclick.");
-    private final String mTooltipH = GT_LanguageManager
+    private final String mTooltipH = GTLanguageManager
         .addStringLocalization("gt.behaviour.prospectingEx", "Usable for Prospecting large areas.");
-    private final String mTooltipW = GT_LanguageManager
+    private final String mTooltipW = GTLanguageManager
         .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick.");
 
     public Behaviour_Choocher() {}
 
     @Override
-    public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
+    public boolean onItemUseFirst(final MetaBaseItem aItem, final ItemStack aStack, final EntityPlayer aPlayer,
         final World aWorld, final int aX, final int aY, final int aZ, final ForgeDirection side, final float hitX,
         final float hitY, final float hitZ) {
         if (aWorld.isRemote) {
@@ -64,7 +64,7 @@ public class Behaviour_Choocher extends Behaviour_None {
     }
 
     @Override
-    public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList,
+    public List<String> getAdditionalToolTips(final MetaBaseItem aItem, final List<String> aList,
         final ItemStack aStack) {
 
         boolean inWrenchMode;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
index f3d7f87a86..c458d237bd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
@@ -13,37 +13,37 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import codechicken.lib.math.MathHelper;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.behaviors.Behaviour_None;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.behaviors.BehaviourNone;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.entity.projectile.EntityLightningAttack;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import ic2.api.item.IElectricItemManager;
 
-public class Behaviour_Electric_Lighter extends Behaviour_None {
+public class Behaviour_Electric_Lighter extends BehaviourNone {
 
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire");
-    private final String mTooltipUses = GT_LanguageManager
+    private final String mTooltipUses = GTLanguageManager
         .addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:");
-    private final String mTooltipUnstackable = GT_LanguageManager
+    private final String mTooltipUnstackable = GTLanguageManager
         .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!");
 
     public Behaviour_Electric_Lighter() {}
 
     @Override
-    public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
+    public boolean onLeftClickEntity(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
         if (!aPlayer.worldObj.isRemote && aStack != null && aStack.stackSize == 1) {
             boolean rOutput = false;
             if (aEntity instanceof EntityCreeper) {
                 if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
-                    GT_Utility.sendSoundToPlayers(
+                    GTUtility.sendSoundToPlayers(
                         aPlayer.worldObj,
                         SoundResource.FIRE_IGNITE,
                         1.0F,
@@ -62,8 +62,8 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
     }
 
     @Override
-    public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
-        int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY,
+        int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
         if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) {
             if (aPlayer.isSneaking()) {
                 Logger.INFO("Changing Mode");
@@ -81,8 +81,11 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                 boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
                 if (aCurrentMode) {
                     // Shoot Lightning Attack
-                    aWorld
-                        .playSoundAtEntity(aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F));
+                    aWorld.playSoundAtEntity(
+                        aPlayer,
+                        "random.bow",
+                        0.5F,
+                        0.4F / (GTPPCore.RANDOM.nextFloat() * 0.4F + 0.8F));
                     if (!aWorld.isRemote) {
                         aWorld.spawnEntityInWorld(new EntityLightningAttack(aWorld, aPlayer, hitX, hitY, hitZ));
                     }
@@ -94,12 +97,12 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                     aX += tDirection.offsetX;
                     aY += tDirection.offsetY;
                     aZ += tDirection.offsetZ;
-                    if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ)
+                    if (GTUtility.isBlockAir(aWorld, aX, aY, aZ)
                         && aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) {
                         Logger.WARNING("Preparing Lighter b");
                         if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
                             Logger.WARNING("Preparing Lighter c");
-                            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
+                            GTUtility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
                             aWorld.setBlock(aX, aY, aZ, Blocks.fire);
                             rOutput = true;
                             // ItemNBT.setLighterFuel(aStack, tFuelAmount);
@@ -113,7 +116,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
         return false;
     }
 
-    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+    public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
         int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
         if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) {
             if (aPlayer.isSneaking()) {
@@ -132,8 +135,11 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                 boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
                 if (aCurrentMode) {
                     // Shoot Lightning Attack
-                    aWorld
-                        .playSoundAtEntity(aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F));
+                    aWorld.playSoundAtEntity(
+                        aPlayer,
+                        "random.bow",
+                        0.5F,
+                        0.4F / (GTPPCore.RANDOM.nextFloat() * 0.4F + 0.8F));
                     if (!aWorld.isRemote) {
                         aWorld.spawnEntityInWorld(new EntityLightningAttack(aWorld, aPlayer, hitX, hitY, hitZ));
                     }
@@ -145,12 +151,12 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                     aX += tDirection.offsetX;
                     aY += tDirection.offsetY;
                     aZ += tDirection.offsetZ;
-                    if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ)
+                    if (GTUtility.isBlockAir(aWorld, aX, aY, aZ)
                         && aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) {
                         Logger.WARNING("Preparing Lighter b");
                         if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
                             Logger.WARNING("Preparing Lighter c");
-                            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
+                            GTUtility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
                             aWorld.setBlock(aX, aY, aZ, Blocks.fire);
                             rOutput = true;
                             // ItemNBT.setLighterFuel(aStack, tFuelAmount);
@@ -191,7 +197,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
     private void useUp(ItemStack aStack) {}
 
     @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
         aList.add(this.mTooltip);
         int aUses = 0;
         if (aStack != null) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
index 5749204296..f63da57f1c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
@@ -11,20 +11,20 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.IFluidBlock;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Ores;
-import gregtech.common.blocks.GT_TileEntity_Ores;
-import gregtech.common.items.behaviors.Behaviour_Prospecting;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.BlockOres;
+import gregtech.common.blocks.TileEntityOres;
+import gregtech.common.items.behaviors.BehaviourProspecting;
 
-public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
+public class Behaviour_Prospecting_Ex extends BehaviourProspecting {
 
     private final int mVanillaCosts;
     private final int mEUCosts;
@@ -36,7 +36,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
     }
 
     @Override
-    public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
+    public boolean onItemUseFirst(final MetaBaseItem aItem, final ItemStack aStack, final EntityPlayer aPlayer,
         final World aWorld, final int aX, final int aY, final int aZ, final ForgeDirection side, final float hitX,
         final float hitY, final float hitZ) {
         if (aWorld.isRemote) {
@@ -48,28 +48,28 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
         }
         final byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
 
-        ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta));
+        ItemData tAssotiation = GTOreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta));
         if ((tAssotiation != null) && (tAssotiation.mPrefix.toString()
             .startsWith("ore"))) {
-            GT_Utility
+            GTUtility
                 .sendChatToPlayer(aPlayer, "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
-            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
+            GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
             return true;
         }
         if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone))
-            || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites))
+            || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockGranites))
             || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack))
             || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone))
             || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt))
             || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.grass))) {
-            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
-                GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
+            if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
+                GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
                 int tX = aX;
                 int tY = aY;
                 int tZ = aZ;
                 int tMetaID = 0;
-                final int tQuality = ((aItem instanceof GT_MetaGenerated_Tool)
-                    ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "")
+                final int tQuality = ((aItem instanceof MetaGeneratedTool)
+                    ? ((MetaGeneratedTool) aItem).getHarvestLevel(aStack, "")
                     : 0) * 3;
 
                 int i = 0;
@@ -80,23 +80,23 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
 
                     final Block tBlock = aWorld.getBlock(tX, tY, tZ);
                     if ((tBlock == Blocks.lava) || (tBlock == Blocks.flowing_lava)) {
-                        GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Block.");
+                        GTUtility.sendChatToPlayer(aPlayer, "There is Lava behind this Block.");
                         break;
                     }
                     if ((tBlock == Blocks.water) || (tBlock == Blocks.flowing_water)
                         || ((tBlock instanceof IFluidBlock))) {
-                        GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Block.");
+                        GTUtility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Block.");
                         break;
                     }
-                    if ((tBlock == Blocks.monster_egg) || (!GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ))) {
-                        GT_Utility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Block.");
+                    if ((tBlock == Blocks.monster_egg) || (!GTUtility.hasBlockHitBox(aWorld, tX, tY, tZ))) {
+                        GTUtility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Block.");
                         break;
                     }
                     if (tBlock != aBlock) {
                         if (i >= 4) {
                             break;
                         }
-                        GT_Utility.sendChatToPlayer(aPlayer, "Material is changing behind this Block.");
+                        GTUtility.sendChatToPlayer(aPlayer, "Material is changing behind this Block.");
                         break;
                     }
                 }
@@ -107,13 +107,13 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
                     tY = (aY - 4 - tQuality) + tRandom.nextInt(j);
                     tZ = (aZ - 4 - tQuality) + tRandom.nextInt(j);
                     final Block tBlock = aWorld.getBlock(tX, tY, tZ);
-                    if ((tBlock instanceof GT_Block_Ores)) {
+                    if ((tBlock instanceof BlockOres)) {
                         final TileEntity tTileEntity = aWorld.getTileEntity(tX, tY, tZ);
-                        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                            final Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData
+                        if ((tTileEntity instanceof TileEntityOres)) {
+                            final Materials tMaterial = GregTechAPI.sGeneratedMaterials[(((TileEntityOres) tTileEntity).mMetaData
                                 % 1000)];
                             if ((tMaterial != null) && (tMaterial != Materials._NULL)) {
-                                GT_Utility.sendChatToPlayer(
+                                GTUtility.sendChatToPlayer(
                                     aPlayer,
                                     "Found traces of " + tMaterial.mDefaultLocalName + " Ore.");
                                 return true;
@@ -121,17 +121,17 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
                         }
                     } else {
                         tMetaID = aWorld.getBlockMetadata(tX, tY, tZ);
-                        tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
+                        tAssotiation = GTOreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
                         if ((tAssotiation != null) && (tAssotiation.mPrefix.toString()
                             .startsWith("ore"))) {
-                            GT_Utility.sendChatToPlayer(
+                            GTUtility.sendChatToPlayer(
                                 aPlayer,
                                 "Found traces of " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
                             return true;
                         }
                     }
                 }
-                GT_Utility.sendChatToPlayer(aPlayer, "No Ores found.");
+                GTUtility.sendChatToPlayer(aPlayer, "No Ores found.");
             }
             return true;
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
index 987924952a..399554d306 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
@@ -8,7 +8,7 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Textures;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
@@ -45,6 +45,6 @@ public class MetaItemCoverCasings extends MetaCustomCoverItem {
     public String getItemStackDisplayName(final ItemStack tItem) {
         return EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocalFormatted(
             "item.itemCustomMetaCover.miscutils.GtMachineCasings",
-            GT_Values.VOLTAGE_NAMES[MathUtils.balance(tItem.getItemDamage(), 0, GT_Values.VOLTAGE_NAMES.length - 1)]); // super.getItemStackDisplayName(tItem);
+            GTValues.VOLTAGE_NAMES[MathUtils.balance(tItem.getItemDamage(), 0, GTValues.VOLTAGE_NAMES.length - 1)]); // super.getItemStackDisplayName(tItem);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java
index a281a205d2..f9ec4b9433 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java
@@ -21,18 +21,18 @@ import net.minecraftforge.client.event.RenderPlayerEvent;
 import org.apache.commons.io.IOUtils;
 import org.lwjgl.opengl.GL11;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.CORE.ConfigSwitches;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches;
 import gtPlusPlus.core.proxy.ClientProxy;
 import gtPlusPlus.core.util.data.AES;
 import gtPlusPlus.core.util.data.FileUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 
-public class GTPP_CapeRenderer extends RenderPlayer {
+public class CapeRenderer extends RenderPlayer {
 
     private static final ResourceLocation[] mCapes = { new ResourceLocation("miscutils:textures/OrangeHD.png"),
         new ResourceLocation("miscutils:textures/FancyCapeHD.png"),
@@ -42,7 +42,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
 
     private final boolean mInit;
 
-    public GTPP_CapeRenderer() {
+    public CapeRenderer() {
         mInit = init();
     }
 
@@ -91,7 +91,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
 
             // We have already checked if this player has a cape, but since they do not, we best not render.
             if (hasResourceChecked) {
-                if (!hasCape && !CORE.DEVENV) {
+                if (!hasCape && !GTPPCore.DEVENV) {
                     return;
                 }
             }
@@ -113,7 +113,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
                 }
 
                 // Automatically allocate a Dev cape while in Dev mode.
-                if (tResource == null && CORE.DEVENV) {
+                if (tResource == null && GTPPCore.DEVENV) {
                     tResource = mCapes[4];
                     hasCape = true;
                 }
@@ -184,13 +184,13 @@ public class GTPP_CapeRenderer extends RenderPlayer {
     private boolean renderCapeOnPlayer(RenderPlayerEvent.Specials.Pre aEvent, AbstractClientPlayer aPlayer) {
         float aPartialTicks = aEvent.partialRenderTick;
         try {
-            if (tResource == null && CORE.DEVENV) {
+            if (tResource == null && GTPPCore.DEVENV) {
                 tResource = mCapes[3];
             }
 
             // If player is invisible, don't render.
-            if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible()
-                || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id))) {
+            if (GTUtility.getFullInvisibility(aPlayer) || aPlayer.isInvisible()
+                || GTUtility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id))) {
                 aEvent.setCanceled(true);
                 return false;
             }
@@ -207,8 +207,8 @@ public class GTPP_CapeRenderer extends RenderPlayer {
                     - (aPlayer.prevPosZ + (aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks);
                 float f6 = aPlayer.prevRenderYawOffset
                     + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks;
-                double d3 = MathHelper.sin(f6 * CORE.PI / 180.0F);
-                double d4 = -MathHelper.cos(f6 * CORE.PI / 180.0F);
+                double d3 = MathHelper.sin(f6 * GTPPCore.PI / 180.0F);
+                double d4 = -MathHelper.cos(f6 * GTPPCore.PI / 180.0F);
                 float f7 = (float) d1 * 10.0F;
                 float f8 = (float) (d0 * d3 + d2 * d4) * 100.0F;
                 float f9 = (float) (d0 * d4 - d2 * d3) * 100.0F;
@@ -260,7 +260,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
 
         private static boolean init() {
             CapeUtils.handleOldCapeCache();
-            if (CORE.DEVENV) {
+            if (GTPPCore.DEVENV) {
                 return true;
             }
             ForkJoinPool.commonPool()
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/FlaskRenderer.java
index 0c9e59e2f2..20d904ae80 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/FlaskRenderer.java
@@ -13,14 +13,14 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.common.items.GT_VolumetricFlask;
+import gregtech.common.items.ItemVolumetricFlask;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import ic2.core.util.DrawUtil;
 
 @SideOnly(cpw.mods.fml.relauncher.Side.CLIENT)
-public final class GTPP_FlaskRenderer implements net.minecraftforge.client.IItemRenderer {
+public final class FlaskRenderer implements net.minecraftforge.client.IItemRenderer {
 
-    public GTPP_FlaskRenderer() {
+    public FlaskRenderer() {
         MinecraftForgeClient.registerItemRenderer(GregtechItemList.VOLUMETRIC_FLASK_8k.getItem(), this);
         MinecraftForgeClient.registerItemRenderer(GregtechItemList.VOLUMETRIC_FLASK_32k.getItem(), this);
     }
@@ -37,7 +37,7 @@ public final class GTPP_FlaskRenderer implements net.minecraftforge.client.IItem
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        GT_VolumetricFlask cell = (GT_VolumetricFlask) item.getItem();
+        ItemVolumetricFlask cell = (ItemVolumetricFlask) item.getItem();
 
         int aType = cell.getMaxCapacity() == 8000 ? 0 : 1;
         IIcon icon = item.getIconIndex();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java
index bfd16b4cc5..7ce7002738 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java
@@ -28,23 +28,23 @@ import net.minecraftforge.common.util.ForgeDirection;
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IPipeRenderedTileEntity;
 import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
-import gregtech.common.blocks.GT_Block_Machines;
-import gregtech.common.render.GT_Renderer_Block;
-import gtPlusPlus.xmod.gregtech.common.helpers.GT_MethodHelper;
+import gregtech.common.blocks.BlockMachines;
+import gregtech.common.render.GTRendererBlock;
+import gtPlusPlus.xmod.gregtech.common.helpers.GTMethodHelper;
 
-public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
+public class MachineBlockRenderer extends GTRendererBlock {
 
-    public static GTPP_Render_MachineBlock INSTANCE;
+    public static MachineBlockRenderer INSTANCE;
     public final int mRenderID = RenderingRegistry.getNextAvailableRenderId();
 
-    public GTPP_Render_MachineBlock() {
+    public MachineBlockRenderer() {
         INSTANCE = this;
         RenderingRegistry.registerBlockHandler(this);
     }
@@ -62,8 +62,8 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
     }
 
     private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta, RenderBlocks aRenderer) {
-        if (aMeta > 0 && aMeta < GregTech_API.METATILEENTITIES.length) {
-            IMetaTileEntity tMetaTileEntity = GregTech_API.METATILEENTITIES[aMeta];
+        if (aMeta > 0 && aMeta < GregTechAPI.METATILEENTITIES.length) {
+            IMetaTileEntity tMetaTileEntity = GregTechAPI.METATILEENTITIES[aMeta];
             if (tMetaTileEntity != null) {
                 aBlock.setBlockBoundsForItemRender();
                 aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -240,12 +240,12 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
                 aZ,
                 aBlock,
                 aRenderer,
-                new ITexture[][] { GT_MethodHelper.getTexture(tTileEntity, aBlock, DOWN),
-                    GT_MethodHelper.getTexture(tTileEntity, aBlock, UP),
-                    GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.NORTH),
-                    GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.SOUTH),
-                    GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.WEST),
-                    GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.EAST) })
+                new ITexture[][] { GTMethodHelper.getTexture(tTileEntity, aBlock, DOWN),
+                    GTMethodHelper.getTexture(tTileEntity, aBlock, UP),
+                    GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.NORTH),
+                    GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.SOUTH),
+                    GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.WEST),
+                    GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.EAST) })
             : false;
     }
 
@@ -294,7 +294,7 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
                     final EnumMap<ForgeDirection, ITexture[]> textureUncovered = new EnumMap<>(ForgeDirection.class);
 
                     for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
-                        texture.put(side, GT_MethodHelper.getTexture((TileEntity) aTileEntity, aBlock, side));
+                        texture.put(side, GTMethodHelper.getTexture((TileEntity) aTileEntity, aBlock, side));
                         textureUncovered.put(side, aTileEntity.getTextureUncovered(side));
                     }
 
@@ -1204,10 +1204,10 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
     @Override
     public void renderInventoryBlock(Block aBlock, int aMeta, int aModelID, RenderBlocks aRenderer) {
         aMeta += 30400;
-        if (aBlock instanceof GT_Block_Machines) {
-            if (aMeta > 0 && aMeta < GregTech_API.METATILEENTITIES.length
-                && GregTech_API.METATILEENTITIES[aMeta] != null
-                && !GregTech_API.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer)) {
+        if (aBlock instanceof BlockMachines) {
+            if (aMeta > 0 && aMeta < GregTechAPI.METATILEENTITIES.length
+                && GregTechAPI.METATILEENTITIES[aMeta] != null
+                && !GregTechAPI.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer)) {
                 renderNormalInventoryMetaTileEntity(aBlock, aMeta, aRenderer);
             }
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTEElectricAutoWorkbench.java
index c1ba23c3c7..05150c8478 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTEElectricAutoWorkbench.java
@@ -15,27 +15,27 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_BasicTank implements IAddGregtechLogo {
+public class MTEElectricAutoWorkbench extends MTEBasicTank implements IAddGregtechLogo {
 
     public int mMode = 0, mCurrentSlot = 0, mThroughPut = 0, mTicksUntilNextUpdate = 20;
     public boolean mLastCraftSuccessful = false;
@@ -44,18 +44,18 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
     private static final int MAX_MODES = 10;
     private static final int MAX_THROUGHPUT = 4;
 
-    public GT_MetaTileEntity_ElectricAutoWorkbench(final int aID, final int aTier, final String aDescription) {
+    public MTEElectricAutoWorkbench(final int aID, final int aTier, final String aDescription) {
         super(
             aID,
             "basicmachine.automation.autoworkbench.0" + aTier,
-            "Auto Workbench (" + GT_Values.VN[aTier] + ")",
+            "Auto Workbench (" + GTValues.VN[aTier] + ")",
             aTier,
             30,
             aDescription);
-        mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")";
+        mLocalName = "Auto Workbench (" + GTValues.VN[aTier] + ")";
     }
 
-    public GT_MetaTileEntity_ElectricAutoWorkbench(final String aName, final int aTier, final String[] aDescription,
+    public MTEElectricAutoWorkbench(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 30, aDescription, aTextures);
     }
@@ -112,22 +112,22 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
     @Override
     public long maxEUInput() {
-        return GT_Values.V[mTier];
+        return GTValues.V[mTier];
     }
 
     @Override
     public long maxEUOutput() {
-        return mThroughPut % 2 == 0 ? GT_Values.V[mTier] : 0;
+        return mThroughPut % 2 == 0 ? GTValues.V[mTier] : 0;
     }
 
     @Override
     public long getMinimumStoredEU() {
-        return GT_Values.V[this.mTier];
+        return GTValues.V[this.mTier];
     }
 
     @Override
     public long maxEUStore() {
-        return Math.max(2048L, GT_Values.V[this.mTier] * (this.mTier * GT_Values.V[this.mTier]));
+        return Math.max(2048L, GTValues.V[this.mTier] * (this.mTier * GTValues.V[this.mTier]));
     }
 
     @Override
@@ -142,17 +142,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
     @Override
     public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ElectricAutoWorkbench(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEElectricAutoWorkbench(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -200,7 +196,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return side != getBaseMetaTileEntity().getFrontFacing() && side != getBaseMetaTileEntity().getBackFacing();
     }
 
@@ -226,12 +222,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
             if (mInventory[18] == null) {
                 for (byte i = 0; i < 18 && mFluid != null; i++) {
-                    ItemStack tOutput = GT_Utility.fillFluidContainer(mFluid, mInventory[i], false, true);
+                    ItemStack tOutput = GTUtility.fillFluidContainer(mFluid, mInventory[i], false, true);
                     if (tOutput != null) {
                         for (byte j = 0; j < 9; j++) {
-                            if (mInventory[j] == null || (GT_Utility.areStacksEqual(tOutput, mInventory[j])
+                            if (mInventory[j] == null || (GTUtility.areStacksEqual(tOutput, mInventory[j])
                                 && mInventory[j].stackSize + tOutput.stackSize <= tOutput.getMaxStackSize())) {
-                                mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount
+                                mFluid.amount -= GTUtility.getFluidForFilledItem(tOutput, true).amount
                                     * tOutput.stackSize;
                                 getBaseMetaTileEntity().decrStackSize(i, 1);
                                 if (mInventory[j] == null) {
@@ -274,7 +270,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                             for (int i = 0; i < 9; i++) {
                                 tRecipe[i] = mInventory[i + 19];
                                 if (tRecipe[i] != null) {
-                                    tRecipe[i] = GT_Utility.copy(tRecipe[i]);
+                                    tRecipe[i] = GTUtility.copy(tRecipe[i]);
                                     tRecipe[i].stackSize = 1;
                                 }
                             }
@@ -288,22 +284,22 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 tRecipe[1] = tTempStack;
                                 tRecipe[3] = tTempStack;
                                 tRecipe[4] = tTempStack;
                             } else break;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 tRecipe[2] = tTempStack;
                                 tRecipe[5] = tTempStack;
                                 tRecipe[6] = tTempStack;
                                 tRecipe[7] = tTempStack;
                                 tRecipe[8] = tTempStack;
                             } else break;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 if (mInventory[18] == null) {
                                     mInventory[18] = mInventory[mCurrentSlot];
                                     mInventory[mCurrentSlot] = null;
@@ -320,10 +316,10 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 if (mInventory[18] == null) {
                                     mInventory[18] = mInventory[mCurrentSlot];
                                     mInventory[mCurrentSlot] = null;
@@ -340,13 +336,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
                             tRecipe[1] = tTempStack;
                             tRecipe[3] = tTempStack;
                             tRecipe[4] = tTempStack;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 if (mInventory[18] == null) {
                                     mInventory[18] = mInventory[mCurrentSlot];
                                     mInventory[mCurrentSlot] = null;
@@ -363,7 +359,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
                             tRecipe[1] = tTempStack;
@@ -374,7 +370,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                             tRecipe[6] = tTempStack;
                             tRecipe[7] = tTempStack;
                             tRecipe[8] = tTempStack;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 if (mInventory[18] == null) {
                                     mInventory[18] = mInventory[mCurrentSlot];
                                     mInventory[mCurrentSlot] = null;
@@ -391,11 +387,11 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
-                            tOutput = GT_OreDictUnificator.get(true, tTempStack);
-                            if (tOutput != null && GT_Utility.areStacksEqual(tOutput, tTempStack)) tOutput = null;
+                            tOutput = GTOreDictUnificator.get(true, tTempStack);
+                            if (tOutput != null && GTUtility.areStacksEqual(tOutput, tTempStack)) tOutput = null;
                             if (tOutput == null) {
                                 tRecipe[0] = null;
                                 if (mInventory[18] == null) {
@@ -413,13 +409,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                     mTicksUntilNextUpdate = 1;
                                 }
                             } else if (OrePrefixes.dustSmall.contains(mInventory[mCurrentSlot])) {
-                                tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                                tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                                 tTempStack.stackSize = 1;
                                 tRecipe[0] = tTempStack;
                                 tRecipe[1] = tTempStack;
                                 tRecipe[3] = tTempStack;
                                 tRecipe[4] = tTempStack;
-                                if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
+                                if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
                                     == null) {
                                     if (mInventory[18] == null) {
                                         mInventory[18] = mInventory[mCurrentSlot];
@@ -428,7 +424,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                     }
                                 }
                             } else if (OrePrefixes.dustTiny.contains(mInventory[mCurrentSlot])) {
-                                tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                                tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                                 tTempStack.stackSize = 1;
                                 tRecipe[0] = tTempStack;
                                 tRecipe[1] = tTempStack;
@@ -439,7 +435,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 tRecipe[6] = tTempStack;
                                 tRecipe[7] = tTempStack;
                                 tRecipe[8] = tTempStack;
-                                if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
+                                if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
                                     == null) {
                                     if (mInventory[18] == null) {
                                         mInventory[18] = mInventory[mCurrentSlot];
@@ -465,7 +461,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             tRecipe[0] = tTempStack;
                             tRecipe[1] = tTempStack;
@@ -476,7 +472,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                             tRecipe[6] = tTempStack;
                             tRecipe[7] = tTempStack;
                             tRecipe[8] = tTempStack;
-                            if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
+                            if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
                                 if (mInventory[18] == null) {
                                     mInventory[18] = mInventory[mCurrentSlot];
                                     mInventory[mCurrentSlot] = null;
@@ -496,15 +492,15 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                                 break;
                             }
-                            tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
+                            tTempStack = GTUtility.copy(mInventory[mCurrentSlot]);
                             tTempStack.stackSize = 1;
                             for (int i = mCurrentSlot + 1; i < 18; i++) {
                                 if (mInventory[i] != null && mInventory[i].getItem() == tTempStack.getItem()
                                     && mInventory[mCurrentSlot].getItemDamage() + mInventory[i].getItemDamage()
                                         > tTempStack.getMaxDamage()) {
                                     tRecipe[0] = tTempStack;
-                                    tRecipe[1] = GT_Utility.copy(mInventory[i]);
-                                    if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
+                                    tRecipe[1] = GTUtility.copy(mInventory[i]);
+                                    if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
                                         == null) {
                                         if (mInventory[18] == null) {
                                             mInventory[18] = mInventory[mCurrentSlot];
@@ -527,11 +523,11 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                             }
                             for (byte i = 0, j = 0; i < 18 && j < 9
                                 && (j < 2
-                                    || GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
+                                    || GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
                                         == null); i++) {
                                 tRecipe[j] = mInventory[(mCurrentSlot + i) % 18];
                                 if (tRecipe[j] != null) {
-                                    tRecipe[j] = GT_Utility.copy(tRecipe[j]);
+                                    tRecipe[j] = GTUtility.copy(tRecipe[j]);
                                     tRecipe[j].stackSize = 1;
                                     j++;
                                 }
@@ -542,19 +538,19 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                 }
 
                 if (tOutput == null)
-                    tOutput = GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe);
+                    tOutput = GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe);
 
                 if (tOutput != null || mMode == 0) mInventory[28] = tOutput;
 
                 if (tOutput == null) {
                     mLastCraftSuccessful = false;
                 } else {
-                    if ((tTempStack = GT_OreDictUnificator.get(true, tOutput)) != null) {
+                    if ((tTempStack = GTOreDictUnificator.get(true, tOutput)) != null) {
                         tTempStack.stackSize = tOutput.stackSize;
                         tOutput = tTempStack;
                     }
 
-                    mInventory[28] = GT_Utility.copy(tOutput);
+                    mInventory[28] = GTUtility.copy(tOutput);
                     ArrayList<ItemStack> tList = recipeContent(tRecipe), tContent = benchContent();
                     if (tList.size() > 0 && tContent.size() > 0) {
 
@@ -562,7 +558,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                         for (byte i = 0; i < tList.size() && success; i++) {
                             success = false;
                             for (byte j = 0; j < tContent.size() && !success; j++) {
-                                if (GT_Utility.areStacksEqual(tList.get(i), tContent.get(j))) {
+                                if (GTUtility.areStacksEqual(tList.get(i), tContent.get(j))) {
                                     if (tList.get(i).stackSize <= tContent.get(j).stackSize) {
                                         success = true;
                                     }
@@ -576,17 +572,17 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                             for (byte i = 8; i > -1; i--) {
                                 for (byte j = 17; j > -1; j--) {
                                     if (tRecipe[i] != null && mInventory[j] != null) {
-                                        if (GT_Utility.areStacksEqual(tRecipe[i], mInventory[j])) {
-                                            ItemStack tStack = GT_Utility.getContainerItem(mInventory[j], true);
+                                        if (GTUtility.areStacksEqual(tRecipe[i], mInventory[j])) {
+                                            ItemStack tStack = GTUtility.getContainerItem(mInventory[j], true);
                                             if (tStack != null) {
                                                 getBaseMetaTileEntity().decrStackSize(j, 1);
                                                 if (!tStack.isItemStackDamageable()
                                                     || tStack.getItemDamage() < tStack.getMaxDamage()) {
                                                     for (byte k = 9; k < 18; k++) {
                                                         if (mInventory[k] == null) {
-                                                            mInventory[k] = GT_Utility.copy(tStack);
+                                                            mInventory[k] = GTUtility.copy(tStack);
                                                             break;
-                                                        } else if (GT_Utility.areStacksEqual(mInventory[k], tStack)
+                                                        } else if (GTUtility.areStacksEqual(mInventory[k], tStack)
                                                             && mInventory[k].stackSize + tStack.stackSize
                                                                 <= tStack.getMaxStackSize()) {
                                                                     mInventory[k].stackSize += tStack.stackSize;
@@ -603,7 +599,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                                 }
                             }
 
-                            mInventory[18] = GT_Utility.copy(tOutput);
+                            mInventory[18] = GTUtility.copy(tOutput);
                             getBaseMetaTileEntity()
                                 .decreaseStoredEnergyUnits(mMode == 5 || mMode == 6 || mMode == 7 ? 128 : 2048, true);
                             mTicksUntilNextUpdate = 1;
@@ -620,7 +616,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                     if (mInventory[18] == null && mThroughPut < 2) {
                         for (byte i = 0; i < 8; i++) {
                             for (byte j = i; ++j < 9;) {
-                                if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j])
+                                if (GTUtility.areStacksEqual(mInventory[i], mInventory[j])
                                     && mInventory[i].getMaxStackSize() > 8) {
                                     mInventory[18] = mInventory[j];
                                     mInventory[j] = null;
@@ -635,7 +631,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
             if (mThroughPut < 2) {
                 getBaseMetaTileEntity().decreaseStoredEnergyUnits(
-                    GT_Utility.moveOneItemStack(
+                    GTUtility.moveOneItemStack(
                         getBaseMetaTileEntity(),
                         getBaseMetaTileEntity().getIInventoryAtSide(getBaseMetaTileEntity().getBackFacing()),
                         getBaseMetaTileEntity().getBackFacing(),
@@ -655,8 +651,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
         if (aStack == null) return true;
         for (byte i = 19; i < 28; i++) {
             if (mInventory[i] != null) {
-                if (GT_Utility.areStacksEqual(mInventory[i], aStack)) return true;
-                if (GT_Utility.areStacksEqual(GT_Utility.getContainerForFilledItem(mInventory[i], true), aStack))
+                if (GTUtility.areStacksEqual(mInventory[i], aStack)) return true;
+                if (GTUtility.areStacksEqual(GTUtility.getContainerForFilledItem(mInventory[i], true), aStack))
                     return true;
             }
         }
@@ -669,13 +665,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
             if (tRecipe[i] != null) {
                 boolean temp = false;
                 for (ItemStack itemStack : tList) {
-                    if (GT_Utility.areStacksEqual(tRecipe[i], itemStack)) {
+                    if (GTUtility.areStacksEqual(tRecipe[i], itemStack)) {
                         itemStack.stackSize++;
                         temp = true;
                         break;
                     }
                 }
-                if (!temp) tList.add(GT_Utility.copy(1, tRecipe[i]));
+                if (!temp) tList.add(GTUtility.copy(1, tRecipe[i]));
             }
         }
         return tList;
@@ -687,13 +683,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
             if (mInventory[i] != null) {
                 boolean temp = false;
                 for (byte j = 0; j < tList.size(); j++) {
-                    if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j])) {
+                    if (GTUtility.areStacksEqual(mInventory[i], mInventory[j])) {
                         tList.get(j).stackSize += mInventory[i].stackSize;
                         temp = true;
                         break;
                     }
                 }
-                if (!temp) tList.add(GT_Utility.copy(mInventory[i]));
+                if (!temp) tList.add(GTUtility.copy(mInventory[i]));
             }
         }
         return tList;
@@ -730,7 +726,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
     public String[] getDescription() {
         return new String[] { "Automatic Crafting Table Mk III",
             // this.mDescription,
-            CORE.GT_Tooltip.get() };
+            GTPPCore.GT_Tooltip.get() };
     }
 
     @Override
@@ -765,12 +761,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE) };
+            new GTRenderedTexture(BlockIcons.OVERLAY_PIPE) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
@@ -779,12 +775,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
     }
 
     @Override
@@ -807,16 +803,16 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                     .startFromSlot(9)
                     .endAtSlot(17)
                     .canInsert(false)
-                    .background(GT_UITextures.SLOT_DARK_GRAY)
+                    .background(GTUITextures.SLOT_DARK_GRAY)
                     .applyForWidget(SlotWidget::disableShiftInsert)
                     .build()
                     .setPos(7, 59))
             .widget(
                 new SlotWidget(inventoryHandler, 18).setAccess(true, false)
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_OUT)
                     .setPos(151, 40))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_SLOTS_HOLO_3BY3)
                     .setPos(62, 4)
                     .setSize(54, 54))
             .widget(
@@ -824,20 +820,20 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                     .startFromSlot(19)
                     .endAtSlot(27)
                     .phantom(true)
-                    .background(GT_UITextures.TRANSPARENT)
+                    .background(GTUITextures.TRANSPARENT)
                     .build()
                     .setPos(62, 4))
             .widget(
                 SlotWidget.phantom(inventoryHandler, 28)
                     .disableInteraction()
-                    .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ARROW_4)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_ARROW_4)
                     .setPos(151, 4));
         builder.widget(
             new CycleButtonWidget().setGetter(() -> mThroughPut)
                 .setSetter(val -> mThroughPut = val)
                 .setLength(MAX_THROUGHPUT)
-                .setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_THROUGHPUT[i])
-                .setBackground(GT_UITextures.BUTTON_STANDARD)
+                .setTextureGetter(i -> GTPPUITextures.OVERLAY_BUTTON_THROUGHPUT[i])
+                .setBackground(GTUITextures.BUTTON_STANDARD)
                 .setPos(120, 4)
                 .setSize(18, 18));
         String[] mModeText = new String[] { "Normal Crafting Table", "???", "1x1", "2x2", "3x3", "Unifier", "Dust",
@@ -848,20 +844,20 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
                 switchMode();
             })
             .setLength(MAX_MODES)
-            .setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_MODE[i]);
+            .setTextureGetter(i -> GTPPUITextures.OVERLAY_BUTTON_MODE[i]);
         for (int i = 0; i < MAX_MODES; i++) {
             modeButton.addTooltip(i, "Mode: " + mModeText[i]);
         }
         builder.widget(
-            modeButton.setBackground(GT_UITextures.BUTTON_STANDARD)
+            modeButton.setBackground(GTUITextures.BUTTON_STANDARD)
                 .setPos(120, 40)
                 .setSize(18, 18));
         builder.widget(
-            new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_WORKBENCH_CIRCLE)
+            new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_WORKBENCH_CIRCLE)
                 .setPos(136, 23)
                 .setSize(16, 16))
             .widget(
-                new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ARROW_WHITE_DOWN)
+                new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_ARROW_WHITE_DOWN)
                     .setPos(155, 23)
                     .setSize(10, 16));
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractGenerator.java
index 33dbfee6d4..08db4e19be 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractGenerator.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.automation;
 
-import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap;
-import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap;
+import static gtPlusPlus.core.lib.GTPPCore.sTesseractGeneratorOwnershipMap;
+import static gtPlusPlus.core.lib.GTPPCore.sTesseractTerminalOwnershipMap;
 
 import java.util.UUID;
 
@@ -27,16 +27,16 @@ import gregtech.api.interfaces.tileentity.IDigitalChest;
 import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.helpers.tesseract.TesseractHelper;
 
-public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_BasicTank {
+public class MTETesseractGenerator extends MTEBasicTank {
 
     public static int TESSERACT_ENERGY_COST_DIMENSIONAL = 512;
     public static int TESSERACT_ENERGY_COST = 128;
@@ -46,19 +46,18 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
     public int mFrequency = 0;
     public UUID mOwner;
 
-    public GT_MetaTileEntity_TesseractGenerator(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTETesseractGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier, 3, "");
     }
 
-    public GT_MetaTileEntity_TesseractGenerator(final String aName, final int aTier, final String[] aDescription,
+    public MTETesseractGenerator(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TesseractGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTETesseractGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -215,12 +214,12 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
             .getFrontFacing()) {
             if (aPlayer.getUniqueID()
                 .compareTo(this.mOwner) == 0) {
-                final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ);
+                final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ);
                 switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) {
                     case 0:
                         Logger.WARNING("Freq. -1 | " + this.mFrequency);
                         try {
-                            CORE.sTesseractGeneratorOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency -= 1;
@@ -229,7 +228,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
                     case 1:
                         Logger.WARNING("Freq. +1 | " + this.mFrequency);
                         try {
-                            CORE.sTesseractGeneratorOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency += 1;
@@ -238,15 +237,15 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
                         break;
                 }
                 if (getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this) {
-                    GT_Utility.sendChatToPlayer(
+                    GTUtility.sendChatToPlayer(
                         aPlayer,
                         "Frequency: " + this.mFrequency + EnumChatFormatting.RED + " (Occupied)");
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency);
+                    GTUtility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency);
                 }
             } else if (aPlayer.getUniqueID()
                 .compareTo(this.mOwner) != 0) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "This is not your Tesseract Generator to configure.");
+                    GTUtility.sendChatToPlayer(aPlayer, "This is not your Tesseract Generator to configure.");
                 }
         }
 
@@ -260,47 +259,47 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
             .compareTo(this.mOwner) == 0) {
             if (side == this.getBaseMetaTileEntity()
                 .getFrontFacing()) {
-                final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ);
+                final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ);
                 switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) {
                     case 0 -> {
                         try {
-                            CORE.sTesseractGeneratorOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency -= 64;
                     }
                     case 1 -> {
                         try {
-                            CORE.sTesseractGeneratorOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency += 64;
                     }
                     case 2 -> {
                         try {
-                            CORE.sTesseractGeneratorOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency -= 512;
                     }
                     case 3 -> {
                         try {
-                            CORE.sTesseractGeneratorOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency += 512;
                     }
                 }
                 if (getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this) {
-                    GT_Utility.sendChatToPlayer(
+                    GTUtility.sendChatToPlayer(
                         aPlayer,
                         "Frequency: " + this.mFrequency + EnumChatFormatting.RED + " (Occupied)");
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency);
+                    GTUtility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency);
                 }
             }
         } else {
-            GT_Utility.sendChatToPlayer(aPlayer, "This is not your Tesseract Generator to configure.");
+            GTUtility.sendChatToPlayer(aPlayer, "This is not your Tesseract Generator to configure.");
         }
     }
 
@@ -614,7 +613,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
         return tTileEntity.drain(aSide, aFluid, doDrain);
     }
 
-    public boolean addEnergyConsumption(final GT_MetaTileEntity_TesseractTerminal aTerminal) {
+    public boolean addEnergyConsumption(final MTETesseractTerminal aTerminal) {
         if (!this.getBaseMetaTileEntity()
             .isAllowedToWork()) {
             return false;
@@ -728,7 +727,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
             "Connect with pipes to insert items",
             "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers",
             "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers",
-            CORE.GT_Tooltip.get());
+            GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -752,10 +751,10 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
     public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side,
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         return side == facing
-            ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
-                new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) }
-            : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
-                new GT_RenderedTexture(Textures.BlockIcons.VOID) };
+            ? new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) }
+            : new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                new GTRenderedTexture(Textures.BlockIcons.VOID) };
     }
 
     // To-Do?
@@ -789,8 +788,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
         return false;
     }
 
-    private GT_MetaTileEntity_TesseractGenerator getGeneratorEntity() {
-        GT_MetaTileEntity_TesseractGenerator thisGenerator = TesseractHelper
+    private MTETesseractGenerator getGeneratorEntity() {
+        MTETesseractGenerator thisGenerator = TesseractHelper
             .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency);
         if (thisGenerator != null) {
             return thisGenerator;
@@ -798,8 +797,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
         return null;
     }
 
-    private GT_MetaTileEntity_TesseractGenerator getGeneratorEntity(int frequency) {
-        GT_MetaTileEntity_TesseractGenerator thisGenerator = TesseractHelper
+    private MTETesseractGenerator getGeneratorEntity(int frequency) {
+        MTETesseractGenerator thisGenerator = TesseractHelper
             .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), frequency);
         if (thisGenerator != null) {
             return thisGenerator;
@@ -825,7 +824,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
     @Override
     public void onRemoval() {
         try {
-            CORE.sTesseractGeneratorOwnershipMap.get(mOwner)
+            GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner)
                 .remove(this.mFrequency);
         } catch (Throwable t) {}
         super.onRemoval();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractTerminal.java
index 28b567e06c..c34a2ca41b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractTerminal.java
@@ -18,15 +18,15 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.helpers.tesseract.TesseractHelper;
 
-public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_BasicTank {
+public class MTETesseractTerminal extends MTEBasicTank {
 
     public int mFrequency = 0;
     public UUID mOwner;
@@ -35,19 +35,18 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
     private static int TESSERACT_ENERGY_COST = 128;
     private static int TESSERACT_ENERGY_COST_DIMENSIONAL = 512;
 
-    public GT_MetaTileEntity_TesseractTerminal(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTETesseractTerminal(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier, 3, "");
     }
 
-    public GT_MetaTileEntity_TesseractTerminal(final String aName, final int aTier, final String[] aDescription,
+    public MTETesseractTerminal(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TesseractTerminal(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTETesseractTerminal(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -168,12 +167,12 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
             .compareTo(this.mOwner) == 0) {
             if (side == this.getBaseMetaTileEntity()
                 .getFrontFacing()) {
-                final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ);
+                final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ);
                 switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) {
                     case 0:
                         // Utils.LOG_WARNING("Freq. -1 | " + this.mFrequency);
                         try {
-                            CORE.sTesseractTerminalOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency -= 1;
@@ -181,14 +180,14 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
                     case 1:
                         // Utils.LOG_WARNING("Freq. +1 | " + this.mFrequency);
                         try {
-                            CORE.sTesseractTerminalOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency += 1;
                     default:
                         // Utils.LOG_WARNING("Did not click the correct place.");
                         try {
-                            CORE.sTesseractTerminalOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         break;
@@ -204,7 +203,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
             }
         } else if (aPlayer.getUniqueID()
             .compareTo(this.mOwner) != 0) {
-                GT_Utility.sendChatToPlayer(aPlayer, "This is not your Tesseract Terminal to configure.");
+                GTUtility.sendChatToPlayer(aPlayer, "This is not your Tesseract Terminal to configure.");
             }
         return true;
     }
@@ -216,38 +215,38 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
             .compareTo(this.mOwner) == 0) {
             if (side == this.getBaseMetaTileEntity()
                 .getFrontFacing()) {
-                final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ);
+                final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ);
                 switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) {
                     case 0 -> {
                         try {
-                            CORE.sTesseractTerminalOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency -= 64;
                     }
                     case 1 -> {
                         try {
-                            CORE.sTesseractTerminalOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency += 64;
                     }
                     case 2 -> {
                         try {
-                            CORE.sTesseractTerminalOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency -= 512;
                     }
                     case 3 -> {
                         try {
-                            CORE.sTesseractTerminalOwnershipMap.get(mOwner)
+                            GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner)
                                 .remove(this.mFrequency);
                         } catch (Throwable t) {}
                         this.mFrequency += 512;
                     }
                 }
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aPlayer,
                     "Frequency: " + this.mFrequency
                         + (this.getTesseract(this.mFrequency, false) == null ? ""
@@ -257,7 +256,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
             }
         } else if (aPlayer.getUniqueID()
             .compareTo(this.mOwner) != 0) {
-                GT_Utility.sendChatToPlayer(aPlayer, "This is not your Tesseract Terminal to configure.");
+                GTUtility.sendChatToPlayer(aPlayer, "This is not your Tesseract Terminal to configure.");
             }
     }
 
@@ -266,8 +265,8 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
             .getFrontFacing();
     }
 
-    public GT_MetaTileEntity_TesseractGenerator getTesseract(final int aFrequency, final boolean aWorkIrrelevant) {
-        final GT_MetaTileEntity_TesseractGenerator rTesseract = TesseractHelper
+    public MTETesseractGenerator getTesseract(final int aFrequency, final boolean aWorkIrrelevant) {
+        final MTETesseractGenerator rTesseract = TesseractHelper
             .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), aFrequency);
         if (rTesseract == null) {
             return null;
@@ -299,7 +298,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public String[] getInfoData() {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity != null) && (this.getBaseMetaTileEntity()
             .isAllowedToWork()) && (tTileEntity.isSendingInformation())) {
             return tTileEntity.getInfoData();
@@ -315,7 +314,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public boolean isDigitalChest() {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return false;
@@ -325,7 +324,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public ItemStack[] getStoredItemData() {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return null;
@@ -335,7 +334,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public void setItemCount(final int aCount) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return;
@@ -345,7 +344,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public int getMaxItemCount() {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return 0;
@@ -355,7 +354,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public boolean isItemValidForSlot(final int aIndex, final ItemStack aStack) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return false;
@@ -365,7 +364,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public int[] getAccessibleSlotsFromSide(final int ordinalSide) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return new int[0];
@@ -375,7 +374,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public boolean canInsertItem(final int aIndex, final ItemStack aStack, final int ordinalSide) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return false;
@@ -385,7 +384,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public boolean canExtractItem(final int aIndex, final ItemStack aStack, final int ordinalSide) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return false;
@@ -395,7 +394,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public int getSizeInventory() {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return 0;
@@ -405,7 +404,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public ItemStack getStackInSlot(final int aIndex) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return null;
@@ -415,7 +414,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public void setInventorySlotContents(final int aIndex, final ItemStack aStack) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return;
@@ -425,7 +424,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public ItemStack decrStackSize(final int aIndex, final int aAmount) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return null;
@@ -435,7 +434,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public String getInventoryName() {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return "";
@@ -445,7 +444,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public int getInventoryStackLimit() {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return 0;
@@ -455,7 +454,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public boolean canFill(final ForgeDirection aSide, final Fluid aFluid) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return false;
@@ -465,7 +464,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public boolean canDrain(final ForgeDirection aSide, final Fluid aFluid) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return false;
@@ -475,7 +474,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public FluidTankInfo[] getTankInfo(final ForgeDirection aSide) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return new FluidTankInfo[0];
@@ -485,7 +484,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public int fill_default(final ForgeDirection aDirection, final FluidStack aFluid, final boolean doFill) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return 0;
@@ -495,7 +494,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public FluidStack drain(final ForgeDirection aDirection, final int maxDrain, final boolean doDrain) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return null;
@@ -505,7 +504,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
 
     @Override
     public FluidStack drain(final ForgeDirection aSide, final FluidStack aFluid, final boolean doDrain) {
-        final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
+        final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
         if ((tTileEntity == null) || (!this.getBaseMetaTileEntity()
             .isAllowedToWork())) {
             return null;
@@ -530,7 +529,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
                             .getOwnerName());
                 }
             }
-            final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, true);
+            final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, true);
             if (tTileEntity != null) {
                 tTileEntity.addEnergyConsumption(this);
                 if ((!this.mDidWork) && (this.getTesseract(this.mFrequency, false) != null)) {
@@ -557,7 +556,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
             "Outputs from the back face",
             "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers",
             "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers",
-            CORE.GT_Tooltip.get());
+            GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -581,10 +580,10 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
     public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side,
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         return side == facing
-            ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
-                new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) }
-            : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
-                new GT_RenderedTexture(Textures.BlockIcons.VOID) };
+            ? new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) }
+            : new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                new GTRenderedTexture(Textures.BlockIcons.VOID) };
     }
 
     // To-Do?
@@ -635,7 +634,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
     @Override
     public void onRemoval() {
         try {
-            CORE.sTesseractTerminalOwnershipMap.get(mOwner)
+            GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner)
                 .remove(this.mFrequency);
         } catch (Throwable t) {}
         super.onRemoval();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java
index 6200a37872..b3a367bcaf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java
@@ -15,36 +15,36 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.common.tileentities.boilers.MTEBoiler;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures;
 
-public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
+public class MTEBoilerBase extends MTEBoiler {
 
     private final int steamPerSecond;
     private final int tier;
 
-    public GT_MetaTileEntity_Boiler_Base(int aID, String aNameRegional, int tier) {
+    public MTEBoilerBase(int aID, String aNameRegional, int tier) {
         super(
             aID,
             "electricboiler." + tier + ".tier.single",
             aNameRegional,
-            "Produces " + (CORE.ConfigSwitches.boilerSteamPerSecond * tier) + "L of Steam per second");
-        this.steamPerSecond = (CORE.ConfigSwitches.boilerSteamPerSecond * tier);
+            "Produces " + (GTPPCore.ConfigSwitches.boilerSteamPerSecond * tier) + "L of Steam per second");
+        this.steamPerSecond = (GTPPCore.ConfigSwitches.boilerSteamPerSecond * tier);
         this.tier = tier;
     }
 
-    public GT_MetaTileEntity_Boiler_Base(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
-        this.steamPerSecond = (CORE.ConfigSwitches.boilerSteamPerSecond * aTier);
+        this.steamPerSecond = (GTPPCore.ConfigSwitches.boilerSteamPerSecond * aTier);
         this.tier = aTier;
     }
 
@@ -56,11 +56,11 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
             "Consumes fuel only when temperature is less than 100C",
             "Fuel with burn time greater than 500 is more efficient.",
             "Doesn't explode if there's no water",
-            CORE.GT_Tooltip.get());
+            GTPPCore.GT_Tooltip.get());
     }
 
     public ITexture getOverlayIcon() {
-        return new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT);
+        return new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT);
     }
 
     @Override
@@ -81,13 +81,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
         return rTextures;
     }
 
-    protected GT_RenderedTexture getCasingTexture() {
+    protected GTRenderedTexture getCasingTexture() {
         if (this.tier == 1) {
-            return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE);
+            return new GTRenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE);
         } else if (this.tier == 2) {
-            return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE);
+            return new GTRenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE);
         } else {
-            return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE);
+            return new GTRenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE);
         }
     }
 
@@ -231,13 +231,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 
     @Override
     protected int getPollution() {
-        return (int) (CORE.ConfigSwitches.basePollutionPerSecondBoiler
-            * CORE.ConfigSwitches.pollutionReleasedByTierBoiler[this.tier]);
+        return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondBoiler
+            * GTPPCore.ConfigSwitches.pollutionReleasedByTierBoiler[this.tier]);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Base(this.mName, tier, this.mDescriptionArray, this.mTextures);
+        return new MTEBoilerBase(this.mName, tier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -269,15 +269,15 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
                 || fuel.getDisplayName()
                     .toLowerCase()
                     .contains("coke")) {
-                tile.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
+                tile.addStackToSlot(3, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
             } else {
-                tile.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+                tile.addStackToSlot(3, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
             }
         }
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCover) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCover) {
         if (side != this.getBaseMetaTileEntity()
             .getFrontFacing()) {
             return true;
@@ -292,12 +292,12 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 
     @Override
     protected IDrawable[] getFuelSlotBackground() {
-        return new IDrawable[] { getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_COAL };
+        return new IDrawable[] { getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_COAL };
     }
 
     @Override
     protected IDrawable[] getAshSlotBackground() {
-        return new IDrawable[] { getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DUST };
+        return new IDrawable[] { getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_DUST };
     }
 
     @Override
@@ -307,26 +307,26 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 
     @Override
     protected IDrawable getOverlaySlotIn() {
-        return GT_UITextures.OVERLAY_SLOT_IN;
+        return GTUITextures.OVERLAY_SLOT_IN;
     }
 
     @Override
     protected IDrawable getOverlaySlotOut() {
-        return GT_UITextures.OVERLAY_SLOT_OUT;
+        return GTUITextures.OVERLAY_SLOT_OUT;
     }
 
     @Override
     protected IDrawable getOverlaySlotCanister() {
-        return GTPP_UITextures.OVERLAY_SLOT_CANISTER_DARK;
+        return GTPPUITextures.OVERLAY_SLOT_CANISTER_DARK;
     }
 
     @Override
     protected UITexture getProgressbarEmpty() {
-        return GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY;
+        return GTPPUITextures.PROGRESSBAR_BOILER_EMPTY;
     }
 
     @Override
     protected UITexture getProgressbarFuel() {
-        return GTPP_UITextures.PROGRESSBAR_FUEL;
+        return GTPPUITextures.PROGRESSBAR_FUEL;
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerHV.java
index e24698812f..6bb0c658bd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerHV.java
@@ -4,44 +4,44 @@ import gregtech.api.enums.Textures;
 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;
 
-public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base {
+public class MTEBoilerHV extends MTEBoilerBase {
 
-    public GT_MetaTileEntity_Boiler_HV(int aID, String aNameRegional, int aBoilerTier) {
+    public MTEBoilerHV(int aID, String aNameRegional, int aBoilerTier) {
         super(aID, aNameRegional, aBoilerTier);
     }
 
-    public GT_MetaTileEntity_Boiler_HV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerHV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_HV(this.mName, 3, this.mDescriptionArray, this.mTextures);
+        return new MTEBoilerHV(this.mName, 3, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
-    protected GT_RenderedTexture getCasingTexture() {
-        return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE);
+    protected GTRenderedTexture getCasingTexture() {
+        return new GTRenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE);
     }
 
     @Override
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) };
+            new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT) };
     }
 
     @Override
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_TOP) };
+            new GTRenderedTexture(Textures.BlockIcons.MACHINE_HV_TOP) };
     }
 
     @Override
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerLV.java
index adaec8a51e..0d8c03e448 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerLV.java
@@ -4,44 +4,44 @@ import gregtech.api.enums.Textures;
 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;
 
-public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base {
+public class MTEBoilerLV extends MTEBoilerBase {
 
-    public GT_MetaTileEntity_Boiler_LV(int aID, String aNameRegional, int aBoilerTier) {
+    public MTEBoilerLV(int aID, String aNameRegional, int aBoilerTier) {
         super(aID, aNameRegional, aBoilerTier);
     }
 
-    public GT_MetaTileEntity_Boiler_LV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerLV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_LV(this.mName, 1, this.mDescriptionArray, this.mTextures);
+        return new MTEBoilerLV(this.mName, 1, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
-    protected GT_RenderedTexture getCasingTexture() {
-        return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE);
+    protected GTRenderedTexture getCasingTexture() {
+        return new GTRenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE);
     }
 
     @Override
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) };
+            new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT) };
     }
 
     @Override
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_TOP) };
+            new GTRenderedTexture(Textures.BlockIcons.MACHINE_LV_TOP) };
     }
 
     @Override
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerMV.java
index dce70d4ccf..32bda689c2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerMV.java
@@ -4,44 +4,44 @@ import gregtech.api.enums.Textures;
 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;
 
-public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base {
+public class MTEBoilerMV extends MTEBoilerBase {
 
-    public GT_MetaTileEntity_Boiler_MV(int aID, String aNameRegional, int aBoilerTier) {
+    public MTEBoilerMV(int aID, String aNameRegional, int aBoilerTier) {
         super(aID, aNameRegional, aBoilerTier);
     }
 
-    public GT_MetaTileEntity_Boiler_MV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerMV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_MV(this.mName, 2, this.mDescriptionArray, this.mTextures);
+        return new MTEBoilerMV(this.mName, 2, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
-    protected GT_RenderedTexture getCasingTexture() {
-        return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE);
+    protected GTRenderedTexture getCasingTexture() {
+        return new GTRenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE);
     }
 
     @Override
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) };
+            new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT) };
     }
 
     @Override
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_TOP) };
+            new GTRenderedTexture(Textures.BlockIcons.MACHINE_MV_TOP) };
     }
 
     @Override
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java
index af235556c8..4fac228f4f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java
@@ -9,29 +9,28 @@ import org.apache.commons.lang3.ArrayUtils;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.ItemList;
 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_BasicGenerator;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEBasicGenerator;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_ModHandler;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.util.GTModHandler;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity_BasicGenerator {
+public class MTEGeothermalGenerator extends MTEBasicGenerator {
 
     public int mEfficiency;
 
-    public GregtechMetaTileEntityGeothermalGenerator(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTEGeothermalGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier, "Requires Pahoehoe Lava or Normal Lava as Fuel", new ITexture[0]);
         this.setEfficiency();
     }
 
-    public GregtechMetaTileEntityGeothermalGenerator(final String aName, final int aTier, final String[] aDescription,
+    public MTEGeothermalGenerator(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         this.setEfficiency();
@@ -44,12 +43,12 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
             this.mDescriptionArray,
             "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
             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;
     }
 
@@ -70,7 +69,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
 
     @Override
     public int getFuelValue(final ItemStack aStack) {
-        int rValue = Math.max((GT_ModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack));
+        int rValue = Math.max((GTModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack));
         if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
             rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3);
         }
@@ -85,77 +84,73 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntityGeothermalGenerator(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEGeothermalGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] { super.getFront(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
             Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
     }
 
     @Override
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] { super.getBack(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK),
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK),
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical) };
     }
 
     @Override
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { super.getBottom(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) };
     }
 
     @Override
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { super.getTop(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER) };
     }
 
     @Override
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { super.getSides(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT) };
+            new GTRenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT) };
     }
 
     @Override
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] { super.getFrontActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE),
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE),
             Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
     }
 
     @Override
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] { super.getBackActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE),
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE),
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active) };
     }
 
     @Override
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] { super.getBottomActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) };
     }
 
     @Override
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] { super.getTopActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE) };
     }
 
     @Override
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] { super.getSidesActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE) };
     }
 
     @Override
@@ -165,7 +160,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
 
     @Override
     public int getPollution() {
-        return (int) (CORE.ConfigSwitches.basePollutionPerSecondGeothermalGenerator
-            * CORE.ConfigSwitches.pollutionReleasedByTierGeothermalGenerator[mTier]);
+        return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondGeothermalGenerator
+            * GTPPCore.ConfigSwitches.pollutionReleasedByTierGeothermalGenerator[mTier]);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java
index 32cf3a92cc..00a915b89c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java
@@ -13,25 +13,25 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEBasicGenerator;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
-public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator {
+public class MTERTGenerator extends MTEBasicGenerator {
 
     public int mEfficiency;
     private long mTicksToBurnFor;
     private int mVoltage = 0;
-    private GT_Recipe mCurrentRecipe;
+    private GTRecipe mCurrentRecipe;
     private int mDaysRemaining = 0;
     private int mDayTick = 0;
     private byte mNewTier = 0;
@@ -130,7 +130,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
                         this.mInventory[getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
                     this.mInventory[getStackDisplaySlot()].setStackDisplayName(
                         "Generating: "
-                            + GT_Utility.formatNumbers(
+                            + GTUtility.formatNumbers(
                                 aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU())
                             + " EU");
                 }
@@ -151,7 +151,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
             }
             if ((this.mInventory[getInputSlot()] != null)
                 && (aBaseMetaTileEntity.getUniversalEnergyStored() < maxEUOutput() * 20L + getMinimumStoredEU())
-                && (GT_Utility.getFluidForFilledItem(this.mInventory[getInputSlot()], true) == null)) {
+                && (GTUtility.getFluidForFilledItem(this.mInventory[getInputSlot()], true) == null)) {
                 int tFuelValue = getFuelValue(this.mInventory[getInputSlot()]);
                 if (tFuelValue > 0) {
                     ItemStack tEmptyContainer = getEmptyContainer(this.mInventory[getInputSlot()]);
@@ -179,12 +179,12 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
             this.mDescriptionArray,
             "Fuel is measured in minecraft days (Check with Scanner)",
             "RTG changes output voltage depending on fuel",
-            "Generates power at " + GT_Utility.formatNumbers(this.getEfficiency()) + "% Efficiency per tick",
-            "Output Voltage: " + GT_Utility.formatNumbers(this.getOutputTier()) + " EU/t",
-            CORE.GT_Tooltip.get());
+            "Generates power at " + GTUtility.formatNumbers(this.getEfficiency()) + "% Efficiency per tick",
+            "Output Voltage: " + GTUtility.formatNumbers(this.getOutputTier()) + " EU/t",
+            GTPPCore.GT_Tooltip.get());
     }
 
-    public GregtechMetaTileEntity_RTG(int aID, String aName, String aNameRegional, int aTier) {
+    public MTERTGenerator(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "Requires RTG Pellets", new ITexture[0]);
     }
 
@@ -202,7 +202,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
         return 0;
     }
 
-    public GregtechMetaTileEntity_RTG(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTERTGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
@@ -214,7 +214,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_RTG(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTERTGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -235,66 +235,66 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
     @Override
     public ITexture[] getFront(byte aColor) {
         return new ITexture[] { super.getFront(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB) };
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB) };
     }
 
     @Override
     public ITexture[] getBack(byte aColor) {
         return new ITexture[] { super.getBack(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) };
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) };
     }
 
     @Override
     public ITexture[] getBottom(byte aColor) {
         return new ITexture[] { super.getBottom(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) };
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) };
     }
 
     @Override
     public ITexture[] getTop(byte aColor) {
         return new ITexture[] { super.getTop(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) };
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) };
     }
 
     @Override
     public ITexture[] getSides(byte aColor) {
         return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)],
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
             gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] };
     }
 
     @Override
     public ITexture[] getFrontActive(byte aColor) {
         return new ITexture[] { super.getFrontActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+            new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE) };
     }
 
     @Override
     public ITexture[] getBackActive(byte aColor) {
         return new ITexture[] { super.getBackActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) };
     }
 
     @Override
     public ITexture[] getBottomActive(byte aColor) {
         return new ITexture[] { super.getBottomActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) };
     }
 
     @Override
     public ITexture[] getTopActive(byte aColor) {
         return new ITexture[] { super.getTopActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) };
     }
 
     @Override
     public ITexture[] getSidesActive(byte aColor) {
         return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)],
-            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+            new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
             gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] };
     }
 
@@ -305,8 +305,8 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
 
     @Override
     public int getFuelValue(ItemStack aStack) {
-        if ((GT_Utility.isStackInvalid(aStack)) || (getRecipeMap() == null)) return 0;
-        GT_Recipe tFuel = getRecipeMap()
+        if ((GTUtility.isStackInvalid(aStack)) || (getRecipeMap() == null)) return 0;
+        GTRecipe tFuel = getRecipeMap()
             .findRecipe(getBaseMetaTileEntity(), false, 9223372036854775807L, null, new ItemStack[] { aStack });
         if (tFuel != null) {
             this.mCurrentRecipe = tFuel;
@@ -370,9 +370,9 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
     @Override
     public String[] getInfoData() {
         return new String[] { "RTG - Running at tier " + this.mTier, "Active: " + this.getBaseMetaTileEntity()
-            .isActive(), "Current Output: " + GT_Utility.formatNumbers(mVoltage) + " EU/t",
-            "Days of Fuel remaining: " + GT_Utility.formatNumbers(mTicksToBurnFor / 20 / 60 / 20),
-            "Hours of Fuel remaining: " + GT_Utility.formatNumbers(mTicksToBurnFor / 20 / 60 / 60),
+            .isActive(), "Current Output: " + GTUtility.formatNumbers(mVoltage) + " EU/t",
+            "Days of Fuel remaining: " + GTUtility.formatNumbers(mTicksToBurnFor / 20 / 60 / 20),
+            "Hours of Fuel remaining: " + GTUtility.formatNumbers(mTicksToBurnFor / 20 / 60 / 60),
             "Ticks of " + this.mVoltage + "v remaining: " + mTicksToBurnFor,
             this.mCurrentRecipe.mInputs[0].getDisplayName() + " x1" };
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERocketFuelGenerator.java
index 5b1a45e16f..48c3a63007 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERocketFuelGenerator.java
@@ -9,23 +9,22 @@ import gregtech.api.enums.Textures;
 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 gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTModHandler;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.MTERocketFuelGeneratorBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFuelGeneratorBase {
+public class MTERocketFuelGenerator extends MTERocketFuelGeneratorBase {
 
     public int mEfficiency;
 
-    public GregtechMetaTileEntityRocketFuelGenerator(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTERocketFuelGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(aID, aName, aNameRegional, aTier, "Requires GT++ Rocket Fuels", new ITexture[0]);
     }
 
-    public GregtechMetaTileEntityRocketFuelGenerator(final String aName, final int aTier, final String[] aDescription,
+    public MTERocketFuelGenerator(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         this.mEfficiency = getEfficiency();
@@ -39,11 +38,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntityRocketFuelGenerator(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTERocketFuelGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -63,22 +58,22 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
 
     @Override
     public int getFuelValue(final ItemStack aStack) {
-        int rValue = Math.max((GT_ModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack));
+        int rValue = Math.max((GTModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack));
         if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
             rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3);
         }
         return rValue;
     }
 
-    private GT_RenderedTexture getCasingTexture() {
+    private GTRenderedTexture getCasingTexture() {
         if (this.mTier <= 4) {
-            return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+            return new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
         } else if (this.mTier == 5) {
 
-            return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
+            return new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
         } else {
 
-            return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
+            return new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
         }
         // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
     }
@@ -92,25 +87,25 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
     @Override
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] { super.getBack(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent) };
     }
 
     @Override
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { super.getBottom(aColor)[0],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     @Override
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { super.getTop(aColor)[0],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off) };
     }
 
     @Override
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { super.getSides(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) };
     }
 
     @Override
@@ -122,24 +117,24 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
     @Override
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] { super.getBackActive(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast) };
     }
 
     @Override
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] { super.getBottomActive(aColor)[0],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     @Override
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] { super.getTopActive(aColor)[0],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On) };
     }
 
     @Override
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] { super.getSidesActive(aColor)[0], this.getCasingTexture(),
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java
index bbb5ae9da4..4c893eb92d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java
@@ -11,33 +11,32 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEBasicGenerator;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 
-public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_BasicGenerator {
+public class MTESemiFluidGenerator extends MTEBasicGenerator {
 
     public int mEfficiency;
 
-    public GT_MetaTileEntity_SemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTESemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "Requires semi-fluid Fuel", new ITexture[0]);
     }
 
-    public GT_MetaTileEntity_SemiFluidGenerator(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTESemiFluidGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public int getPollution() {
-        return (int) (CORE.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator
-            * CORE.ConfigSwitches.pollutionReleasedByTierSemiFluidGenerator[this.mTier]);
+        return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator
+            * GTPPCore.ConfigSwitches.pollutionReleasedByTierSemiFluidGenerator[this.mTier]);
     }
 
     @Override
@@ -47,7 +46,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_SemiFluidGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTESemiFluidGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -62,7 +61,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
             this.mDescriptionArray,
             "Produces " + (this.getPollution()) + " pollution/sec",
             "Fuel Efficiency: " + this.getEfficiency() + "%",
-            CORE.GT_Tooltip.get());
+            GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -76,7 +75,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCover) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCover) {
         if (side != this.getBaseMetaTileEntity()
             .getFrontFacing()) {
             return true;
@@ -86,11 +85,11 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
 
     @Override
     public int getFuelValue(ItemStack aStack) {
-        if ((GT_Utility.isStackInvalid(aStack)) || (getRecipeMap() == null)) {
+        if ((GTUtility.isStackInvalid(aStack)) || (getRecipeMap() == null)) {
             Logger.WARNING("Bad Fuel?");
             return 0;
         }
-        int rValue = Math.max(GT_ModHandler.getFuelValue(aStack) * 6 / 5, super.getFuelValue(aStack));
+        int rValue = Math.max(GTModHandler.getFuelValue(aStack) * 6 / 5, super.getFuelValue(aStack));
         if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
             rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3);
         }
@@ -101,62 +100,62 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
     @Override
     public ITexture[] getFront(byte aColor) {
         return new ITexture[] { super.getFront(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT),
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT),
             Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
     }
 
     @Override
     public ITexture[] getBack(byte aColor) {
         return new ITexture[] { super.getBack(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) };
     }
 
     @Override
     public ITexture[] getBottom(byte aColor) {
         return new ITexture[] { super.getBottom(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) };
     }
 
     @Override
     public ITexture[] getTop(byte aColor) {
         return new ITexture[] { super.getTop(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE) };
     }
 
     @Override
     public ITexture[] getSides(byte aColor) {
         return new ITexture[] { super.getSides(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) };
     }
 
     @Override
     public ITexture[] getFrontActive(byte aColor) {
         return new ITexture[] { super.getFrontActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE),
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE),
             Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
     }
 
     @Override
     public ITexture[] getBackActive(byte aColor) {
         return new ITexture[] { super.getBackActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) };
     }
 
     @Override
     public ITexture[] getBottomActive(byte aColor) {
         return new ITexture[] { super.getBottomActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) };
     }
 
     @Override
     public ITexture[] getTopActive(byte aColor) {
         return new ITexture[] { super.getTopActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE) };
     }
 
     @Override
     public ITexture[] getSidesActive(byte aColor) {
         return new ITexture[] { super.getSidesActive(aColor)[0],
-            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) };
+            new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java
index 4bc9004944..3a85e0aae3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import java.util.Collections;
 
@@ -22,18 +22,18 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
-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.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-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.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.ID_MetaTool_01;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.IDMetaTool01;
+import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.general.ItemAirFilter;
@@ -41,10 +41,10 @@ import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
 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 GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_BasicMachine {
+public class MTEAtmosphericReconditioner extends MTEBasicMachine {
 
     public int mPollutionReduction = 0;
     protected int mBaseEff = 2500;
@@ -56,7 +56,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 
     protected boolean mSaveRotor = false;
 
-    public GregtechMetaAtmosphericReconditioner(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEAtmosphericReconditioner(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -66,26 +66,25 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
             "Making sure you don't live in Gwalior - Uses 2A",
             3,
             0,
-            new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB),
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab),
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast),
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent),
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) });
+            new ITexture[] { new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
+                new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB),
+                new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
+                new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab),
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast),
+                new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent),
+                new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
+                new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) });
         mPollutionEnabled = PollutionUtils.isPollutionEnabled();
     }
 
-    public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 2, aDescription, aTextures, 2, 0);
         mPollutionEnabled = PollutionUtils.isPollutionEnabled();
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaAtmosphericReconditioner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEAtmosphericReconditioner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -264,7 +263,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 
                                     // Calculate The Voltage we are running
                                     long tVoltage = drainEU;
-                                    byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
+                                    byte tTier = (byte) Math.max(1, GTUtility.getTier(tVoltage));
 
                                     // Check Sides for Air,
                                     // More air means more pollution processing.
@@ -413,7 +412,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
             if (rotorStack.getItem() instanceof ItemBasicScrubberTurbine) {
                 // Logger.INFO("Found Basic Turbine Rotor.");
                 return true;
-            } else if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool && rotorStack.getItemDamage() >= 170
+            } else if (rotorStack.getItem() instanceof MetaGeneratedTool && rotorStack.getItemDamage() >= 170
                 && rotorStack.getItemDamage() <= 179) {
                     // Logger.INFO("Found Turbine Rotor.");
                     return true;
@@ -454,9 +453,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
                     Logger.INFO("Rotor Damage: " + currentUse);
                     return true;
                 }
-            } else if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool_01) {
-                Materials t1 = GT_MetaGenerated_Tool.getPrimaryMaterial(rotorStack);
-                Materials t2 = GT_MetaGenerated_Tool.getSecondaryMaterial(rotorStack);
+            } else if (rotorStack.getItem() instanceof MetaGeneratedTool01) {
+                Materials t1 = MetaGeneratedTool.getPrimaryMaterial(rotorStack);
+                Materials t2 = MetaGeneratedTool.getSecondaryMaterial(rotorStack);
                 if (t1 == Materials._NULL && t2 == Materials._NULL) {
                     Logger.INFO("Found creative rotor.");
                     creativeRotor = true;
@@ -466,10 +465,10 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
                 return false;
             }
 
-            if (mInventory[SLOT_ROTOR].getItem() instanceof GT_MetaGenerated_Tool_01
-                && ((GT_MetaGenerated_Tool) mInventory[SLOT_ROTOR].getItem()).getToolStats(mInventory[SLOT_ROTOR])
+            if (mInventory[SLOT_ROTOR].getItem() instanceof MetaGeneratedTool01
+                && ((MetaGeneratedTool) mInventory[SLOT_ROTOR].getItem()).getToolStats(mInventory[SLOT_ROTOR])
                     .getSpeedMultiplier() > 0
-                && GT_MetaGenerated_Tool.getPrimaryMaterial(mInventory[SLOT_ROTOR]).mToolSpeed > 0) {
+                && MetaGeneratedTool.getPrimaryMaterial(mInventory[SLOT_ROTOR]).mToolSpeed > 0) {
 
                 long damageValue = (long) Math
                     .floor(Math.abs(MathUtils.randFloat(1, 2) - MathUtils.randFloat(1, 3)) * (1 + 3 - 1) + 1);
@@ -487,9 +486,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
                 // Damage Rotor
                 // int rotorDurability = this.mInventory[this.SLOT_ROTOR].getItemDamage();
                 long rotorDamage = creativeRotor ? 0
-                    : GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
+                    : MetaGeneratedTool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
                 long rotorDurabilityMax = creativeRotor ? Integer.MAX_VALUE
-                    : GT_MetaGenerated_Tool.getToolMaxDamage(this.mInventory[this.SLOT_ROTOR]);
+                    : MetaGeneratedTool.getToolMaxDamage(this.mInventory[this.SLOT_ROTOR]);
                 long rotorDurability = (rotorDurabilityMax - rotorDamage);
                 Logger.INFO(
                     "Rotor Damage: " + rotorDamage
@@ -503,10 +502,10 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
                     if (!mSaveRotor) {
                         Logger.INFO("Damaging Rotor.");
 
-                        if (!creativeRotor) GT_ModHandler
+                        if (!creativeRotor) GTModHandler
                             .damageOrDechargeItem(this.mInventory[this.SLOT_ROTOR], (int) damageValue, 0, null);
 
-                        long tempDur = GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
+                        long tempDur = MetaGeneratedTool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
                         if (tempDur < rotorDurabilityMax) {
                             return true;
                         } else {
@@ -515,9 +514,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
                     } else {
                         Logger.INFO("Damaging Rotor.");
                         if (rotorDurability > 1000) {
-                            if (!creativeRotor) GT_ModHandler
+                            if (!creativeRotor) GTModHandler
                                 .damageOrDechargeItem(this.mInventory[this.SLOT_ROTOR], (int) damageValue / 2, 0, null);
-                            long tempDur = GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
+                            long tempDur = MetaGeneratedTool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
                             if (tempDur < rotorDurabilityMax) {
                                 return true;
                             } else {
@@ -691,9 +690,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
         boolean creativeRotor = false;
         ItemStack rotorStack = this.mInventory[SLOT_ROTOR];
         if (rotorStack != null) {
-            if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool_01) {
-                Materials t1 = GT_MetaGenerated_Tool.getPrimaryMaterial(rotorStack);
-                Materials t2 = GT_MetaGenerated_Tool.getSecondaryMaterial(rotorStack);
+            if (rotorStack.getItem() instanceof MetaGeneratedTool01) {
+                Materials t1 = MetaGeneratedTool.getPrimaryMaterial(rotorStack);
+                Materials t2 = MetaGeneratedTool.getSecondaryMaterial(rotorStack);
                 if (t1 == Materials._NULL && t2 == Materials._NULL) {
                     creativeRotor = true;
                 }
@@ -739,7 +738,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
                 if (aStack.getItem() instanceof ItemBasicScrubberTurbine) {
                     return true;
                 }
-                if (aStack.getItem() instanceof GT_MetaGenerated_Tool && aStack.getItemDamage() >= 170
+                if (aStack.getItem() instanceof MetaGeneratedTool && aStack.getItemDamage() >= 170
                     && aStack.getItemDamage() <= 179) {
                     return true;
                 }
@@ -756,8 +755,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
     @Override
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         if (aIndex == -120) {
-            GT_Utility
-                .doSoundAtClient(SoundResource.IC2_TOOLS_BATTERY_USE, MathUtils.randInt(5, 50), 0.05F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_TOOLS_BATTERY_USE, MathUtils.randInt(5, 50), 0.05F, aX, aY, aZ);
         } else {
             super.doSound((byte) 0, aX, aY, aZ);
         }
@@ -774,7 +772,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 
         try {
             long tVoltage = maxEUInput();
-            byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
+            byte tTier = (byte) Math.max(1, GTUtility.getTier(tVoltage));
             reduction += (((Math.max((tTier - 2), 1) * 2) * 50) * mAirSides);
             reduction = (MathUtils.safeInt((long) reduction * this.mBaseEff) / 100000) * mAirSides
                 * Math.max((tTier - 2), 1);
@@ -801,7 +799,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         if (side.offsetY != 0) {
             return false;
         }
@@ -825,12 +823,12 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
     public static ItemStack getTieredTurbine(int aTier) {
         if (sGregTurbines == null) {
             sGregTurbines = new ItemStack[3];
-            sGregTurbines[0] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01")
-                .getToolWithStats(ID_MetaTool_01.TURBINE_SMALL.ID, 1, Materials.Iron, Materials.Iron, null);
-            sGregTurbines[1] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01")
-                .getToolWithStats(ID_MetaTool_01.TURBINE_SMALL.ID, 1, Materials.Bronze, Materials.Bronze, null);
-            sGregTurbines[2] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01")
-                .getToolWithStats(ID_MetaTool_01.TURBINE_SMALL.ID, 1, Materials.Steel, Materials.Steel, null);
+            sGregTurbines[0] = MetaGeneratedTool.sInstances.get("gt.metatool.01")
+                .getToolWithStats(IDMetaTool01.TURBINE_SMALL.ID, 1, Materials.Iron, Materials.Iron, null);
+            sGregTurbines[1] = MetaGeneratedTool.sInstances.get("gt.metatool.01")
+                .getToolWithStats(IDMetaTool01.TURBINE_SMALL.ID, 1, Materials.Bronze, Materials.Bronze, null);
+            sGregTurbines[2] = MetaGeneratedTool.sInstances.get("gt.metatool.01")
+                .getToolWithStats(IDMetaTool01.TURBINE_SMALL.ID, 1, Materials.Steel, Materials.Steel, null);
         } else {
             return sGregTurbines[aTier];
         }
@@ -842,8 +840,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
         if (aStackRotor.getItem() instanceof ItemBasicScrubberTurbine) {
             return getBaseEfficiency(getTieredTurbine(aStackRotor.getItemDamage()));
         }
-        return (int) ((50.0F
-            + (10.0F * ((GT_MetaGenerated_Tool) aStackRotor.getItem()).getToolCombatDamage(aStackRotor))) * 100);
+        return (int) ((50.0F + (10.0F * ((MetaGeneratedTool) aStackRotor.getItem()).getToolCombatDamage(aStackRotor)))
+            * 100);
     }
 
     public int getOptimalAirFlow(ItemStack aStackRotor) {
@@ -852,8 +850,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
         }
         return (int) Math.max(
             Float.MIN_NORMAL,
-            ((GT_MetaGenerated_Tool) aStackRotor.getItem()).getToolStats(aStackRotor)
-                .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(aStackRotor).mToolSpeed * 50);
+            ((MetaGeneratedTool) aStackRotor.getItem()).getToolStats(aStackRotor)
+                .getSpeedMultiplier() * MetaGeneratedTool.getPrimaryMaterial(aStackRotor).mToolSpeed * 50);
     }
 
     @Override
@@ -862,22 +860,22 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
             if (stack.getItem() instanceof ItemBasicScrubberTurbine) {
                 return true;
             }
-            return stack.getItem() instanceof GT_MetaGenerated_Tool && stack.getItemDamage() >= 170
+            return stack.getItem() instanceof MetaGeneratedTool && stack.getItemDamage() >= 170
                 && stack.getItemDamage() <= 179;
         })
-            .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_TURBINE)
+            .setBackground(getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_TURBINE)
             .setPos(52, 24))
             .widget(
                 new SlotWidget(inventoryHandler, SLOT_FILTER)
                     .setFilter(stack -> stack.getItem() instanceof ItemAirFilter)
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_RECYCLE)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_RECYCLE)
                     .setPos(106, 24))
             .widget(
                 new SlotWidget(inventoryHandler, 7)
-                    .setFilter(stack -> GT_Utility.areStacksEqual(stack, CI.getConveyor(mTier, 1), true))
+                    .setFilter(stack -> GTUtility.areStacksEqual(stack, CI.getConveyor(mTier, 1), true))
                     .setPos(124, 62));
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_INFORMATION)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_INFORMATION)
                 .dynamicTooltip(() -> Collections.singletonList("Reduction: " + mPollutionReduction + "/s"))
                 .attachSyncer(
                     new FakeSyncWidget.IntegerSyncer(() -> mPollutionReduction, val -> mPollutionReduction = val),
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java
index a845982e8b..6cdc97130b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java
@@ -13,24 +13,24 @@ import com.gtnewhorizons.modularui.api.math.Pos2d;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
 import gregtech.api.enums.Textures.BlockIcons;
-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_BasicMachine;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.BasicUIProperties;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import team.chisel.carving.Carving;
 
-public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMachine {
+public class MTEAutoChisel extends MTEBasicMachine {
 
     private ItemStack mInputCache;
     private ItemStack mOutputCache;
 
-    public GregtechMetaTileEntity_AutoChisel(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEAutoChisel(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -40,23 +40,23 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
             "Chisels things, Gregtech style",
             1,
             1,
-            new ITexture[] { new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
-                new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB),
-                new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE),
-                new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER),
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
-                new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab),
-                new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
-                new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB) });
+            new ITexture[] { new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
+                new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB),
+                new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE),
+                new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER),
+                new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
+                new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab),
+                new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
+                new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB) });
     }
 
-    public GregtechMetaTileEntity_AutoChisel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEAutoChisel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, 1, 1);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_AutoChisel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEAutoChisel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -70,8 +70,7 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
 
     private boolean hasValidCache(ItemStack aStack, ItemStack aSpecialSlot, boolean aClearOnFailure) {
         if (mInputCache != null && mOutputCache != null) {
-            if (GT_Utility.areStacksEqual(aStack, mInputCache)
-                && GT_Utility.areStacksEqual(aSpecialSlot, mOutputCache)) {
+            if (GTUtility.areStacksEqual(aStack, mInputCache) && GTUtility.areStacksEqual(aSpecialSlot, mOutputCache)) {
                 return true;
             }
         }
@@ -161,8 +160,8 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
         return DID_NOT_FIND_RECIPE;
     }
 
-    private static final FallbackableUITexture progressBarTexture = GT_UITextures
-        .fallbackableProgressbar("auto_chisel", GT_UITextures.PROGRESSBAR_COMPRESS);
+    private static final FallbackableUITexture progressBarTexture = GTUITextures
+        .fallbackableProgressbar("auto_chisel", GTUITextures.PROGRESSBAR_COMPRESS);
 
     @Override
     protected BasicUIProperties getUIProperties() {
@@ -174,7 +173,7 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
     @Override
     protected SlotWidget createItemInputSlot(int index, IDrawable[] backgrounds, Pos2d pos) {
         return (SlotWidget) super.createItemInputSlot(index, backgrounds, pos)
-            .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_COMPRESSOR);
+            .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_COMPRESSOR);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java
index b93a3cbfd0..07884ed745 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java
@@ -21,28 +21,28 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
+import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import ic2.api.crops.CropCard;
 import ic2.api.crops.ICropTile;
 import ic2.core.item.DamageHandler;
 
-public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank {
+public class MTECropHarvestor extends MTEBasicTank {
 
     private static final int SLOT_WEEDEX_1 = 1;
     private static final int SLOT_WEEDEX_2 = 2;
@@ -53,17 +53,17 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
     public boolean mModeAlternative = false;
     public boolean mHarvestEnabled = true;
 
-    public GT_MetaTileEntity_CropHarvestor(final int aID, final int aTier, final String aDescription) {
+    public MTECropHarvestor(final int aID, final int aTier, final String aDescription) {
         super(
             aID,
             "basicmachine.cropharvester.0" + aTier,
-            "Crop Manager (" + GT_Values.VN[aTier] + ")",
+            "Crop Manager (" + GTValues.VN[aTier] + ")",
             aTier,
             21,
             aDescription);
     }
 
-    public GT_MetaTileEntity_CropHarvestor(final String aName, final int aTier, final String[] aDescription,
+    public MTECropHarvestor(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 21, aDescription, aTextures);
     }
@@ -110,17 +110,17 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
 
     @Override
     public long getMinimumStoredEU() {
-        return GT_Values.V[this.mTier];
+        return GTValues.V[this.mTier];
     }
 
     @Override
     public long maxEUStore() {
-        return GT_Values.V[this.mTier] * (this.mTier * GT_Values.V[this.mTier]);
+        return GTValues.V[this.mTier] * (this.mTier * GTValues.V[this.mTier]);
     }
 
     @Override
     public long maxEUInput() {
-        return GT_Values.V[this.mTier];
+        return GTValues.V[this.mTier];
     }
 
     @Override
@@ -135,13 +135,13 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
 
     @Override
     public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_CropHarvestor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTECropHarvestor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -268,11 +268,11 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
 
                 // If the slot is empty, create a new stack for the drop item, else check if it is the same as the drop
                 // and merge if possible
-                if (invStack == null || GT_Utility.isStackInvalid(invStack) || invStack.stackSize == 0) {
+                if (invStack == null || GTUtility.isStackInvalid(invStack) || invStack.stackSize == 0) {
                     int stackSize = Math.min(dropAmount, dropItem.getMaxStackSize());
-                    getBaseMetaTileEntity().setInventorySlotContents(i, GT_Utility.copyAmount(stackSize, dropItem));
+                    getBaseMetaTileEntity().setInventorySlotContents(i, GTUtility.copyAmount(stackSize, dropItem));
                     dropAmount -= stackSize;
-                } else if (GT_Utility.areStacksEqual(invStack, dropItem)) {
+                } else if (GTUtility.areStacksEqual(invStack, dropItem)) {
                     int space = Math.min(invStack.getMaxStackSize(), getInventoryStackLimit()) - invStack.stackSize;
                     if (dropAmount <= space) {
                         // if the drop amount fits
@@ -518,11 +518,11 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
             "Radius: " + aSide + " blocks each side (" + aRadius + "x3x" + aRadius + ")",
             "Has " + (this.mTier * 5) + "% chance for extra drops",
             "Holds " + this.getCapacity() + "L of Water",
-            CORE.GT_Tooltip.get());
+            GTPPCore.GT_Tooltip.get());
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return true;
     }
 
@@ -572,27 +572,27 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
 
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) };
     }
 
     @Override
@@ -645,18 +645,18 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
             new CycleButtonWidget().setToggle(() -> mModeAlternative, val -> mModeAlternative = val)
-                .setTexture(GTPP_UITextures.OVERLAY_BUTTON_HARVESTER_MODE)
+                .setTexture(GTPPUITextures.OVERLAY_BUTTON_HARVESTER_MODE)
                 .addTooltip(0, "Enable Hydration/Fertilizing/Weed-EX")
                 .addTooltip(1, "Disable Hydration/Fertilizing/Weed-EX")
-                .setBackground(GT_UITextures.BUTTON_STANDARD)
+                .setBackground(GTUITextures.BUTTON_STANDARD)
                 .setPos(47, 63)
                 .setSize(18, 18));
         builder.widget(
             new CycleButtonWidget().setToggle(() -> mHarvestEnabled, val -> mHarvestEnabled = val)
-                .setTexture(GTPP_UITextures.OVERLAY_BUTTON_HARVESTER_TOGGLE)
+                .setTexture(GTPPUITextures.OVERLAY_BUTTON_HARVESTER_TOGGLE)
                 .addTooltip(0, "Enable Harvest")
                 .addTooltip(1, "Disable Harvest")
-                .setBackground(GT_UITextures.BUTTON_STANDARD)
+                .setBackground(GTUITextures.BUTTON_STANDARD)
                 .setPos(67, 63)
                 .setSize(18, 18));
         builder.widget(
@@ -668,7 +668,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
                         stack -> stack != null && stack.getItem()
                             .getUnlocalizedName()
                             .equals("ic2.itemWeedEx"))
-                        .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_WEED_EX))
+                        .setBackground(getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_WEED_EX))
                 .build()
                 .setPos(7, 13))
             .widget(
@@ -680,7 +680,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
                             stack -> stack != null && stack.getItem()
                                 .getUnlocalizedName()
                                 .equals("ic2.itemFertilizer"))
-                            .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_FERTILIZER))
+                            .setBackground(getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_FERTILIZER))
                     .build()
                     .setPos(7, 31))
             .widget(
@@ -693,7 +693,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
         builder
             .widget(
                 new ProgressBar()
-                    .setTexture(GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, GT_UITextures.PROGRESSBAR_BOILER_WATER, 54)
+                    .setTexture(GTPPUITextures.PROGRESSBAR_BOILER_EMPTY, GTUITextures.PROGRESSBAR_BOILER_WATER, 54)
                     .setDirection(ProgressBar.Direction.UP)
                     .setProgress(() -> (float) getFluidAmount() / getCapacity())
                     .setSynced(false, false)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java
index d7b6b8fffd..b87403d17e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java
@@ -10,14 +10,14 @@ 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.core.lib.CORE;
+import gregtech.api.objects.GTRenderedTexture;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMetaTileEntity;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
+public class MTEPollutionCreator extends GTPPMetaTileEntity {
 
     int mCurrentPollution;
     int mAveragePollution;
@@ -26,19 +26,20 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
     private int mTickTimer = 0;
     private int mSecondTimer = 0;
 
-    public GregtechMetaPollutionCreator(final int aID, final String aName, final String aNameRegional, final int aTier,
+    public MTEPollutionCreator(final int aID, final String aName, final String aNameRegional, final int aTier,
         final String aDescription, final int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
     }
 
-    public GregtechMetaPollutionCreator(final String aName, final int aTier, final String aDescription,
+    public MTEPollutionCreator(final String aName, final int aTier, final String aDescription,
         final ITexture[][][] aTextures, final int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription, "A useful debug machine to create pollution.", CORE.GT_Tooltip.get() };
+        return new String[] { this.mDescription, "A useful debug machine to create pollution.",
+            GTPPCore.GT_Tooltip.get() };
     }
 
     @Override
@@ -69,52 +70,52 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
 
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     @Override
@@ -130,7 +131,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaPollutionCreator(
+        return new MTEPollutionCreator(
             this.mName,
             this.mTier,
             this.mDescription,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java
index 92443d2658..6d599b60b9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java
@@ -10,16 +10,16 @@ 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 gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMetaTileEntity;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
+public class MTEPollutionDetector extends GTPPMetaTileEntity {
 
     int mCurrentPollution;
     int mAveragePollution;
@@ -29,12 +29,12 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
     private int mSecondTimer = 0;
     private long mRedstoneLevel = 0;
 
-    public GregtechMetaPollutionDetector(final int aID, final String aName, final String aNameRegional, final int aTier,
+    public MTEPollutionDetector(final int aID, final String aName, final String aNameRegional, final int aTier,
         final String aDescription, final int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
     }
 
-    public GregtechMetaPollutionDetector(final String aName, final int aTier, final String aDescription,
+    public MTEPollutionDetector(final String aName, final int aTier, final String aDescription,
         final ITexture[][][] aTextures, final int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
@@ -42,17 +42,18 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
     @Override
     public String[] getDescription() {
         return new String[] { this.mDescription, "Right click to check pollution levels.",
-            "Configure with screwdriver to set redstone output amount.", "Does not use power.", CORE.GT_Tooltip.get() };
+            "Configure with screwdriver to set redstone output amount.", "Does not use power.",
+            GTPPCore.GT_Tooltip.get() };
     }
 
     @Override
     public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side,
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         return side == facing
-            ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
-                new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) }
-            : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
-                new GT_RenderedTexture(Textures.BlockIcons.VOID) };
+            ? new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) }
+            : new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                new GTRenderedTexture(Textures.BlockIcons.VOID) };
     }
 
     @Override
@@ -82,57 +83,57 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
 
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaPollutionDetector(
+        return new MTEPollutionDetector(
             this.mName,
             this.mTier,
             this.mDescription,
@@ -457,7 +458,7 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
 
         if (side == this.getBaseMetaTileEntity()
             .getFrontFacing()) {
-            final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ);
+            final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ);
             switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) {
                 case 0 -> this.mRedstoneLevel -= 5000;
                 case 1 -> this.mRedstoneLevel += 5000;
@@ -465,7 +466,7 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
                 case 3 -> this.mRedstoneLevel += 50000;
             }
             this.markDirty();
-            GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone at Pollution Level: " + this.mRedstoneLevel);
+            GTUtility.sendChatToPlayer(aPlayer, "Emit Redstone at Pollution Level: " + this.mRedstoneLevel);
         }
 
         super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java
index b1289958a9..1535140115 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java
@@ -11,33 +11,33 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMetaTileEntity;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 
-public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
+public class MTEWirelessCharger extends GTPPMetaTileEntity {
 
     private int mCurrentDimension = 0;
     public int mMode = 0;
     public boolean mLocked = true;
 
-    public GregtechMetaWirelessCharger(final int aID, final String aName, final String aNameRegional, final int aTier,
+    public MTEWirelessCharger(final int aID, final String aName, final String aNameRegional, final int aTier,
         final String aDescription, final int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
     }
 
-    public GregtechMetaWirelessCharger(final String aName, final int aTier, final String aDescription,
+    public MTEWirelessCharger(final String aName, final int aTier, final String aDescription,
         final ITexture[][][] aTextures, final int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
@@ -46,11 +46,11 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
     public String[] getDescription() {
         return new String[] { this.mDescription, "Can be locked to the owner by sneaking with a screwdriver",
             "Can also be locked with a lock upgrade", "", "3 Modes, Long-Range, Local and Mixed.",
-            "Long-Range: Can supply 2A of power to a single player up to " + (GT_Values.V[this.mTier] * 4) + "m away.",
+            "Long-Range: Can supply 2A of power to a single player up to " + (GTValues.V[this.mTier] * 4) + "m away.",
             "Local: Can supply several Amps to each player within " + this.mTier * 20 + "m.",
             "Mixed: Provides both 2A of long range and 1A per player locally.",
             "Mixed mode is more conservative of power and as a result only",
-            "Gets half the distances each singular mode gets.", CORE.GT_Tooltip.get() };
+            "Gets half the distances each singular mode gets.", GTPPCore.GT_Tooltip.get() };
     }
 
     public int getTier() {
@@ -101,52 +101,52 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     @Override
@@ -188,7 +188,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaWirelessCharger(
+        return new MTEWirelessCharger(
             this.mName,
             this.mTier,
             this.mDescription,
@@ -250,17 +250,17 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
 
     @Override
     public long maxEUStore() {
-        return GT_Values.V[this.mTier] * 128;
+        return GTValues.V[this.mTier] * 128;
     }
 
     @Override
     public int getCapacity() {
-        return (int) (GT_Values.V[this.mTier] * 32);
+        return (int) (GTValues.V[this.mTier] * 32);
     }
 
     @Override
     public long maxEUInput() {
-        return GT_Values.V[this.mTier];
+        return GTValues.V[this.mTier];
     }
 
     @Override
@@ -508,8 +508,8 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
                                 }
                             }
                             if (this.mMode == 0 || this.mMode == 2) {
-                                int tempRange = (int) (this.mMode == 0 ? 4 * GT_Values.V[this.mTier]
-                                    : 2 * GT_Values.V[this.mTier]);
+                                int tempRange = (int) (this.mMode == 0 ? 4 * GTValues.V[this.mTier]
+                                    : 2 * GTValues.V[this.mTier]);
                                 if (getDistanceBetweenTwoPositions(getTileEntityPosition(), getPositionOfEntity(mTemp))
                                     <= tempRange) {
                                     if (!mWirelessChargingMap.containsKey(mTemp.getDisplayName())) {
@@ -614,7 +614,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
         int tempRange;
 
         if (this.mMode == 0 || this.mMode == 2) {
-            tempRange = (int) (this.mMode == 0 ? 4 * GT_Values.V[this.mTier] : 2 * GT_Values.V[this.mTier]);
+            tempRange = (int) (this.mMode == 0 ? 4 * GTValues.V[this.mTier] : 2 * GTValues.V[this.mTier]);
         } else {
             tempRange = this.mMode == 1 ? this.mTier * 20 : this.mTier * 10;
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java
index 52804f9ad2..9f0b6d6be9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java
@@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.misc;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -32,43 +32,42 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.enums.TAE;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_AmazonPackager>
-    implements ISurvivalConstructable {
+public class MTEAmazonPackager extends GTPPMultiBlockBase<MTEAmazonPackager> implements ISurvivalConstructable {
 
     private int mCasing;
 
     private static final int MACHINEMODE_PACKAGER = 0;
     private static final int MACHINEMODE_UNPACKAGER = 1;
 
-    private static IStructureDefinition<GMTE_AmazonPackager> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEAmazonPackager> STRUCTURE_DEFINITION = null;
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GMTE_AmazonPackager(mName);
+        return new MTEAmazonPackager(mName);
     }
 
-    public GMTE_AmazonPackager(int aID, String aName, String aNameRegional) {
+    public MTEAmazonPackager(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GMTE_AmazonPackager(String aName) {
+    public MTEAmazonPackager(String aName) {
         super(aName);
     }
 
@@ -78,17 +77,16 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
     }
 
     @Override
-    public IStructureDefinition<GMTE_AmazonPackager> getStructureDefinition() {
+    public IStructureDefinition<MTEAmazonPackager> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GMTE_AmazonPackager>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEAmazonPackager>builder()
                 .addShape(
                     mName,
                     transpose(
                         new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GMTE_AmazonPackager.class)
-                        .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
+                    buildHatchAdder(MTEAmazonPackager.class).atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
                         .casingIndex(TAE.getIndexFromPage(2, 9))
                         .dot(1)
                         .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 9))))
@@ -98,8 +96,8 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Amazon Warehouse")
             .addInfo("This Multiblock is used for EXTREME packaging requirements")
@@ -170,12 +168,12 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
 
     @Override
     public int getPollutionPerSecond(ItemStack arg0) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiPackager;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiPackager;
     }
 
     @Override
     public int getMaxParallelRecipes() {
-        return (16 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (16 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -242,7 +240,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
     @Override
     public void setMachineModeIcons() {
         machineModeIcons.clear();
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_PACKAGER);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_UNPACKAGER);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_PACKAGER);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_UNPACKAGER);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java
index e5d138dfda..ed14343fa3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java
@@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofCoil;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
 
 import net.minecraft.item.ItemStack;
 
@@ -29,36 +29,36 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 
-public class GregtechMetaTileEntity_IndustrialAlloySmelter extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialAlloySmelter> implements ISurvivalConstructable {
+public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase<MTEIndustrialAlloySmelter>
+    implements ISurvivalConstructable {
 
     public static int CASING_TEXTURE_ID;
     private HeatingCoilLevel mHeatingCapacity;
     private int mLevel = 0;
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialAlloySmelter> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialAlloySmelter> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialAlloySmelter(int aID, String aName, String aNameRegional) {
+    public MTEIndustrialAlloySmelter(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 1);
     }
 
-    public GregtechMetaTileEntity_IndustrialAlloySmelter(String aName) {
+    public MTEIndustrialAlloySmelter(String aName) {
         super(aName);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 1);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialAlloySmelter(this.mName);
+        return new MTEIndustrialAlloySmelter(this.mName);
     }
 
     @Override
@@ -93,7 +93,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialAlloySmelter;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialAlloySmelter;
     }
 
     @Override
@@ -112,8 +112,8 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Alloy Smelter")
             .addInfo("Gains one parallel per voltage tier")
@@ -132,14 +132,14 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends
             .addEnergyHatch("Any Inconel Reinforced Casing", 1)
             .addMaintenanceHatch("Any Inconel Reinforced Casing", 1)
             .addMufflerHatch("Any Inconel Reinforced Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialAlloySmelter> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialAlloySmelter> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialAlloySmelter>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialAlloySmelter>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -147,16 +147,14 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends
                             { "HHH", "H-H", "HHH" }, { "C~C", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialAlloySmelter.class)
+                    buildHatchAdder(MTEIndustrialAlloySmelter.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
                         .casingIndex(CASING_TEXTURE_ID)
                         .dot(1)
                         .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 1))))
                 .addElement(
                     'H',
-                    ofCoil(
-                        GregtechMetaTileEntity_IndustrialAlloySmelter::setCoilLevel,
-                        GregtechMetaTileEntity_IndustrialAlloySmelter::getCoilLevel))
+                    ofCoil(MTEIndustrialAlloySmelter::setCoilLevel, MTEIndustrialAlloySmelter::getCoilLevel))
                 .addElement('V', ofBlock(ModBlocks.blockCasingsTieredGTPP, 4))
                 .build();
         }
@@ -187,7 +185,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends
 
     @Override
     public int getMaxParallelRecipes() {
-        return (this.mLevel * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (this.mLevel * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -196,7 +194,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends
 
             @NotNull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
                 return super.createOverclockCalculator(recipe).setSpeedBoost(100F / (100F + 5F * mLevel))
                     .setHeatOC(true)
                     .setRecipeHeat(0)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java
index cc182cf6d2..256e1219aa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java
@@ -2,14 +2,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -41,18 +41,18 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_IndustrialArcFurnace
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialArcFurnace> implements ISurvivalConstructable {
+public class MTEIndustrialArcFurnace extends GTPPMultiBlockBase<MTEIndustrialArcFurnace>
+    implements ISurvivalConstructable {
 
     // 862
     private static final int mCasingTextureID = TAE.getIndexFromPage(3, 3);
@@ -61,19 +61,19 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
 
     private int mSize = 0;
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialArcFurnace> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialArcFurnace> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialArcFurnace(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialArcFurnace(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialArcFurnace(final String aName) {
+    public MTEIndustrialArcFurnace(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialArcFurnace(this.mName);
+        return new MTEIndustrialArcFurnace(this.mName);
     }
 
     @Override
@@ -82,8 +82,8 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for Industrial Arc Furnace")
             .addInfo("250% faster than using single block machines of the same voltage")
@@ -103,7 +103,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -118,9 +118,9 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
     private static final int MAX_TIER = 3;
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialArcFurnace> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialArcFurnace> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialArcFurnace>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialArcFurnace>builder()
                 .addShape(STRUCTURE_PIECE_FRONT + 1, new String[][] { { "CCC", "C~C", "CCC" } })
                 .addShape(STRUCTURE_PIECE_FRONT + 2, new String[][] { { "CCCCC", "C   C", "C   C", "C   C", "CCCCC" } })
                 .addShape(
@@ -137,7 +137,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
                         { "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC" }, })
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialArcFurnace.class)
+                    buildHatchAdder(MTEIndustrialArcFurnace.class)
                         .atLeast(InputBus, InputHatch, OutputBus, OutputHatch, Maintenance, Energy, Muffler)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -255,7 +255,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
 
     @Override
     public int getMaxParallelRecipes() {
-        return (this.mSize * 8 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (this.mSize * 8 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -265,7 +265,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialArcFurnace;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialArcFurnace;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java
index c04620d4b4..86a971cb5c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java
@@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
@@ -29,39 +29,39 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
-public class GregtechMetaTileEntity_IndustrialCentrifuge
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCentrifuge> implements ISurvivalConstructable {
+public class MTEIndustrialCentrifuge extends GTPPMultiBlockBase<MTEIndustrialCentrifuge>
+    implements ISurvivalConstructable {
 
     private boolean mIsAnimated;
     private static final CustomIcon frontFaceActive = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5");
     private static final CustomIcon frontFace = new CustomIcon("iconsets/LARGECENTRIFUGE5");
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialCentrifuge> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialCentrifuge> STRUCTURE_DEFINITION = null;
     // public static double recipesComplete = 0;
 
-    public GregtechMetaTileEntity_IndustrialCentrifuge(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialCentrifuge(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
         mIsAnimated = true;
     }
 
-    public GregtechMetaTileEntity_IndustrialCentrifuge(final String aName) {
+    public MTEIndustrialCentrifuge(final String aName) {
         super(aName);
         mIsAnimated = true;
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialCentrifuge(this.mName);
+        return new MTEIndustrialCentrifuge(this.mName);
     }
 
     @Override
@@ -70,8 +70,8 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Centrifuge")
             .addInfo("125% faster than using single block machines of the same voltage")
@@ -90,21 +90,21 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialCentrifuge> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialCentrifuge> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCentrifuge>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialCentrifuge>builder()
                 .addShape(
                     mName,
                     transpose(
                         new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialCentrifuge.class)
+                    buildHatchAdder(MTEIndustrialCentrifuge.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -164,7 +164,7 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge
 
     @Override
     public int getMaxParallelRecipes() {
-        return (6 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (6 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     public Block getCasingBlock() {
@@ -186,7 +186,7 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCentrifuge;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCentrifuge;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java
index 82d18a9347..1dc694e584 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java
@@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.List;
 import java.util.stream.Stream;
@@ -31,42 +31,41 @@ import gregtech.api.interfaces.IIconContainer;
 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_InputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_StreamUtil;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTStreamUtil;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ChiselBus;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchChiselBus;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import team.chisel.carving.Carving;
 
-public class GregtechMetaTileEntity_IndustrialChisel
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialChisel> implements ISurvivalConstructable {
+public class MTEIndustrialChisel extends GTPPMultiBlockBase<MTEIndustrialChisel> implements ISurvivalConstructable {
 
     private int mCasing;
 
     private ItemStack target;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialChisel> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialChisel> STRUCTURE_DEFINITION = null;
     private ItemStack mInputCache;
     private ItemStack mOutputCache;
-    private GT_Recipe mCachedRecipe;
+    private GTRecipe mCachedRecipe;
 
-    public GregtechMetaTileEntity_IndustrialChisel(int aID, String aName, String aNameRegional) {
+    public MTEIndustrialChisel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialChisel(String aName) {
+    public MTEIndustrialChisel(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialChisel(this.mName);
+        return new MTEIndustrialChisel(this.mName);
     }
 
     @Override
@@ -75,8 +74,8 @@ public class GregtechMetaTileEntity_IndustrialChisel
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Factory Grade Auto Chisel")
             .addInfo("Target block goes in Controller slot for common Input Buses")
@@ -93,14 +92,14 @@ public class GregtechMetaTileEntity_IndustrialChisel
             .addEnergyHatch("Any casing", 1)
             .addMaintenanceHatch("Any casing", 1)
             .addMufflerHatch("Any casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialChisel> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialChisel> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialChisel>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialChisel>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -113,7 +112,7 @@ public class GregtechMetaTileEntity_IndustrialChisel
                                     // spotless:on
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialChisel.class)
+                    buildHatchAdder(MTEIndustrialChisel.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
                         .casingIndex(90)
                         .dot(1)
@@ -162,8 +161,7 @@ public class GregtechMetaTileEntity_IndustrialChisel
 
     private boolean hasValidCache(ItemStack aStack, ItemStack aSpecialSlot, boolean aClearOnFailure) {
         if (mInputCache != null && mOutputCache != null && mCachedRecipe != null) {
-            if (GT_Utility.areStacksEqual(aStack, mInputCache)
-                && GT_Utility.areStacksEqual(aSpecialSlot, mOutputCache)) {
+            if (GTUtility.areStacksEqual(aStack, mInputCache) && GTUtility.areStacksEqual(aSpecialSlot, mOutputCache)) {
                 return true;
             }
         }
@@ -176,7 +174,7 @@ public class GregtechMetaTileEntity_IndustrialChisel
         return false;
     }
 
-    private void cacheItem(ItemStack aInputItem, ItemStack aOutputItem, GT_Recipe aRecipe) {
+    private void cacheItem(ItemStack aInputItem, ItemStack aOutputItem, GTRecipe aRecipe) {
         mInputCache = aInputItem.copy();
         mOutputCache = aOutputItem.copy();
         mCachedRecipe = aRecipe;
@@ -215,17 +213,17 @@ public class GregtechMetaTileEntity_IndustrialChisel
         return tOutput;
     }
 
-    private GT_Recipe generateChiselRecipe(ItemStack aInput) {
+    private GTRecipe generateChiselRecipe(ItemStack aInput) {
         boolean tIsCached = hasValidCache(aInput, this.target, true);
         if (tIsCached || aInput != null && hasChiselResults(aInput)) {
             ItemStack tOutput = tIsCached ? mOutputCache.copy() : getChiselOutput(aInput, this.target);
             if (tOutput != null) {
-                if (mCachedRecipe != null && GT_Utility.areStacksEqual(aInput, mInputCache)
-                    && GT_Utility.areStacksEqual(tOutput, mOutputCache)) {
+                if (mCachedRecipe != null && GTUtility.areStacksEqual(aInput, mInputCache)
+                    && GTUtility.areStacksEqual(tOutput, mOutputCache)) {
                     return mCachedRecipe;
                 }
                 // We can chisel this
-                GT_Recipe aRecipe = new GT_Recipe(
+                GTRecipe aRecipe = new GTRecipe(
                     false,
                     new ItemStack[] { ItemUtils.getSimpleStack(aInput, 1) },
                     new ItemStack[] { ItemUtils.getSimpleStack(tOutput, 1) },
@@ -245,16 +243,16 @@ public class GregtechMetaTileEntity_IndustrialChisel
         return null;
     }
 
-    private GT_Recipe getRecipe() {
-        for (GT_MetaTileEntity_Hatch_InputBus bus : this.mInputBusses) {
-            if (bus instanceof GT_MetaTileEntity_ChiselBus) { // Chisel buses
+    private GTRecipe getRecipe() {
+        for (MTEHatchInputBus bus : this.mInputBusses) {
+            if (bus instanceof MTEHatchChiselBus) { // Chisel buses
                 if (bus.mInventory[bus.getSizeInventory() - 1] == null) continue;
                 this.target = bus.mInventory[bus.getSizeInventory() - 1];
 
                 for (int i = bus.getSizeInventory() - 2; i >= 0; i--) {
                     ItemStack itemsInSlot = bus.mInventory[i];
                     if (itemsInSlot != null) {
-                        GT_Recipe tRecipe = generateChiselRecipe(itemsInSlot);
+                        GTRecipe tRecipe = generateChiselRecipe(itemsInSlot);
                         if (tRecipe != null) {
                             return tRecipe;
                         }
@@ -265,7 +263,7 @@ public class GregtechMetaTileEntity_IndustrialChisel
                 for (int i = bus.getSizeInventory() - 1; i >= 0; i--) {
                     ItemStack itemsInSlot = bus.mInventory[i];
                     if (itemsInSlot != null) {
-                        GT_Recipe tRecipe = generateChiselRecipe(itemsInSlot);
+                        GTRecipe tRecipe = generateChiselRecipe(itemsInSlot);
                         if (tRecipe != null) {
                             return tRecipe;
                         }
@@ -283,8 +281,8 @@ public class GregtechMetaTileEntity_IndustrialChisel
 
             @Nonnull
             @Override
-            protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
-                return GT_StreamUtil.ofNullable(getRecipe());
+            protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
+                return GTStreamUtil.ofNullable(getRecipe());
             }
         }.setSpeedBonus(1F / 3F)
             .setEuModifier(0.75F)
@@ -298,7 +296,7 @@ public class GregtechMetaTileEntity_IndustrialChisel
 
     @Override
     public int getMaxParallelRecipes() {
-        return (16 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (16 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     private static ResourceLocation sChiselSound = null;
@@ -313,9 +311,9 @@ public class GregtechMetaTileEntity_IndustrialChisel
     @Override
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         switch (aIndex) {
-            case PROCESS_START_SOUND_INDEX -> GT_Utility
+            case PROCESS_START_SOUND_INDEX -> GTUtility
                 .doSoundAtClient(getChiselSound(), getTimeBetweenProcessSounds(), 1.0F, 1.0F, aX, aY, aZ);
-            case INTERRUPT_SOUND_INDEX -> GT_Utility
+            case INTERRUPT_SOUND_INDEX -> GTUtility
                 .doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ);
         }
     }
@@ -327,7 +325,7 @@ public class GregtechMetaTileEntity_IndustrialChisel
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialChisel;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialChisel;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java
index a20b879fb8..552f90d855 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java
@@ -4,14 +4,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.item.ItemStack;
 
@@ -27,34 +27,33 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialCokeOven
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCokeOven> implements ISurvivalConstructable {
+public class MTEIndustrialCokeOven extends GTPPMultiBlockBase<MTEIndustrialCokeOven> implements ISurvivalConstructable {
 
     private int mLevel = 0;
     private int mCasing;
     private int mCasing1;
     private int mCasing2;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialCokeOven> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialCokeOven> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialCokeOven(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialCokeOven(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialCokeOven(final String aName) {
+    public MTEIndustrialCokeOven(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialCokeOven(this.mName);
+        return new MTEIndustrialCokeOven(this.mName);
     }
 
     @Override
@@ -63,8 +62,8 @@ public class GregtechMetaTileEntity_IndustrialCokeOven
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Processes Logs and Coal into Charcoal and Coal Coke.")
             .addInfo("Controller Block for the Industrial Coke Oven")
@@ -84,14 +83,14 @@ public class GregtechMetaTileEntity_IndustrialCokeOven
             .addEnergyHatch("Any Structural Coke Oven Casing", 1)
             .addMaintenanceHatch("Any Structural Coke Oven Casing", 1)
             .addMufflerHatch("Any Structural Coke Oven Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialCokeOven> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialCokeOven> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCokeOven>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialCokeOven>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -106,7 +105,7 @@ public class GregtechMetaTileEntity_IndustrialCokeOven
                         new String[][] { { "CCC", "CCC", "CCC" }, { "bbb", "b-b", "bbb" }, { "C~C", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialCokeOven.class)
+                    buildHatchAdder(MTEIndustrialCokeOven.class)
                         .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Energy, Muffler)
                         .casingIndex(TAE.GTPP_INDEX(1))
                         .dot(1)
@@ -184,7 +183,7 @@ public class GregtechMetaTileEntity_IndustrialCokeOven
     @Override
     protected void setupProcessingLogic(ProcessingLogic logic) {
         super.setupProcessingLogic(logic);
-        logic.setEuModifier((100F - (GT_Utility.getTier(getMaxInputVoltage()) * 4)) / 100F);
+        logic.setEuModifier((100F - (GTUtility.getTier(getMaxInputVoltage()) * 4)) / 100F);
     }
 
     @Override
@@ -199,7 +198,7 @@ public class GregtechMetaTileEntity_IndustrialCokeOven
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCokeOven;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCokeOven;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java
index 4910ee4d2f..5d80aac3f4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java
@@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -34,44 +34,43 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.enums.TAE;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_IndustrialCuttingMachine extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCuttingMachine> implements ISurvivalConstructable {
+public class MTEIndustrialCuttingMachine extends GTPPMultiBlockBase<MTEIndustrialCuttingMachine>
+    implements ISurvivalConstructable {
 
     private int mCasing;
     private static final int MACHINEMODE_CUTTER = 0;
     private static final int MACHINEMODE_SLICER = 1;
 
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialCuttingMachine> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialCuttingMachine> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialCuttingMachine(final int aID, final String aName,
-        final String aNameRegional) {
+    public MTEIndustrialCuttingMachine(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialCuttingMachine(final String aName) {
+    public MTEIndustrialCuttingMachine(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialCuttingMachine(this.mName);
+        return new MTEIndustrialCuttingMachine(this.mName);
     }
 
     @Override
@@ -80,8 +79,8 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Cutting Factory")
             .addInfo("200% faster than using single block machines of the same voltage")
@@ -98,14 +97,14 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialCuttingMachine> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialCuttingMachine> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCuttingMachine>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialCuttingMachine>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -113,7 +112,7 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends
                             { "CCC", "CCC", "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialCuttingMachine.class)
+                    buildHatchAdder(MTEIndustrialCuttingMachine.class)
                         .atLeast(InputBus, InputHatch, OutputBus, Maintenance, Energy, Muffler)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -180,7 +179,7 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends
 
     @Override
     public int getMaxParallelRecipes() {
-        return (4 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (4 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -190,7 +189,7 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCuttingMachine;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCuttingMachine;
     }
 
     @Override
@@ -231,8 +230,8 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends
     @Override
     public void setMachineModeIcons() {
         machineModeIcons.clear();
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_CUTTING);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_SLICING);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_CUTTING);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_SLICING);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java
index f4b10890c8..0975c5fa88 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java
@@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofCoil;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -45,46 +45,46 @@ import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_IndustrialDehydrator
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialDehydrator> implements ISurvivalConstructable {
+public class MTEIndustrialDehydrator extends GTPPMultiBlockBase<MTEIndustrialDehydrator>
+    implements ISurvivalConstructable {
 
     private static int CASING_TEXTURE_ID;
     private static String mCasingName = "Vacuum Casing";
     private HeatingCoilLevel mHeatingCapacity;
     private boolean mDehydratorMode = false;
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialDehydrator> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialDehydrator> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialDehydrator(int aID, String aName, String aNameRegional) {
+    public MTEIndustrialDehydrator(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(3, 10);
     }
 
-    public GregtechMetaTileEntity_IndustrialDehydrator(String aName) {
+    public MTEIndustrialDehydrator(String aName) {
         super(aName);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(3, 10);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialDehydrator(mName);
+        return new MTEIndustrialDehydrator(mName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Factory Grade Vacuum Furnace")
             .addInfo("Can toggle the operation temperature with a Screwdriver")
@@ -105,14 +105,14 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialDehydrator> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialDehydrator> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialDehydrator>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialDehydrator>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -120,16 +120,12 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
                             { "HHH", "H-H", "HHH" }, { "C~C", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialDehydrator.class)
+                    buildHatchAdder(MTEIndustrialDehydrator.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
                         .casingIndex(CASING_TEXTURE_ID)
                         .dot(1)
                         .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings4Misc, 10))))
-                .addElement(
-                    'H',
-                    ofCoil(
-                        GregtechMetaTileEntity_IndustrialDehydrator::setCoilLevel,
-                        GregtechMetaTileEntity_IndustrialDehydrator::getCoilLevel))
+                .addElement('H', ofCoil(MTEIndustrialDehydrator::setCoilLevel, MTEIndustrialDehydrator::getCoilLevel))
                 .build();
         }
         return STRUCTURE_DEFINITION;
@@ -191,7 +187,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialDehydrator;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialDehydrator;
     }
 
     @Override
@@ -210,14 +206,14 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 return recipe.mSpecialValue <= getCoilLevel().getHeat() ? CheckRecipeResultRegistry.SUCCESSFUL
                     : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue);
             }
 
             @NotNull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
                 return super.createOverclockCalculator(recipe).setHeatOC(true)
                     .setHeatDiscount(true)
                     .setRecipeHeat(recipe.mSpecialValue)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java
index 9114fb5eac..0f2b573a2e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java
@@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
@@ -26,30 +26,29 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialExtruder
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialExtruder> implements ISurvivalConstructable {
+public class MTEIndustrialExtruder extends GTPPMultiBlockBase<MTEIndustrialExtruder> implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialExtruder> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialExtruder> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialExtruder(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialExtruder(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialExtruder(final String aName) {
+    public MTEIndustrialExtruder(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialExtruder(this.mName);
+        return new MTEIndustrialExtruder(this.mName);
     }
 
     @Override
@@ -58,8 +57,8 @@ public class GregtechMetaTileEntity_IndustrialExtruder
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Material Extruder")
             .addInfo("250% faster than using single block machines of the same voltage")
@@ -77,14 +76,14 @@ public class GregtechMetaTileEntity_IndustrialExtruder
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialExtruder> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialExtruder> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialExtruder>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialExtruder>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -92,7 +91,7 @@ public class GregtechMetaTileEntity_IndustrialExtruder
                             { "CCC", "CCC", "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialExtruder.class)
+                    buildHatchAdder(MTEIndustrialExtruder.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -157,7 +156,7 @@ public class GregtechMetaTileEntity_IndustrialExtruder
 
     @Override
     public int getMaxParallelRecipes() {
-        return (4 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (4 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -167,7 +166,7 @@ public class GregtechMetaTileEntity_IndustrialExtruder
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialExtruder;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialExtruder;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java
index 254402d4c1..9c22e81024 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java
@@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
@@ -27,30 +27,30 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialFluidHeater extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialFluidHeater> implements ISurvivalConstructable {
+public class MTEIndustrialFluidHeater extends GTPPMultiBlockBase<MTEIndustrialFluidHeater>
+    implements ISurvivalConstructable {
 
     private int mCasing1;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialFluidHeater> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialFluidHeater> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialFluidHeater(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialFluidHeater(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialFluidHeater(final String aName) {
+    public MTEIndustrialFluidHeater(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialFluidHeater(this.mName);
+        return new MTEIndustrialFluidHeater(this.mName);
     }
 
     @Override
@@ -59,8 +59,8 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Fluid Heater")
             .addInfo("120% faster than using single block machines of the same voltage")
@@ -79,14 +79,14 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends
             .addEnergyHatch("Any Multi-use Casing", 1)
             .addMaintenanceHatch("Any Multi-use Casing", 1)
             .addMufflerHatch("Any Multi-use Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialFluidHeater> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialFluidHeater> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialFluidHeater>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialFluidHeater>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -98,7 +98,7 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends
                             { " BBB ", "BBBBB", "BBBBB", "BBBBB", " BBB " }, }))
                 .addElement(
                     'B',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialFluidHeater.class)
+                    buildHatchAdder(MTEIndustrialFluidHeater.class)
                         .atLeast(InputBus, InputHatch, Maintenance, Energy, Muffler)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -106,7 +106,7 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends
                 .addElement('X', ofBlock(getCasingBlock1(), getCasingMeta1()))
                 .addElement(
                     'T',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialFluidHeater.class)
+                    buildHatchAdder(MTEIndustrialFluidHeater.class)
                         .atLeast(OutputBus, OutputHatch, Maintenance, Energy, Muffler)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -164,7 +164,7 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends
 
     @Override
     public int getMaxParallelRecipes() {
-        return (8 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (8 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -174,7 +174,7 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java
index 44484cb90e..b809feaa6e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java
@@ -4,17 +4,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Mods.EnderIO;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.enums.Mods.ThaumicBases;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.HashMap;
 import java.util.List;
@@ -42,32 +42,32 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 @SuppressWarnings("SpellCheckingInspection")
-public class GregtechMetaTileEntity_IndustrialForgeHammer extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialForgeHammer> implements ISurvivalConstructable {
+public class MTEIndustrialForgeHammer extends GTPPMultiBlockBase<MTEIndustrialForgeHammer>
+    implements ISurvivalConstructable {
 
     private int mCasing;
     private int mAnvilTier = 0;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialForgeHammer> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialForgeHammer> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialForgeHammer(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialForgeHammer(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialForgeHammer(final String aName) {
+    public MTEIndustrialForgeHammer(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialForgeHammer(this.mName);
+        return new MTEIndustrialForgeHammer(this.mName);
     }
 
     @Override
@@ -76,8 +76,8 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Forge Hammer")
             .addInfo("Speed: +100% | EU Usage: 100% | Parallel: Tier x Anvil Tier x 8")
@@ -106,12 +106,12 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
             .addOtherStructurePart("Anvil", "In the center of 3x3x3 structure", 2)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialForgeHammer> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialForgeHammer> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
             Map<Block, Integer> anvilTiers = new HashMap<>();
 
@@ -130,14 +130,14 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends
                 anvilTiers.put(GameRegistry.findBlock(ThaumicBases.ID, "voidAnvil"), 4);
             }
 
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialForgeHammer>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialForgeHammer>builder()
                 .addShape(
                     mName,
                     transpose(
                         new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "CAC", "CCC" }, { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialForgeHammer.class)
+                    buildHatchAdder(MTEIndustrialForgeHammer.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
                         .casingIndex(TAE.getIndexFromPage(1, 11))
                         .dot(1)
@@ -148,8 +148,8 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends
                         anvilTierConverter(anvilTiers),
                         getAllAnvilTiers(anvilTiers),
                         0,
-                        GregtechMetaTileEntity_IndustrialForgeHammer::setAnvilTier,
-                        GregtechMetaTileEntity_IndustrialForgeHammer::getAnvilTier))
+                        MTEIndustrialForgeHammer::setAnvilTier,
+                        MTEIndustrialForgeHammer::getAnvilTier))
                 .build();
         }
         return STRUCTURE_DEFINITION;
@@ -216,7 +216,7 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends
 
     @Override
     public int getMaxParallelRecipes() {
-        return (8 * getAnvilTier() * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (8 * getAnvilTier() * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -226,7 +226,7 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialForgeHammer;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialForgeHammer;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java
index ff66b930ad..635e5889f5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java
@@ -4,12 +4,12 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksT
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.List;
 import java.util.Random;
@@ -33,30 +33,30 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 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.MTEHatch;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.tileentities.machines.IDualInputHatch;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_IndustrialMacerator
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMacerator> implements ISurvivalConstructable {
+public class MTEIndustrialMacerator extends GTPPMultiBlockBase<MTEIndustrialMacerator>
+    implements ISurvivalConstructable {
 
     private int controllerTier = 1;
     private int structureTier;
@@ -67,25 +67,25 @@ public class GregtechMetaTileEntity_IndustrialMacerator
     private static final int HORIZONTAL_OFF_SET = 1;
     private static final int VERTICAL_OFF_SET = 5;
     private static final int DEPTH_OFF_SET = 0;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMacerator> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialMacerator> STRUCTURE_DEFINITION = null;
 
     private static int getStructureCasingTier(Block b, int m) {
-        if (b == GregTech_API.sBlockCasings4 && m == 2) return 1;
+        if (b == GregTechAPI.sBlockCasings4 && m == 2) return 1;
         if (b == ModBlocks.blockCasingsMisc && m == 7) return 2;
         return 0;
     }
 
-    public GregtechMetaTileEntity_IndustrialMacerator(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialMacerator(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialMacerator(final String aName) {
+    public MTEIndustrialMacerator(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialMacerator(this.mName);
+        return new MTEIndustrialMacerator(this.mName);
     }
 
     @Override
@@ -94,8 +94,8 @@ public class GregtechMetaTileEntity_IndustrialMacerator
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller block for the Industrial Maceration Stack")
             .addInfo("60% faster than using single block machines of the same voltage")
@@ -112,14 +112,14 @@ public class GregtechMetaTileEntity_IndustrialMacerator
             .addMaintenanceHatch("Any casing", 1)
             .addOutputBus("One per layer except bottom layer", 2)
             .addMufflerHatch("Any casing except bottom layer", 2)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialMacerator> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialMacerator> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMacerator>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialMacerator>builder()
                 .addShape(
                     STRUCTURE_PIECE_MAIN,
                     // spotless:off
@@ -135,19 +135,18 @@ public class GregtechMetaTileEntity_IndustrialMacerator
                 .addElement(
                     'A',
                     ofChain(
-                        buildHatchAdder(GregtechMetaTileEntity_IndustrialMacerator.class)
+                        buildHatchAdder(MTEIndustrialMacerator.class)
                             .atLeast(Energy, Maintenance, InputBus, Muffler, OutputBus)
-                            .casingIndex(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 2))
+                            .casingIndex(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings4, 2))
                             .allowOnly(ForgeDirection.NORTH)
                             .dot(1)
                             .build(),
                         onElementPass(
                             m -> m.mCasing++,
                             ofBlocksTiered(
-                                GregtechMetaTileEntity_IndustrialMacerator::getStructureCasingTier,
-                                ImmutableList.of(
-                                    Pair.of(GregTech_API.sBlockCasings4, 2),
-                                    Pair.of(ModBlocks.blockCasingsMisc, 7)),
+                                MTEIndustrialMacerator::getStructureCasingTier,
+                                ImmutableList
+                                    .of(Pair.of(GregTechAPI.sBlockCasings4, 2), Pair.of(ModBlocks.blockCasingsMisc, 7)),
                                 -1,
                                 (m, t) -> m.structureTier = t,
                                 m -> m.structureTier))))
@@ -194,12 +193,12 @@ public class GregtechMetaTileEntity_IndustrialMacerator
 
     protected void updateHatchTexture() {
         int textureID = getCasingTextureId();
-        for (GT_MetaTileEntity_Hatch h : mInputBusses) h.updateTexture(textureID);
+        for (MTEHatch h : mInputBusses) h.updateTexture(textureID);
         for (IDualInputHatch h : mDualInputHatches) h.updateTexture(textureID);
-        for (GT_MetaTileEntity_Hatch h : mOutputBusses) h.updateTexture(textureID);
-        for (GT_MetaTileEntity_Hatch h : mMaintenanceHatches) h.updateTexture(textureID);
-        for (GT_MetaTileEntity_Hatch h : mMufflerHatches) h.updateTexture(textureID);
-        for (GT_MetaTileEntity_Hatch h : mEnergyHatches) h.updateTexture(textureID);
+        for (MTEHatch h : mOutputBusses) h.updateTexture(textureID);
+        for (MTEHatch h : mMaintenanceHatches) h.updateTexture(textureID);
+        for (MTEHatch h : mMufflerHatches) h.updateTexture(textureID);
+        for (MTEHatch h : mEnergyHatches) h.updateTexture(textureID);
     }
 
     @Override
@@ -227,7 +226,7 @@ public class GregtechMetaTileEntity_IndustrialMacerator
     @Override
     protected int getCasingTextureId() {
         if (structureTier == 2) return TAE.GTPP_INDEX(7);
-        return GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 2);
+        return GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings4, 2);
     }
 
     @Override
@@ -349,7 +348,7 @@ public class GregtechMetaTileEntity_IndustrialMacerator
     @Override
     public int getMaxParallelRecipes() {
         final long tVoltage = getMaxInputVoltage();
-        final byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
+        final byte tTier = (byte) Math.max(1, GTUtility.getTier(tVoltage));
         return Math.max(1, (controllerTier == 1 ? 2 : 8) * tTier);
     }
 
@@ -360,7 +359,7 @@ public class GregtechMetaTileEntity_IndustrialMacerator
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMacerator;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMacerator;
     }
 
     @Override
@@ -383,7 +382,7 @@ public class GregtechMetaTileEntity_IndustrialMacerator
         if (tag.hasKey("tier")) {
             currentTip.add(
                 "Tier: " + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(tag.getInteger("tier"))
+                    + GTUtility.formatNumbers(tag.getInteger("tier"))
                     + EnumChatFormatting.RESET);
         }
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java
index 39b5d6e73e..e733168fca 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java
@@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -23,7 +23,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
@@ -31,29 +31,28 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialMixer
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMixer> implements ISurvivalConstructable {
+public class MTEIndustrialMixer extends GTPPMultiBlockBase<MTEIndustrialMixer> implements ISurvivalConstructable {
 
     public static int CASING_TEXTURE_ID;
     public static String mCasingName = "Multi-Use Casing";
     public static String mCasingName2 = "Titanium Turbine Casing";
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMixer> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialMixer> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialMixer(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialMixer(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 2);
     }
 
-    public GregtechMetaTileEntity_IndustrialMixer(final String aName) {
+    public MTEIndustrialMixer(final String aName) {
         super(aName);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 2);
     }
@@ -74,7 +73,7 @@ public class GregtechMetaTileEntity_IndustrialMixer
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialMixer(this.mName);
+        return new MTEIndustrialMixer(this.mName);
     }
 
     @Override
@@ -83,8 +82,8 @@ public class GregtechMetaTileEntity_IndustrialMixer
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Mixer")
             .addInfo("250% faster than using single block machines of the same voltage")
@@ -102,14 +101,14 @@ public class GregtechMetaTileEntity_IndustrialMixer
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialMixer> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialMixer> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMixer>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialMixer>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -117,12 +116,12 @@ public class GregtechMetaTileEntity_IndustrialMixer
                             { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialMixer.class)
+                    buildHatchAdder(MTEIndustrialMixer.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
                         .casingIndex(CASING_TEXTURE_ID)
                         .dot(1)
                         .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 2))))
-                .addElement('M', ofBlock(GregTech_API.sBlockCasings4, 11))
+                .addElement('M', ofBlock(GregTechAPI.sBlockCasings4, 11))
                 .build();
         }
         return STRUCTURE_DEFINITION;
@@ -178,7 +177,7 @@ public class GregtechMetaTileEntity_IndustrialMixer
 
     @Override
     public int getMaxParallelRecipes() {
-        return (8 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (8 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -188,13 +187,13 @@ public class GregtechMetaTileEntity_IndustrialMixer
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMixer;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMixer;
     }
 
     @Override
     public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         inputSeparation = !inputSeparation;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation);
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java
index f40e851c55..4ffd484163 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java
@@ -2,12 +2,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
@@ -19,38 +19,36 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialMolecularTransformer
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMolecularTransformer>
+public class MTEIndustrialMolecularTransformer extends GTPPMultiBlockBase<MTEIndustrialMolecularTransformer>
     implements ISurvivalConstructable {
 
     private static final int CASING_TEXTURE_ID = 48;
     private int mCasing = 0;
 
-    public GregtechMetaTileEntity_IndustrialMolecularTransformer(final int aID, final String aName,
-        final String aNameRegional) {
+    public MTEIndustrialMolecularTransformer(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialMolecularTransformer(final String aName) {
+    public MTEIndustrialMolecularTransformer(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialMolecularTransformer(this.mName);
+        return new MTEIndustrialMolecularTransformer(this.mName);
     }
 
     @Override
@@ -59,9 +57,9 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
 
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Changes the structure of items to produce new ones")
             .addInfo("Maximum 1x of each bus/hatch.")
@@ -81,17 +79,17 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer
             .addEnergyHatch("Any Robust Tungstensteel Machine Casing", 1)
             .addMaintenanceHatch("Any Robust Tungstensteel Machine Casing", 1)
             .addMufflerHatch("Any Robust Tungstensteel Machine Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMolecularTransformer> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialMolecularTransformer> STRUCTURE_DEFINITION = null;
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialMolecularTransformer> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialMolecularTransformer> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMolecularTransformer>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialMolecularTransformer>builder()
                 .addShape(
                     STRUCTURE_PIECE_MAIN,
                     (new String[][] { { "       ", "       ", "  xxx  ", "  x~x  ", "  xxx  ", "       ", "       " },
@@ -110,7 +108,7 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer
                 .addElement('t', ofBlock(getCasingBlock3(), getTungstenCasingMeta()))
                 .addElement(
                     'h',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialMolecularTransformer.class)
+                    buildHatchAdder(MTEIndustrialMolecularTransformer.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -156,11 +154,11 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer
     }
 
     protected static Block getCasingBlock3() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     protected static Block getCoilBlock() {
-        return GregTech_API.sBlockCasings5;
+        return GregTechAPI.sBlockCasings5;
     }
 
     protected static int getCasingMeta() {
@@ -226,7 +224,7 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java
index d9a9a1549a..472b1f66fd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java
@@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,37 +39,37 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.enums.TAE;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IIconContainer;
 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_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchMultiInput;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_CraftingInput_ME;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Input_ME;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.tileentities.machines.IDualInputHatch;
 import gregtech.common.tileentities.machines.IDualInputInventory;
+import gregtech.common.tileentities.machines.MTEHatchCraftingInputME;
+import gregtech.common.tileentities.machines.MTEHatchInputME;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Solidifier;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSolidifier;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_IndustrialMultiMachine extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMultiMachine> implements ISurvivalConstructable {
+public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialMultiMachine>
+    implements ISurvivalConstructable {
 
     private final static int MACHINEMODE_METAL = 0;
     private final static int MACHINEMODE_FLUID = 1;
@@ -87,30 +87,29 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
     private static final int[][] MODE_MAP = new int[][] { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 } };
     public static final String[] aToolTipNames = new String[9];
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMultiMachine> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialMultiMachine> STRUCTURE_DEFINITION = null;
 
     static {
         for (int id = 0; id < 9; id++) {
             RecipeMap<?> recipeMap = getRecipeMap(id);
             if (recipeMap != null) {
-                String aNEI = GT_LanguageManager.getTranslation(getRecipeMap(id).unlocalizedName);
+                String aNEI = GTLanguageManager.getTranslation(getRecipeMap(id).unlocalizedName);
                 aToolTipNames[id] = aNEI != null ? aNEI : "BAD NEI NAME (Report to Github)";
             }
         }
     }
 
-    public GregtechMetaTileEntity_IndustrialMultiMachine(final int aID, final String aName,
-        final String aNameRegional) {
+    public MTEIndustrialMultiMachine(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialMultiMachine(final String aName) {
+    public MTEIndustrialMultiMachine(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialMultiMachine(this.mName);
+        return new MTEIndustrialMultiMachine(this.mName);
     }
 
     @Override
@@ -119,13 +118,13 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         String[] aBuiltStrings = new String[3];
         aBuiltStrings[0] = aToolTipNames[0] + ", " + aToolTipNames[1] + ", " + aToolTipNames[2];
         aBuiltStrings[1] = aToolTipNames[3] + ", " + aToolTipNames[4] + ", " + aToolTipNames[5];
         aBuiltStrings[2] = aToolTipNames[6] + ", " + aToolTipNames[7] + ", " + aToolTipNames[8];
 
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Multi-Machine")
             .addInfo("250% faster than using single block machines of the same voltage")
@@ -150,21 +149,21 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialMultiMachine> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialMultiMachine> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMultiMachine>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialMultiMachine>builder()
                 .addShape(
                     mName,
                     transpose(
                         new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialMultiMachine.class)
+                    buildHatchAdder(MTEIndustrialMultiMachine.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
                         .casingIndex(getTextureIndex())
                         .dot(1)
@@ -208,7 +207,7 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
 
     @Override
     public int getMaxParallelRecipes() {
-        return (2 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (2 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -220,13 +219,13 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
     public int getPollutionPerSecond(final ItemStack aStack) {
         switch (machineMode) {
             case MACHINEMODE_METAL -> {
-                return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal;
+                return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal;
             }
             case MACHINEMODE_FLUID -> {
-                return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid;
+                return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid;
             }
             default -> {
-                return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc;
+                return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc;
             }
         }
     }
@@ -242,7 +241,7 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
 
     private ItemStack getCircuit(ItemStack[] t) {
         for (ItemStack j : t) {
-            if (j.getItem() == GT_Utility.getIntegratedCircuit(0)
+            if (j.getItem() == GTUtility.getIntegratedCircuit(0)
                 .getItem()) {
                 if (j.getItemDamage() >= 20 && j.getItemDamage() <= 22) {
                     return j;
@@ -316,12 +315,12 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
 
             @Nonnull
             @Override
-            protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
+            protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
                 ItemStack circuit = getCircuit(inputItems);
                 if (circuit == null) {
                     return Stream.empty();
                 }
-                if (!GT_Utility.areStacksEqual(circuit, lastCircuit)) {
+                if (!GTUtility.areStacksEqual(circuit, lastCircuit)) {
                     lastRecipe = null;
                     lastCircuit = circuit;
                 }
@@ -400,15 +399,15 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
             }
 
             // Logic for GT_MetaTileEntity_Hatch_Solidifier
-            for (GT_MetaTileEntity_Hatch_Input solidifierHatch : mInputHatches) {
-                if (solidifierHatch instanceof GT_MetaTileEntity_Hatch_Solidifier) {
-                    ItemStack mold = ((GT_MetaTileEntity_Hatch_Solidifier) solidifierHatch).getMold();
+            for (MTEHatchInput solidifierHatch : mInputHatches) {
+                if (solidifierHatch instanceof MTEHatchSolidifier) {
+                    ItemStack mold = ((MTEHatchSolidifier) solidifierHatch).getMold();
                     FluidStack fluid = solidifierHatch.getFluid();
 
                     if (mold != null && fluid != null) {
                         List<ItemStack> inputItems = new ArrayList<>();
                         inputItems.add(mold);
-                        inputItems.add(GT_Utility.getIntegratedCircuit(22));
+                        inputItems.add(GTUtility.getIntegratedCircuit(22));
 
                         processingLogic.setInputItems(inputItems.toArray(new ItemStack[0]));
                         processingLogic.setInputFluids(fluid);
@@ -427,8 +426,8 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
             processingLogic.clear();
             processingLogic.setInputFluids(getStoredFluids());
             // Default logic
-            for (GT_MetaTileEntity_Hatch_InputBus bus : mInputBusses) {
-                if (bus instanceof GT_MetaTileEntity_Hatch_CraftingInput_ME) {
+            for (MTEHatchInputBus bus : mInputBusses) {
+                if (bus instanceof MTEHatchCraftingInputME) {
                     continue;
                 }
                 List<ItemStack> inputItems = new ArrayList<>();
@@ -459,21 +458,21 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
     @Override
     public ArrayList<FluidStack> getStoredFluids() {
         ArrayList<FluidStack> rList = new ArrayList<>();
-        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_Solidifier) {
+        for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
+            if (tHatch instanceof MTEHatchSolidifier) {
                 continue;
             }
 
             setHatchRecipeMap(tHatch);
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) {
-                for (FluidStack tFluid : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) {
+            if (tHatch instanceof MTEHatchMultiInput) {
+                for (FluidStack tFluid : ((MTEHatchMultiInput) tHatch).getStoredFluid()) {
                     if (tFluid != null) {
                         rList.add(tFluid);
                     }
                 }
-            } else if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME) {
+            } else if (tHatch instanceof MTEHatchInputME) {
                 if (tHatch.isValid()) {
-                    for (FluidStack fluidStack : ((GT_MetaTileEntity_Hatch_Input_ME) tHatch).getStoredFluids()) {
+                    for (FluidStack fluidStack : ((MTEHatchInputME) tHatch).getStoredFluids()) {
                         if (fluidStack == null) continue;
                         rList.add(fluidStack);
                     }
@@ -534,8 +533,8 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
     @Override
     public void setMachineModeIcons() {
         machineModeIcons.clear();
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_METAL);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_FLUID);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_METAL);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_FLUID);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java
index d7e7b2047f..f41ebdd292 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java
@@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -32,44 +32,44 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.enums.SoundResource;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_IndustrialPlatePress
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialPlatePress> implements ISurvivalConstructable {
+public class MTEIndustrialPlatePress extends GTPPMultiBlockBase<MTEIndustrialPlatePress>
+    implements ISurvivalConstructable {
 
     private int mCasing;
 
     private static final int MACHINEMODE_BENDER = 0;
     private static final int MACHINEMODE_FORMER = 1;
 
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialPlatePress> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialPlatePress> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialPlatePress(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialPlatePress(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialPlatePress(final String aName) {
+    public MTEIndustrialPlatePress(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialPlatePress(this.mName);
+        return new MTEIndustrialPlatePress(this.mName);
     }
 
     @Override
@@ -78,8 +78,8 @@ public class GregtechMetaTileEntity_IndustrialPlatePress
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for Advanced Bending & Forming")
             .addInfo("500% faster than using single block machines of the same voltage")
@@ -96,21 +96,21 @@ public class GregtechMetaTileEntity_IndustrialPlatePress
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialPlatePress> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialPlatePress> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialPlatePress>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialPlatePress>builder()
                 .addShape(
                     mName,
                     transpose(
                         new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialPlatePress.class)
+                    buildHatchAdder(MTEIndustrialPlatePress.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
                         .casingIndex(50)
                         .dot(1)
@@ -181,7 +181,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress
 
     @Override
     public int getMaxParallelRecipes() {
-        return (4 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (4 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -192,8 +192,8 @@ public class GregtechMetaTileEntity_IndustrialPlatePress
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
         if (machineMode == MACHINEMODE_FORMER)
-            return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeForming;
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeBending;
+            return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeForming;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeBending;
     }
 
     @Override
@@ -226,8 +226,8 @@ public class GregtechMetaTileEntity_IndustrialPlatePress
     @Override
     public void setMachineModeIcons() {
         machineModeIcons.clear();
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_BENDING);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_FORMING);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_BENDING);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_FORMING);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java
index 5189e546a5..6dbd019887 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java
@@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.Random;
 
@@ -29,30 +29,29 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialSifter
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialSifter> implements ISurvivalConstructable {
+public class MTEIndustrialSifter extends GTPPMultiBlockBase<MTEIndustrialSifter> implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialSifter> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialSifter> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialSifter(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialSifter(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialSifter(final String aName) {
+    public MTEIndustrialSifter(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialSifter(this.mName);
+        return new MTEIndustrialSifter(this.mName);
     }
 
     @Override
@@ -61,8 +60,8 @@ public class GregtechMetaTileEntity_IndustrialSifter
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Sifter")
             .addInfo("400% faster than single-block machines of the same voltage")
@@ -81,14 +80,14 @@ public class GregtechMetaTileEntity_IndustrialSifter
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialSifter> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialSifter> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialSifter>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialSifter>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -97,7 +96,7 @@ public class GregtechMetaTileEntity_IndustrialSifter
                             { "CC~CC", "CCCCC", "CCCCC", "CCCCC", "CCCCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialSifter.class)
+                    buildHatchAdder(MTEIndustrialSifter.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
                         .casingIndex(TAE.GTPP_INDEX(21))
                         .dot(1)
@@ -184,7 +183,7 @@ public class GregtechMetaTileEntity_IndustrialSifter
 
     @Override
     public int getMaxParallelRecipes() {
-        return (4 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (4 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -194,7 +193,7 @@ public class GregtechMetaTileEntity_IndustrialSifter
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialSifter;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialSifter;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java
index d1e9e0d6a0..b494d0bfa7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java
@@ -4,12 +4,12 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
@@ -19,7 +19,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -27,31 +27,30 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialThermalCentrifuge> implements ISurvivalConstructable {
+public class MTEIndustrialThermalCentrifuge extends GTPPMultiBlockBase<MTEIndustrialThermalCentrifuge>
+    implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialThermalCentrifuge> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialThermalCentrifuge> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialThermalCentrifuge(final int aID, final String aName,
-        final String aNameRegional) {
+    public MTEIndustrialThermalCentrifuge(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialThermalCentrifuge(final String aName) {
+    public MTEIndustrialThermalCentrifuge(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialThermalCentrifuge(this.mName);
+        return new MTEIndustrialThermalCentrifuge(this.mName);
     }
 
     @Override
@@ -60,8 +59,8 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Thermal Centrifuge")
             .addInfo("150% faster than using single block machines of the same voltage")
@@ -77,30 +76,30 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends
             .addEnergyHatch("Bottom Casing", 1)
             .addMaintenanceHatch("Bottom Casing", 1)
             .addMufflerHatch("Bottom Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialThermalCentrifuge> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialThermalCentrifuge> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialThermalCentrifuge>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialThermalCentrifuge>builder()
                 .addShape(mName, transpose(new String[][] { { "X~X", "XXX", "XXX" }, { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
                     ofChain(
-                        buildHatchAdder(GregtechMetaTileEntity_IndustrialThermalCentrifuge.class)
+                        buildHatchAdder(MTEIndustrialThermalCentrifuge.class)
                             .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
                             .casingIndex(getCasingTextureIndex())
                             .dot(1)
                             .build(),
                         onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 0)),
-                        onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings3, 9))))
+                        onElementPass(x -> ++x.mCasing, ofBlock(GregTechAPI.sBlockCasings3, 9))))
                 .addElement(
                     'X',
                     ofChain(
                         onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 0)),
-                        onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings3, 9))))
+                        onElementPass(x -> ++x.mCasing, ofBlock(GregTechAPI.sBlockCasings3, 9))))
                 .build();
         }
         return STRUCTURE_DEFINITION;
@@ -152,7 +151,7 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends
 
     @Override
     public int getMaxParallelRecipes() {
-        return (8 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (8 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -162,7 +161,7 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java
index a38b7f1a9e..3d18a9eda0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java
@@ -4,15 +4,15 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.Objects;
@@ -31,18 +31,18 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTEHatchCustomFluidBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialVacuumFreezer> implements ISurvivalConstructable {
+public class MTEIndustrialVacuumFreezer extends GTPPMultiBlockBase<MTEIndustrialVacuumFreezer>
+    implements ISurvivalConstructable {
 
     public static int CASING_TEXTURE_ID;
     public static String mCryoFuelName = "Gelid Cryotheum";
@@ -50,18 +50,17 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
     public static String mHatchName = "Cryotheum Hatch";
     public static FluidStack mFuelStack;
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialVacuumFreezer> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialVacuumFreezer> STRUCTURE_DEFINITION = null;
 
-    private final ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mCryotheumHatches = new ArrayList<>();
+    private final ArrayList<MTEHatchCustomFluidBase> mCryotheumHatches = new ArrayList<>();
 
-    public GregtechMetaTileEntity_IndustrialVacuumFreezer(final int aID, final String aName,
-        final String aNameRegional) {
+    public MTEIndustrialVacuumFreezer(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
         mFuelStack = FluidUtils.getFluidStack("cryotheum", 1);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10);
     }
 
-    public GregtechMetaTileEntity_IndustrialVacuumFreezer(final String aName) {
+    public MTEIndustrialVacuumFreezer(final String aName) {
         super(aName);
         mFuelStack = FluidUtils.getFluidStack("cryotheum", 1);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10);
@@ -69,7 +68,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return (IMetaTileEntity) new GregtechMetaTileEntity_IndustrialVacuumFreezer(this.mName);
+        return (IMetaTileEntity) new MTEIndustrialVacuumFreezer(this.mName);
     }
 
     @Override
@@ -78,8 +77,8 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Factory Grade Advanced Vacuum Freezer")
             .addInfo("Speed: +100% | EU Usage: 100% | Parallel: 4")
@@ -98,14 +97,14 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
             .addMufflerHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addOtherStructurePart(mHatchName, "Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialVacuumFreezer> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialVacuumFreezer> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialVacuumFreezer>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialVacuumFreezer>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -113,14 +112,14 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
                 .addElement(
                     'C',
                     ofChain(
-                        buildHatchAdder(GregtechMetaTileEntity_IndustrialVacuumFreezer.class)
-                            .adder(GregtechMetaTileEntity_IndustrialVacuumFreezer::addCryotheumHatch)
+                        buildHatchAdder(MTEIndustrialVacuumFreezer.class)
+                            .adder(MTEIndustrialVacuumFreezer::addCryotheumHatch)
                             .hatchId(967)
                             .shouldReject(t -> !t.mCryotheumHatches.isEmpty())
                             .casingIndex(CASING_TEXTURE_ID)
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMetaTileEntity_IndustrialVacuumFreezer.class)
+                        buildHatchAdder(MTEIndustrialVacuumFreezer.class)
                             .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
                             .casingIndex(CASING_TEXTURE_ID)
                             .dot(1)
@@ -159,9 +158,8 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase
-                && aMetaTileEntity.getBaseMetaTileEntity()
-                    .getMetaTileID() == 967) {
+            if (aMetaTileEntity instanceof MTEHatchCustomFluidBase && aMetaTileEntity.getBaseMetaTileEntity()
+                .getMetaTileID() == 967) {
                 return addToMachineListInternal(mCryotheumHatches, aTileEntity, aBaseCasingIndex);
             }
         }
@@ -170,7 +168,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
 
     @Override
     public void updateSlots() {
-        for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mCryotheumHatches)) tHatch.updateSlots();
+        for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mCryotheumHatches)) tHatch.updateSlots();
         super.updateSlots();
     }
 
@@ -217,7 +215,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialVacuumFreezer;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialVacuumFreezer;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java
index 8645bc6686..35d0867cee 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java
@@ -6,14 +6,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAn
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,7 +43,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.enums.TAE;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -53,44 +53,44 @@ import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import ic2.core.init.BlocksItems;
 import ic2.core.init.InternalName;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_IndustrialWashPlant
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialWashPlant> implements ISurvivalConstructable {
+public class MTEIndustrialWashPlant extends GTPPMultiBlockBase<MTEIndustrialWashPlant>
+    implements ISurvivalConstructable {
 
     private int mCasing;
 
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialWashPlant> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialWashPlant> STRUCTURE_DEFINITION = null;
 
     private static final int MACHINEMODE_OREWASH = 0;
     private static final int MACHINEMODE_SIMPLEWASH = 1;
     private static final int MACHINEMODE_CHEMBATH = 2;
 
-    public GregtechMetaTileEntity_IndustrialWashPlant(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialWashPlant(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialWashPlant(final String aName) {
+    public MTEIndustrialWashPlant(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialWashPlant(this.mName);
+        return new MTEIndustrialWashPlant(this.mName);
     }
 
     @Override
@@ -99,8 +99,8 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Wash Plant")
             .addInfo("Can be configured with a screwdriver to also do Simple Washer and process Chemical Bathing")
@@ -121,14 +121,14 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialWashPlant> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialWashPlant> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialWashPlant>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialWashPlant>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -137,7 +137,7 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
                             { "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialWashPlant.class)
+                    buildHatchAdder(MTEIndustrialWashPlant.class)
                         .atLeast(InputBus, InputHatch, OutputHatch, OutputBus, Maintenance, Energy, Muffler)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -225,7 +225,7 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 if (checkForWater()) {
                     return CheckRecipeResultRegistry.SUCCESSFUL;
                 }
@@ -237,7 +237,7 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
 
     @Override
     public int getMaxParallelRecipes() {
-        return (4 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (4 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -248,8 +248,8 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
         if (machineMode == MACHINEMODE_CHEMBATH)
-            return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath;
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeWasher;
+            return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeWasher;
     }
 
     @Override
@@ -418,8 +418,8 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
     @Override
     public void setMachineModeIcons() {
         machineModeIcons.clear();
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_WASHPLANT);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_SIMPLEWASHER);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_CHEMBATH);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_WASHPLANT);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_SIMPLEWASHER);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_CHEMBATH);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java
index 4304b5b52a..292fd1041b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java
@@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
@@ -30,30 +30,29 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialWireMill
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialWireMill> implements ISurvivalConstructable {
+public class MTEIndustrialWireMill extends GTPPMultiBlockBase<MTEIndustrialWireMill> implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialWireMill> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialWireMill> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialWireMill(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialWireMill(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialWireMill(final String aName) {
+    public MTEIndustrialWireMill(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialWireMill(this.mName);
+        return new MTEIndustrialWireMill(this.mName);
     }
 
     @Override
@@ -62,8 +61,8 @@ public class GregtechMetaTileEntity_IndustrialWireMill
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Wire Factory")
             .addInfo("200% faster than using single block machines of the same voltage")
@@ -79,14 +78,14 @@ public class GregtechMetaTileEntity_IndustrialWireMill
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialWireMill> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialWireMill> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialWireMill>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialWireMill>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -94,7 +93,7 @@ public class GregtechMetaTileEntity_IndustrialWireMill
                             { "CCC", "CCC", "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialWireMill.class)
+                    buildHatchAdder(MTEIndustrialWireMill.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -176,7 +175,7 @@ public class GregtechMetaTileEntity_IndustrialWireMill
 
     @Override
     public int getMaxParallelRecipes() {
-        return (4 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (4 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -186,7 +185,7 @@ public class GregtechMetaTileEntity_IndustrialWireMill
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWireMill;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWireMill;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
index c14cae9b88..d1a6ac34f0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
@@ -4,15 +4,15 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -44,48 +44,47 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_MillingBalls;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.MTEHatchMillingBalls;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
-public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IsaMill>
-    implements ISurvivalConstructable {
+public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvivalConstructable {
 
     protected boolean boostEu = false;
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IsaMill> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIsaMill> STRUCTURE_DEFINITION = null;
 
     private static final IIconContainer frontFaceActive = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE5");
     private static final IIconContainer frontFace = new CustomIcon("iconsets/Grinder/GRINDER5");
 
-    private final ArrayList<GT_MetaTileEntity_Hatch_MillingBalls> mMillingBallBuses = new ArrayList<>();
+    private final ArrayList<MTEHatchMillingBalls> mMillingBallBuses = new ArrayList<>();
     private static final DamageSource mIsaMillDamageSource = new DamageSource("gtpp.grinder").setDamageBypassesArmor();
 
-    public GregtechMetaTileEntity_IsaMill(int aID, String aName, String aNameRegional) {
+    public MTEIsaMill(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IsaMill(String aName) {
+    public MTEIsaMill(String aName) {
         super(aName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Large Grinding Machine")
             .addInfo("Grind ores.")
@@ -103,14 +102,14 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IsaMill> getStructureDefinition() {
+    public IStructureDefinition<MTEIsaMill> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IsaMill>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIsaMill>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -120,14 +119,13 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
                 .addElement(
                     'C',
                     ofChain(
-                        buildHatchAdder(GregtechMetaTileEntity_IsaMill.class)
-                            .adder(GregtechMetaTileEntity_IsaMill::addMillingBallsHatch)
-                            .hatchClass(GT_MetaTileEntity_Hatch_MillingBalls.class)
+                        buildHatchAdder(MTEIsaMill.class).adder(MTEIsaMill::addMillingBallsHatch)
+                            .hatchClass(MTEHatchMillingBalls.class)
                             .shouldReject(t -> !t.mMillingBallBuses.isEmpty())
                             .casingIndex(getCasingTextureIndex())
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMetaTileEntity_IsaMill.class)
+                        buildHatchAdder(MTEIsaMill.class)
                             .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Energy, Muffler)
                             .casingIndex(getCasingTextureIndex())
                             .dot(1)
@@ -188,7 +186,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_MillingBalls) {
+            if (aMetaTileEntity instanceof MTEHatchMillingBalls) {
                 return addToMachineListInternal(mMillingBallBuses, aMetaTileEntity, aBaseCasingIndex);
             }
         }
@@ -202,7 +200,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
         if (aMetaTileEntity == null) {
             return false;
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_MillingBalls) {
+        if (aMetaTileEntity instanceof MTEHatchMillingBalls) {
             log("Found GT_MetaTileEntity_Hatch_MillingBalls");
             return addToMachineListInternal(mMillingBallBuses, aMetaTileEntity, aBaseCasingIndex);
         }
@@ -378,7 +376,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IsaMill(this.mName);
+        return new MTEIsaMill(this.mName);
     }
 
     @Override
@@ -403,7 +401,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIsaMill;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIsaMill;
     }
 
     @Override
@@ -439,7 +437,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
     @Override
     public ArrayList<ItemStack> getStoredInputs() {
         ArrayList<ItemStack> tItems = super.getStoredInputs();
-        for (GT_MetaTileEntity_Hatch_MillingBalls tHatch : filterValidMTEs(mMillingBallBuses)) {
+        for (MTEHatchMillingBalls tHatch : filterValidMTEs(mMillingBallBuses)) {
             AutoMap<ItemStack> aHatchContent = tHatch.getContentUsageSlots();
             if (!aHatchContent.isEmpty()) {
                 tItems.addAll(aHatchContent);
@@ -456,14 +454,14 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
         if (mMillingBallBuses.size() != 1) {
             return null;
         } else {
-            GT_MetaTileEntity_Hatch_MillingBalls aBus = mMillingBallBuses.get(0);
+            MTEHatchMillingBalls aBus = mMillingBallBuses.get(0);
             if (aBus != null) {
                 AutoMap<ItemStack> aAvailableItems = aBus.getContentUsageSlots();
                 if (!aAvailableItems.isEmpty()) {
                     for (final ItemStack aInput : aItemInputs) {
                         if (ItemUtils.isMillingBall(aInput)) {
                             for (ItemStack aBall : aAvailableItems) {
-                                if (GT_Utility.areStacksEqual(aBall, aInput, true)) {
+                                if (GTUtility.areStacksEqual(aBall, aInput, true)) {
                                     Logger.INFO("Found a valid milling ball to use.");
                                     return aBall;
                                 }
@@ -507,7 +505,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 millingBall = findMillingBall(inputItems);
                 if (millingBall == null) {
                     return SimpleCheckRecipeResult.ofFailure("no_milling_ball");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java
index 6d1593bec9..139ea00d82 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java
@@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.item.ItemStack;
 
@@ -19,7 +19,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
@@ -27,26 +27,26 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 
-public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_NuclearSaltProcessingPlant> implements ISurvivalConstructable {
+public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase<MTENuclearSaltProcessingPlant>
+    implements ISurvivalConstructable {
 
-    protected GT_Recipe lastRecipeToBuffer;
+    protected GTRecipe lastRecipeToBuffer;
     private int casing;
-    private static IStructureDefinition<GregtechMetaTileEntity_NuclearSaltProcessingPlant> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTENuclearSaltProcessingPlant> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_NuclearSaltProcessingPlant(int aID, String aName, String aNameRegional) {
+    public MTENuclearSaltProcessingPlant(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_NuclearSaltProcessingPlant(String mName) {
+    public MTENuclearSaltProcessingPlant(String mName) {
         super(mName);
     }
 
@@ -57,7 +57,7 @@ public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity tileEntity) {
-        return new GregtechMetaTileEntity_NuclearSaltProcessingPlant(this.mName);
+        return new MTENuclearSaltProcessingPlant(this.mName);
     }
 
     @Override
@@ -67,12 +67,12 @@ public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiAutoCrafter;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAutoCrafter;
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Nuclear Salt Processing Plant")
             .addInfo("Processes depleted nuclear salts that come from the LFTR")
@@ -96,7 +96,7 @@ public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends
             .addMufflerHatch("Top Side, 2 Required", 4)
             .addEnergyHatch("Bottom Side, 2 Required", 5)
             .addMaintenanceHatch("Back Side, Opposite of Controller", 6)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -116,45 +116,43 @@ public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_NuclearSaltProcessingPlant> getStructureDefinition() {
+    public IStructureDefinition<MTENuclearSaltProcessingPlant> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_NuclearSaltProcessingPlant>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTENuclearSaltProcessingPlant>builder()
                 .addShape(
                     mName,
                     transpose(
                         new String[][] { { "AAA   AAA", "ADA   ADA", "AAA   AAA" },
                             { "ABBA ACCA", "B  AAA  C", "ABBA ACCA" }, { "ABBB~CCCA", "B       C", "ABBBFCCCA" },
                             { "ABBA ACCA", "B  AAA  C", "ABBA ACCA" }, { "AAA   AAA", "AEA   AEA", "AAA   AAA" } }))
-                .addElement('A', ofBlock(GregTech_API.sBlockCasings1, 5))
+                .addElement('A', ofBlock(GregTechAPI.sBlockCasings1, 5))
                 .addElement(
                     'B',
-                    buildHatchAdder(GregtechMetaTileEntity_NuclearSaltProcessingPlant.class)
-                        .atLeast(InputBus, InputHatch)
+                    buildHatchAdder(MTENuclearSaltProcessingPlant.class).atLeast(InputBus, InputHatch)
                         .casingIndex(TAE.getIndexFromPage(0, 10))
                         .dot(2)
                         .buildAndChain(onElementPass(x -> ++x.casing, ofBlock(ModBlocks.blockSpecialMultiCasings, 8))))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_NuclearSaltProcessingPlant.class)
-                        .atLeast(OutputBus, OutputHatch)
+                    buildHatchAdder(MTENuclearSaltProcessingPlant.class).atLeast(OutputBus, OutputHatch)
                         .casingIndex(TAE.getIndexFromPage(0, 10))
                         .dot(3)
                         .buildAndChain(onElementPass(x -> ++x.casing, ofBlock(ModBlocks.blockSpecialMultiCasings, 8))))
                 .addElement(
                     'D',
-                    buildHatchAdder(GregtechMetaTileEntity_NuclearSaltProcessingPlant.class).atLeast(Muffler)
+                    buildHatchAdder(MTENuclearSaltProcessingPlant.class).atLeast(Muffler)
                         .casingIndex(TAE.getIndexFromPage(0, 10))
                         .dot(4)
                         .buildAndChain(onElementPass(x -> ++x.casing, ofBlock(ModBlocks.blockSpecialMultiCasings, 8))))
                 .addElement(
                     'E',
-                    buildHatchAdder(GregtechMetaTileEntity_NuclearSaltProcessingPlant.class).atLeast(Energy)
+                    buildHatchAdder(MTENuclearSaltProcessingPlant.class).atLeast(Energy)
                         .casingIndex(TAE.getIndexFromPage(0, 10))
                         .dot(5)
                         .buildAndChain(onElementPass(x -> ++x.casing, ofBlock(ModBlocks.blockSpecialMultiCasings, 8))))
                 .addElement(
                     'F',
-                    buildHatchAdder(GregtechMetaTileEntity_NuclearSaltProcessingPlant.class).atLeast(Maintenance)
+                    buildHatchAdder(MTENuclearSaltProcessingPlant.class).atLeast(Maintenance)
                         .casingIndex(TAE.getIndexFromPage(0, 10))
                         .dot(6)
                         .buildAndChain(onElementPass(x -> ++x.casing, ofBlock(ModBlocks.blockSpecialMultiCasings, 8))))
@@ -198,7 +196,7 @@ public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends
 
     @Override
     public int getMaxParallelRecipes() {
-        return 2 * (Math.max(1, GT_Utility.getTier(getMaxInputVoltage())));
+        return 2 * (Math.max(1, GTUtility.getTier(getMaxInputVoltage())));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java
index 19873c9dca..d78bbc0e45 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java
@@ -5,13 +5,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofHatchAdder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,98 +30,90 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.fluid.IFluidStore;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.GasSpargingRecipe;
 import gregtech.api.util.GasSpargingRecipeMap;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-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.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_SpargeTower>
-    implements ISurvivalConstructable {
+public class MTESpargeTower extends GTPPMultiBlockBase<MTESpargeTower> implements ISurvivalConstructable {
 
     protected static final String STRUCTURE_PIECE_BASE = "base";
     protected static final String STRUCTURE_PIECE_LAYER = "layer";
     protected static final String STRUCTURE_PIECE_LAYER_HINT = "layerHint";
     protected static final String STRUCTURE_PIECE_TOP_HINT = "topHint";
-    private static final IStructureDefinition<GregtechMetaTileEntity_SpargeTower> STRUCTURE_DEFINITION;
+    private static final IStructureDefinition<MTESpargeTower> STRUCTURE_DEFINITION;
 
     static {
-        IHatchElement<GregtechMetaTileEntity_SpargeTower> layeredOutputHatch = OutputHatch
-            .withCount(GregtechMetaTileEntity_SpargeTower::getCurrentLayerOutputHatchCount)
-            .withAdder(GregtechMetaTileEntity_SpargeTower::addLayerOutputHatch);
-        STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SpargeTower>builder()
+        IHatchElement<MTESpargeTower> layeredOutputHatch = OutputHatch
+            .withCount(MTESpargeTower::getCurrentLayerOutputHatchCount)
+            .withAdder(MTESpargeTower::addLayerOutputHatch);
+        STRUCTURE_DEFINITION = StructureDefinition.<MTESpargeTower>builder()
             .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] { { "b~b", "bbb", "bbb" }, }))
             .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] { { "lll", "lcl", "lll" } }))
             .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] { { "lll", "l-l", "lll" } }))
             .addShape(STRUCTURE_PIECE_TOP_HINT, transpose(new String[][] { { "lll", "lll", "lll" } }))
             .addElement(
                 'b',
-                buildHatchAdder(GregtechMetaTileEntity_SpargeTower.class)
-                    .atLeast(Energy, InputHatch, InputBus, Maintenance)
+                buildHatchAdder(MTESpargeTower.class).atLeast(Energy, InputHatch, InputBus, Maintenance)
                     .disallowOnly(ForgeDirection.UP)
                     .casingIndex(getCasingIndex())
                     .dot(1)
                     .buildAndChain(
-                        onElementPass(
-                            GregtechMetaTileEntity_SpargeTower::onCasingFound,
-                            ofBlock(ModBlocks.blockCasings5Misc, 4))))
+                        onElementPass(MTESpargeTower::onCasingFound, ofBlock(ModBlocks.blockCasings5Misc, 4))))
             .addElement(
                 'l',
                 ofChain(
-                    buildHatchAdder(GregtechMetaTileEntity_SpargeTower.class).atLeast(layeredOutputHatch)
+                    buildHatchAdder(MTESpargeTower.class).atLeast(layeredOutputHatch)
                         .disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN)
                         .casingIndex(getCasingIndex())
                         .dot(2)
                         .build(),
-                    ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addEnergyInputToMachineList, getCasingIndex(), 2),
-                    ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addMaintenanceToMachineList, getCasingIndex(), 2),
-                    onElementPass(
-                        GregtechMetaTileEntity_SpargeTower::onCasingFound,
-                        ofBlock(ModBlocks.blockCasings5Misc, 4))))
+                    ofHatchAdder(MTESpargeTower::addEnergyInputToMachineList, getCasingIndex(), 2),
+                    ofHatchAdder(MTESpargeTower::addMaintenanceToMachineList, getCasingIndex(), 2),
+                    onElementPass(MTESpargeTower::onCasingFound, ofBlock(ModBlocks.blockCasings5Misc, 4))))
             .addElement(
                 'c',
                 ofChain(
                     onElementPass(
                         t -> t.onTopLayerFound(false),
-                        ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addOutputToMachineList, getCasingIndex(), 3)),
+                        ofHatchAdder(MTESpargeTower::addOutputToMachineList, getCasingIndex(), 3)),
                     onElementPass(
                         t -> t.onTopLayerFound(false),
-                        ofHatchAdder(
-                            GregtechMetaTileEntity_SpargeTower::addMaintenanceToMachineList,
-                            getCasingIndex(),
-                            3)),
+                        ofHatchAdder(MTESpargeTower::addMaintenanceToMachineList, getCasingIndex(), 3)),
                     onElementPass(t -> t.onTopLayerFound(true), ofBlock(ModBlocks.blockCasings5Misc, 4)),
                     isAir()))
             .build();
     }
 
-    protected final List<List<GT_MetaTileEntity_Hatch_Output>> mOutputHatchesByLayer = new ArrayList<>();
+    protected final List<List<MTEHatchOutput>> mOutputHatchesByLayer = new ArrayList<>();
     protected int mHeight;
     protected int mCasing;
     protected boolean mTopLayerFound;
 
-    public GregtechMetaTileEntity_SpargeTower(int aID, String aName, String aNameRegional) {
+    public MTESpargeTower(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_SpargeTower(String aName) {
+    public MTESpargeTower(String aName) {
         super(aName);
     }
 
@@ -131,12 +123,12 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_SpargeTower(this.mName);
+        return new MTESpargeTower(this.mName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Gas Sparge Tower")
             .addInfo("Controller block for the Sparging Tower")
             .addInfo("Runs gases through depleted molten salts to extract precious fluids")
@@ -151,7 +143,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
             .addMaintenanceHatch("Any casing", 1, 2, 3)
             .addInputHatch("2x Input Hatches (Any bottom layer casing)", 1)
             .addOutputHatch("6x Output Hatches (At least one per layer except bottom layer)", 2, 3)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -181,7 +173,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
 
     private static boolean generateRecipes() {
         for (GasSpargingRecipe aRecipe : GasSpargingRecipeMap.mRecipes) {
-            GT_Recipe newRecipe = new GT_Recipe(
+            GTRecipe newRecipe = new GTRecipe(
                 false,
                 new ItemStack[] {},
                 new ItemStack[] {},
@@ -206,12 +198,11 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
     @Override
     public @NotNull CheckRecipeResult checkProcessing() {
         ArrayList<FluidStack> tFluidList = getStoredFluids();
-        long tVoltage = GT_Utility.roundUpVoltage(this.getMaxInputVoltage());
-        byte tTier = (byte) Math.max(0, GT_Utility.getTier(tVoltage));
+        long tVoltage = GTUtility.roundUpVoltage(this.getMaxInputVoltage());
+        byte tTier = (byte) Math.max(0, GTUtility.getTier(tVoltage));
         FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]);
         if (tFluids.length > 0) {
-            GT_Recipe tRecipe = getRecipeMap()
-                .findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids);
+            GTRecipe tRecipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, GTValues.V[tTier], tFluids);
             if (tRecipe != null) {
                 FluidStack[] possibleOutputs = getPossibleByproductsOfSparge(
                     tRecipe.mFluidInputs[0],
@@ -317,7 +308,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
 
     protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity == null || aTileEntity.isDead()
-            || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output tHatch)) {
+            || !(aTileEntity.getMetaTileEntity() instanceof MTEHatchOutput tHatch)) {
             Logger.INFO("Bad Output Hatch");
             return false;
         }
@@ -343,7 +334,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_SpargeTower> getStructureDefinition() {
+    public IStructureDefinition<MTESpargeTower> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -473,9 +464,9 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
         int aLayerIndex = 0;
         PlayerUtils
             .messagePlayer(aPlayer, "Trying to clear " + mOutputHatchesByLayer.size() + " layers of output hatches.");
-        for (List<GT_MetaTileEntity_Hatch_Output> layer : this.mOutputHatchesByLayer) {
+        for (List<MTEHatchOutput> layer : this.mOutputHatchesByLayer) {
             int aHatchIndex = 0;
-            for (GT_MetaTileEntity_Hatch_Output hatch : layer) {
+            for (MTEHatchOutput hatch : layer) {
                 if (hatch.mFluid != null) {
                     PlayerUtils.messagePlayer(
                         aPlayer,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java
index cf03c6aae9..487e22f3f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java
@@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.item.ItemStack;
 
@@ -25,32 +25,31 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialElectrolyzer extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialElectrolyzer> implements ISurvivalConstructable {
+public class MTEndustrialElectrolyzer extends GTPPMultiBlockBase<MTEndustrialElectrolyzer>
+    implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialElectrolyzer> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEndustrialElectrolyzer> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialElectrolyzer(final int aID, final String aName,
-        final String aNameRegional) {
+    public MTEndustrialElectrolyzer(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialElectrolyzer(final String aName) {
+    public MTEndustrialElectrolyzer(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialElectrolyzer(this.mName);
+        return new MTEndustrialElectrolyzer(this.mName);
     }
 
     @Override
@@ -59,8 +58,8 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Electrolyzer")
             .addInfo("180% faster than using single block machines of the same voltage")
@@ -78,21 +77,21 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialElectrolyzer> getStructureDefinition() {
+    public IStructureDefinition<MTEndustrialElectrolyzer> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialElectrolyzer>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEndustrialElectrolyzer>builder()
                 .addShape(
                     mName,
                     transpose(
                         new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialElectrolyzer.class)
+                    buildHatchAdder(MTEndustrialElectrolyzer.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
                         .casingIndex(TAE.GTPP_INDEX(5))
                         .dot(1)
@@ -153,7 +152,7 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialElectrolyzer;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialElectrolyzer;
     }
 
     @Override
@@ -163,7 +162,7 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends
 
     @Override
     public int getMaxParallelRecipes() {
-        return 2 * GT_Utility.getTier(this.getMaxInputVoltage());
+        return 2 * GTUtility.getTier(this.getMaxInputVoltage());
     }
 
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java
index 0befc6f7c7..ad351caf55 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java
@@ -5,15 +5,15 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofHatchAdder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,7 +39,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.IIconContainer;
@@ -47,22 +47,22 @@ import gregtech.api.interfaces.fluid.IFluidStore;
 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_Output;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.tileentities.machines.MTEHatchOutputME;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_Adv_DistillationTower extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_DistillationTower> implements ISurvivalConstructable {
+public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillationTower>
+    implements ISurvivalConstructable {
 
     private Mode mMode = Mode.DistillationTower;
     private boolean mUpgraded = false;
@@ -72,33 +72,33 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
     protected static final String STRUCTURE_PIECE_LAYER_HINT = "layerHint";
     protected static final String STRUCTURE_PIECE_TOP_HINT = "topHint";
 
-    protected final List<List<GT_MetaTileEntity_Hatch_Output>> mOutputHatchesByLayer = new ArrayList<>();
+    protected final List<List<MTEHatchOutput>> mOutputHatchesByLayer = new ArrayList<>();
     protected int mHeight;
     protected int mCasing;
     protected boolean mTopLayerFound;
 
-    private static IStructureDefinition<GregtechMetaTileEntity_Adv_DistillationTower> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEAdvDistillationTower> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_Adv_DistillationTower(int aID, String aName, String aNameRegional) {
+    public MTEAdvDistillationTower(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_Adv_DistillationTower(String aName) {
+    public MTEAdvDistillationTower(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_Adv_DistillationTower(this.mName);
+        return new MTEAdvDistillationTower(this.mName);
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_Adv_DistillationTower> getStructureDefinition() {
+    public IStructureDefinition<MTEAdvDistillationTower> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            IHatchElement<GregtechMetaTileEntity_Adv_DistillationTower> layeredOutputHatch = OutputHatch
-                .withCount(GregtechMetaTileEntity_Adv_DistillationTower::getCurrentLayerOutputHatchCount)
-                .withAdder(GregtechMetaTileEntity_Adv_DistillationTower::addLayerOutputHatch);
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Adv_DistillationTower>builder()
+            IHatchElement<MTEAdvDistillationTower> layeredOutputHatch = OutputHatch
+                .withCount(MTEAdvDistillationTower::getCurrentLayerOutputHatchCount)
+                .withAdder(MTEAdvDistillationTower::addLayerOutputHatch);
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEAdvDistillationTower>builder()
                 .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] { { "b~b", "bbb", "bbb" }, }))
                 .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] { { "lll", "lcl", "lll" }, }))
                 .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] { { "lll", "l-l", "lll" }, }))
@@ -106,60 +106,47 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
                 .addElement(
                     'b',
                     ofChain(
-                        buildHatchAdder(GregtechMetaTileEntity_Adv_DistillationTower.class)
+                        buildHatchAdder(MTEAdvDistillationTower.class)
                             .atLeast(Energy, OutputBus, InputHatch, InputBus, Maintenance)
                             .disallowOnly(ForgeDirection.UP)
                             .casingIndex(getCasingTextureId())
                             .dot(1)
                             .build(),
-                        ofBlock(GregTech_API.sBlockCasings4, 1)))
+                        ofBlock(GregTechAPI.sBlockCasings4, 1)))
                 .addElement(
                     'l',
                     ofChain(
-                        buildHatchAdder(GregtechMetaTileEntity_Adv_DistillationTower.class)
-                            .atLeast(layeredOutputHatch, Energy, Maintenance)
+                        buildHatchAdder(MTEAdvDistillationTower.class).atLeast(layeredOutputHatch, Energy, Maintenance)
                             .disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN)
                             .casingIndex(getCasingTextureId())
                             .dot(2)
                             .build(),
-                        ofHatchAdder(
-                            GregtechMetaTileEntity_Adv_DistillationTower::addMufflerToMachineList,
-                            getCasingTextureId(),
-                            3),
-                        ofBlock(GregTech_API.sBlockCasings4, 1)))
+                        ofHatchAdder(MTEAdvDistillationTower::addMufflerToMachineList, getCasingTextureId(), 3),
+                        ofBlock(GregTechAPI.sBlockCasings4, 1)))
                 .addElement(
                     'c',
                     ofChain(
                         onElementPass(
-                            GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound,
-                            ofHatchAdder(
-                                GregtechMetaTileEntity_Adv_DistillationTower::addMufflerToMachineList,
-                                getCasingTextureId(),
-                                3)),
+                            MTEAdvDistillationTower::onTopLayerFound,
+                            ofHatchAdder(MTEAdvDistillationTower::addMufflerToMachineList, getCasingTextureId(), 3)),
                         onElementPass(
-                            GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound,
-                            ofHatchAdder(
-                                GregtechMetaTileEntity_Adv_DistillationTower::addOutputToMachineList,
-                                getCasingTextureId(),
-                                3)),
+                            MTEAdvDistillationTower::onTopLayerFound,
+                            ofHatchAdder(MTEAdvDistillationTower::addOutputToMachineList, getCasingTextureId(), 3)),
                         onElementPass(
-                            GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound,
+                            MTEAdvDistillationTower::onTopLayerFound,
                             ofHatchAdder(
-                                GregtechMetaTileEntity_Adv_DistillationTower::addMaintenanceToMachineList,
+                                MTEAdvDistillationTower::addMaintenanceToMachineList,
                                 getCasingTextureId(),
                                 3)),
-                        onElementPass(
-                            GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound,
-                            ofBlock(GregTech_API.sBlockCasings4, 1)),
+                        onElementPass(MTEAdvDistillationTower::onTopLayerFound, ofBlock(GregTechAPI.sBlockCasings4, 1)),
                         isAir()))
                 .addElement(
                     't',
-                    buildHatchAdder(GregtechMetaTileEntity_Adv_DistillationTower.class)
-                        .atLeast(layeredOutputHatch, Muffler)
+                    buildHatchAdder(MTEAdvDistillationTower.class).atLeast(layeredOutputHatch, Muffler)
                         .disallowOnly(ForgeDirection.DOWN)
                         .casingIndex(getCasingTextureId())
                         .dot(2)
-                        .buildAndChain(GregTech_API.sBlockCasings4, 1))
+                        .buildAndChain(GregTechAPI.sBlockCasings4, 1))
                 .build();
         }
         return STRUCTURE_DEFINITION;
@@ -173,7 +160,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
 
     protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity == null || aTileEntity.isDead()
-            || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output tHatch)) return false;
+            || !(aTileEntity.getMetaTileEntity() instanceof MTEHatchOutput tHatch)) return false;
         while (mOutputHatchesByLayer.size() < mHeight) mOutputHatchesByLayer.add(new ArrayList<>());
         tHatch.updateTexture(aBaseCasingIndex);
         return mOutputHatchesByLayer.get(mHeight - 1)
@@ -185,8 +172,8 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Advanced Distillation Tower")
             .addInfo("Use 85% less energy in distillery mode")
@@ -206,7 +193,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
             .addEnergyHatch("Any Casing", 1)
             .addOutputHatch("One per layer except bottom", 2)
             .addMufflerHatch("Top Casing", 3)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -317,8 +304,8 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
         if (this.mMode == Mode.Distillery)
-            return CORE.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDistillery;
-        return CORE.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDT;
+            return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDistillery;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDT;
     }
 
     @Override
@@ -360,10 +347,10 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
     public boolean addOutput(FluidStack aLiquid) {
         if (aLiquid == null) return false;
         FluidStack copiedFluidStack = aLiquid.copy();
-        for (List<GT_MetaTileEntity_Hatch_Output> hatches : mOutputHatchesByLayer) {
+        for (List<MTEHatchOutput> hatches : mOutputHatchesByLayer) {
             if (dumpFluid(hatches, copiedFluidStack, true)) return true;
         }
-        for (List<GT_MetaTileEntity_Hatch_Output> hatches : mOutputHatchesByLayer) {
+        for (List<MTEHatchOutput> hatches : mOutputHatchesByLayer) {
             if (dumpFluid(hatches, copiedFluidStack, false)) return true;
         }
         return false;
@@ -412,7 +399,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
     public int getMaxParallelRecipes() {
         return switch (mMode) {
             case DistillationTower -> getTierOfTower() == 1 ? 4 : getTierOfTower() == 2 ? 12 : 0;
-            case Distillery -> getTierOfTower() * (4 * GT_Utility.getTier(this.getMaxInputVoltage()));
+            case Distillery -> getTierOfTower() * (4 * GTUtility.getTier(this.getMaxInputVoltage()));
             default -> 0;
         };
     }
@@ -442,7 +429,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
         if (aTick % 20 == 0 && !mUpgraded) {
             ItemStack aGuiStack = this.getControllerSlot();
             if (aGuiStack != null) {
-                if (GT_Utility.areStacksEqual(aGuiStack, GregtechItemList.Distillus_Upgrade_Chip.get(1))) {
+                if (GTUtility.areStacksEqual(aGuiStack, GregtechItemList.Distillus_Upgrade_Chip.get(1))) {
                     this.mUpgraded = true;
                     mInventory[1] = ItemUtils.depleteStack(aGuiStack);
                 }
@@ -456,9 +443,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends
         return this.mOutputHatchesByLayer.stream()
             .allMatch(
                 tLayerOutputHatches -> tLayerOutputHatches.stream()
-                    .anyMatch(
-                        tHatch -> (tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME tMEHatch)
-                            && (tMEHatch.canAcceptFluid())));
+                    .anyMatch(tHatch -> (tHatch instanceof MTEHatchOutputME tMEHatch) && (tMEHatch.canAcceptFluid())));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java
index 91a1274d69..63aec37990 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java
@@ -4,16 +4,16 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofCoil;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.Objects;
@@ -43,37 +43,36 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTEHatchCustomFluidBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_EBF>
-    implements ISurvivalConstructable {
+public class MTEAdvEBF extends GTPPMultiBlockBase<MTEAdvEBF> implements ISurvivalConstructable {
 
     public static int CASING_TEXTURE_ID;
     public static String mHotFuelName = "Blazing Pyrotheum";
     public static String mCasingName = "Volcanus Casing";
     public static String mHatchName = "Pyrotheum Hatch";
-    private static IStructureDefinition<GregtechMetaTileEntity_Adv_EBF> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEAdvEBF> STRUCTURE_DEFINITION = null;
     private int mCasing;
-    private final ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mPyrotheumHatches = new ArrayList<>();
+    private final ArrayList<MTEHatchCustomFluidBase> mPyrotheumHatches = new ArrayList<>();
 
     private HeatingCoilLevel mHeatingCapacity = HeatingCoilLevel.None;
 
-    public GregtechMetaTileEntity_Adv_EBF(int aID, String aName, String aNameRegional) {
+    public MTEAdvEBF(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 11);
     }
 
-    public GregtechMetaTileEntity_Adv_EBF(String aName) {
+    public MTEAdvEBF(String aName) {
         super(aName);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 11);
     }
@@ -85,12 +84,12 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_Adv_EBF(this.mName);
+        return new MTEAdvEBF(this.mName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Factory Grade Advanced Blast Furnace")
             .addInfo("Speed: +120% | EU Usage: 90% | Parallel: 8")
@@ -108,7 +107,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
             .addMufflerHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addOtherStructurePart(mHatchName, "Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -116,15 +115,15 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
     public String[] getExtraInfoData() {
         return new String[] { StatCollector.translateToLocal("GT5U.EBF.heat") + ": "
             + EnumChatFormatting.GREEN
-            + GT_Utility.formatNumbers(mHeatingCapacity.getHeat())
+            + GTUtility.formatNumbers(mHeatingCapacity.getHeat())
             + EnumChatFormatting.RESET
             + " K" };
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_Adv_EBF> getStructureDefinition() {
+    public IStructureDefinition<MTEAdvEBF> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Adv_EBF>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEAdvEBF>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -133,22 +132,19 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
                 .addElement(
                     'C',
                     ofChain(
-                        buildHatchAdder(GregtechMetaTileEntity_Adv_EBF.class)
-                            .adder(GregtechMetaTileEntity_Adv_EBF::addPyrotheumHatch)
+                        buildHatchAdder(MTEAdvEBF.class).adder(MTEAdvEBF::addPyrotheumHatch)
                             .hatchId(968)
                             .shouldReject(x -> !x.mPyrotheumHatches.isEmpty())
                             .casingIndex(CASING_TEXTURE_ID)
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMetaTileEntity_Adv_EBF.class)
+                        buildHatchAdder(MTEAdvEBF.class)
                             .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
                             .casingIndex(CASING_TEXTURE_ID)
                             .dot(1)
                             .build(),
                         onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 11))))
-                .addElement(
-                    'H',
-                    ofCoil(GregtechMetaTileEntity_Adv_EBF::setCoilLevel, GregtechMetaTileEntity_Adv_EBF::getCoilLevel))
+                .addElement('H', ofCoil(MTEAdvEBF::setCoilLevel, MTEAdvEBF::getCoilLevel))
                 .build();
         }
         return STRUCTURE_DEFINITION;
@@ -183,9 +179,8 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase
-                && aMetaTileEntity.getBaseMetaTileEntity()
-                    .getMetaTileID() == 968) {
+            if (aMetaTileEntity instanceof MTEHatchCustomFluidBase && aMetaTileEntity.getBaseMetaTileEntity()
+                .getMetaTileID() == 968) {
                 return addToMachineListInternal(mPyrotheumHatches, aTileEntity, aBaseCasingIndex);
             }
         }
@@ -194,7 +189,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
 
     @Override
     public void updateSlots() {
-        for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mPyrotheumHatches)) tHatch.updateSlots();
+        for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mPyrotheumHatches)) tHatch.updateSlots();
         super.updateSlots();
     }
 
@@ -234,14 +229,14 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 return recipe.mSpecialValue <= getCoilLevel().getHeat() ? CheckRecipeResultRegistry.SUCCESSFUL
                     : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue);
             }
 
             @NotNull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
                 return super.createOverclockCalculator(recipe).setHeatOC(true)
                     .setHeatDiscount(true)
                     .setRecipeHeat(recipe.mSpecialValue)
@@ -259,7 +254,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiAdvEBF;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvEBF;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java
index 11f56cbd13..eed5159271 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java
@@ -13,34 +13,34 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-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_Output;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.AdvancedFusionOverclockDescriber;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.tileentities.machines.multi.MTEFusionComputer;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_FusionComputer {
+public class MTEAdvFusionMk4 extends MTEFusionComputer {
 
     public static final Method mUpdateHatchTexture;
 
     static {
-        mUpdateHatchTexture = ReflectionUtils.getMethod(GT_MetaTileEntity_Hatch.class, "updateTexture", int.class);
+        mUpdateHatchTexture = ReflectionUtils.getMethod(MTEHatch.class, "updateTexture", int.class);
     }
 
-    public GregtechMetaTileEntity_Adv_Fusion_MK4(int aID, String aName, String aNameRegional) {
+    public MTEAdvFusionMk4(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_Adv_Fusion_MK4(String aName) {
+    public MTEAdvFusionMk4(String aName) {
         super(aName);
     }
 
@@ -50,8 +50,8 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Fusion Reactor")
             .addInfo("HARNESSING THE POWER OF A BLUE GIANT")
             .addInfo("Controller block for the Fusion Reactor Mk IV")
@@ -69,7 +69,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
             .addInputHatch("2-16, Specified casings", 1)
             .addOutputHatch("1-16, Specified casings", 3)
             .addStructureInfo("ALL Hatches must be UHV or better")
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -95,7 +95,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_Adv_Fusion_MK4(mName);
+        return new MTEAdvFusionMk4(mName);
     }
 
     @Override
@@ -128,7 +128,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         if (side == facing) {
             return new ITexture[] {
-                new GT_RenderedTexture(
+                new GTRenderedTexture(
                     Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
                     Dyes.getModulation(-1, Dyes._NULL.mRGBa)),
                 TextureFactory.builder()
@@ -136,11 +136,11 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
                     .extFacing()
                     .build() };
         } else if (!aActive) {
-            return new ITexture[] { new GT_RenderedTexture(
+            return new ITexture[] { new GTRenderedTexture(
                 Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
                 Dyes.getModulation(-1, Dyes._NULL.mRGBa)) };
         } else {
-            return new ITexture[] { new GT_RenderedTexture(
+            return new ITexture[] { new GTRenderedTexture(
                 TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA,
                 Dyes.getModulation(-1, Dyes._NULL.mRGBa)) };
         }
@@ -148,7 +148,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
 
     @Override
     public ITexture getTextureOverlay() {
-        return new GT_RenderedTexture(
+        return new GTRenderedTexture(
             this.getBaseMetaTileEntity()
                 .isActive() ? TexturesGtBlock.Casing_Machine_Screen_3 : TexturesGtBlock.Casing_Machine_Screen_1);
     }
@@ -162,17 +162,17 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
     public boolean turnCasingActive(final boolean status) {
         try {
             if (this.mEnergyHatches != null) {
-                for (final GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) {
+                for (final MTEHatchEnergy hatch : this.mEnergyHatches) {
                     mUpdateHatchTexture.invoke(hatch, (status ? TAE.getIndexFromPage(2, 14) : 53));
                 }
             }
             if (this.mOutputHatches != null) {
-                for (final GT_MetaTileEntity_Hatch_Output hatch2 : this.mOutputHatches) {
+                for (final MTEHatchOutput hatch2 : this.mOutputHatches) {
                     mUpdateHatchTexture.invoke(hatch2, (status ? TAE.getIndexFromPage(2, 14) : 53));
                 }
             }
             if (this.mInputHatches != null) {
-                for (final GT_MetaTileEntity_Hatch_Input hatch3 : this.mInputHatches) {
+                for (final MTEHatchInput hatch3 : this.mInputHatches) {
                     mUpdateHatchTexture.invoke(hatch3, (status ? TAE.getIndexFromPage(2, 14) : 53));
                 }
             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk5.java
index 9b0dce3674..9ed65ffa08 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk5.java
@@ -13,34 +13,34 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-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_Output;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.AdvancedFusionOverclockDescriber;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.tileentities.machines.multi.MTEFusionComputer;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_FusionComputer {
+public class MTEAdvFusionMk5 extends MTEFusionComputer {
 
     public static final Method mUpdateHatchTexture;
 
     static {
-        mUpdateHatchTexture = ReflectionUtils.getMethod(GT_MetaTileEntity_Hatch.class, "updateTexture", int.class);
+        mUpdateHatchTexture = ReflectionUtils.getMethod(MTEHatch.class, "updateTexture", int.class);
     }
 
-    public GregtechMetaTileEntity_Adv_Fusion_MK5(int aID, String aName, String aNameRegional) {
+    public MTEAdvFusionMk5(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_Adv_Fusion_MK5(String aName) {
+    public MTEAdvFusionMk5(String aName) {
         super(aName);
     }
 
@@ -50,8 +50,8 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Fusion Reactor")
             .addInfo("HARNESSING THE POWER OF A NEUTRON STAR")
             .addInfo("Controller block for the Fusion Reactor Mk V")
@@ -69,7 +69,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus
             .addInputHatch("2-16, Specified casings", 1)
             .addOutputHatch("1-16, Specified casings", 3)
             .addStructureInfo("ALL Hatches must be UEV or better")
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -95,7 +95,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_Adv_Fusion_MK5(mName);
+        return new MTEAdvFusionMk5(mName);
     }
 
     @Override
@@ -128,7 +128,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         if (side == facing) {
             return new ITexture[] {
-                new GT_RenderedTexture(
+                new GTRenderedTexture(
                     Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
                     Dyes.getModulation(-1, Dyes._NULL.mRGBa)),
                 TextureFactory.builder()
@@ -136,11 +136,11 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus
                     .extFacing()
                     .build() };
         } else if (!aActive) {
-            return new ITexture[] { new GT_RenderedTexture(
+            return new ITexture[] { new GTRenderedTexture(
                 Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
                 Dyes.getModulation(-1, Dyes._NULL.mRGBa)) };
         } else {
-            return new ITexture[] { new GT_RenderedTexture(
+            return new ITexture[] { new GTRenderedTexture(
                 TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_HYPER,
                 Dyes.getModulation(-1, Dyes._NULL.mRGBa)) };
         }
@@ -148,7 +148,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus
 
     @Override
     public ITexture getTextureOverlay() {
-        return new GT_RenderedTexture(
+        return new GTRenderedTexture(
             this.getBaseMetaTileEntity()
                 .isActive() ? TexturesGtBlock.Casing_Machine_Screen_Rainbow : TexturesGtBlock.Casing_Machine_Screen_1);
     }
@@ -162,17 +162,17 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus
     public boolean turnCasingActive(final boolean status) {
         try {
             if (this.mEnergyHatches != null) {
-                for (final GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) {
+                for (final MTEHatchEnergy hatch : this.mEnergyHatches) {
                     mUpdateHatchTexture.invoke(hatch, (status ? TAE.getIndexFromPage(3, 6) : 53));
                 }
             }
             if (this.mOutputHatches != null) {
-                for (final GT_MetaTileEntity_Hatch_Output hatch2 : this.mOutputHatches) {
+                for (final MTEHatchOutput hatch2 : this.mOutputHatches) {
                     mUpdateHatchTexture.invoke(hatch2, (status ? TAE.getIndexFromPage(3, 6) : 53));
                 }
             }
             if (this.mInputHatches != null) {
-                for (final GT_MetaTileEntity_Hatch_Input hatch3 : this.mInputHatches) {
+                for (final MTEHatchInput hatch3 : this.mInputHatches) {
                     mUpdateHatchTexture.invoke(hatch3, (status ? TAE.getIndexFromPage(3, 6) : 53));
                 }
             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java
index f8579957f3..0779c03183 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java
@@ -4,7 +4,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofHatchAdder;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
@@ -20,37 +20,36 @@ import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-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.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.registries.LHECoolantRegistry;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.block.base.BlockBaseModular;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.core.material.MaterialsAlloy;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_Adv_HeatExchanger
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_HeatExchanger> {
+public class MTEAdvHeatExchanger extends GTPPMultiBlockBase<MTEAdvHeatExchanger> {
 
     private static final int CASING_INDEX = TAE.getIndexFromPage(1, 12);
     private static final String STRUCTURE_PIECE_MAIN = "main";
 
-    private static final IStructureDefinition<GregtechMetaTileEntity_Adv_HeatExchanger> STRUCTURE_DEFINITION = StructureDefinition
-        .<GregtechMetaTileEntity_Adv_HeatExchanger>builder()
+    private static final IStructureDefinition<MTEAdvHeatExchanger> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEAdvHeatExchanger>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(
@@ -60,61 +59,49 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
                     { " c~c ", "cPPPc", "cPPPc", "cPPPc", " ccc " }, { " hhh ", "hHHHh", "hHHHh", "hHHHh", " hhh " },
                     { " f f ", "f   f", "     ", "f   f", " f f " },
                     { " f f ", "f   f", "     ", "f   f", " f f " }, }))
-        .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15))
+        .addElement('P', ofBlock(GregTechAPI.sBlockCasings2, 15))
         .addElement('f', ofBlock(getFrame(), 0))
         .addElement(
             'C',
             ofChain(
-                ofHatchAdder(
-                    GregtechMetaTileEntity_Adv_HeatExchanger::addColdFluidOutputToMachineList,
-                    CASING_INDEX,
-                    2),
-                onElementPass(
-                    GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
-                    ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
+                ofHatchAdder(MTEAdvHeatExchanger::addColdFluidOutputToMachineList, CASING_INDEX, 2),
+                onElementPass(MTEAdvHeatExchanger::onCasingAdded, ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
         .addElement(
             'H',
             ofChain(
-                ofHatchAdder(GregtechMetaTileEntity_Adv_HeatExchanger::addHotFluidInputToMachineList, CASING_INDEX, 3),
-                onElementPass(
-                    GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
-                    ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
+                ofHatchAdder(MTEAdvHeatExchanger::addHotFluidInputToMachineList, CASING_INDEX, 3),
+                onElementPass(MTEAdvHeatExchanger::onCasingAdded, ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
         .addElement(
             'h',
             ofChain(
-                ofHatchAdder(GregtechMetaTileEntity_Adv_HeatExchanger::addInputToMachineList, CASING_INDEX, 1),
-                ofHatchAdder(GregtechMetaTileEntity_Adv_HeatExchanger::addOutputToMachineList, CASING_INDEX, 1),
-                ofHatchAdder(GregtechMetaTileEntity_Adv_HeatExchanger::addMaintenanceToMachineList, CASING_INDEX, 1),
-                onElementPass(
-                    GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
-                    ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
+                ofHatchAdder(MTEAdvHeatExchanger::addInputToMachineList, CASING_INDEX, 1),
+                ofHatchAdder(MTEAdvHeatExchanger::addOutputToMachineList, CASING_INDEX, 1),
+                ofHatchAdder(MTEAdvHeatExchanger::addMaintenanceToMachineList, CASING_INDEX, 1),
+                onElementPass(MTEAdvHeatExchanger::onCasingAdded, ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
         .addElement(
             'c',
-            ofChain(
-                onElementPass(
-                    GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
-                    ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
+            ofChain(onElementPass(MTEAdvHeatExchanger::onCasingAdded, ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
         .build();
     public static float penalty_per_config = 0.015f; // penalize 1.5% efficiency per circuitry level (1-25)
 
-    private GT_MetaTileEntity_Hatch_Input mInputHotFluidHatch;
-    private GT_MetaTileEntity_Hatch_Output mOutputColdFluidHatch;
+    private MTEHatchInput mInputHotFluidHatch;
+    private MTEHatchOutput mOutputColdFluidHatch;
     private boolean superheated = false;
     private int superheated_threshold = 0;
     private float water;
     private int mCasingAmount;
 
-    public GregtechMetaTileEntity_Adv_HeatExchanger(int aID, String aName, String aNameRegional) {
+    public MTEAdvHeatExchanger(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_Adv_HeatExchanger(String aName) {
+    public MTEAdvHeatExchanger(String aName) {
         super(aName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the XL Heat Exchanger")
             .addInfo("More complicated than a Fusion Reactor. Seriously")
@@ -138,7 +125,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
             .addInputHatch("Distilled water, any bottom layer casing", 1)
             .addOutputHatch("Cold fluid, top center", 3)
             .addOutputHatch("Steam/SH Steam, any bottom layer casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -254,7 +241,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
                 // tGeneratedEU = distilledConsumed * 160; // EXACTLY how much steam to generate, producing a perfect
                 // 1:160 ratio with distilled water consumption
 
-                FluidStack distilledStack = GT_ModHandler.getDistilledWater(distilledConsumed);
+                FluidStack distilledStack = GTModHandler.getDistilledWater(distilledConsumed);
                 if (depleteInput(distilledStack)) // Consume the distilled water
                 {
                     if (superheated) {
@@ -262,10 +249,10 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
                                                                                                      // superheated
                                                                                                      // steam
                     } else {
-                        addOutput(GT_ModHandler.getSteam(tGeneratedEU)); // Generate regular steam
+                        addOutput(GTModHandler.getSteam(tGeneratedEU)); // Generate regular steam
                     }
                 } else {
-                    GT_Log.exp.println(this.mName + " had no more Distilled water!");
+                    GTLog.exp.println(this.mName + " had no more Distilled water!");
                     explodeMultiblock(); // Generate crater
                 }
             }
@@ -275,7 +262,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_Adv_HeatExchanger> getStructureDefinition() {
+    public IStructureDefinition<MTEAdvHeatExchanger> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -295,9 +282,9 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) {
-            ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-            mOutputColdFluidHatch = (GT_MetaTileEntity_Hatch_Output) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchOutput) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            mOutputColdFluidHatch = (MTEHatchOutput) aMetaTileEntity;
             return true;
         }
         return false;
@@ -307,10 +294,10 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-            ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-            ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = getRecipeMap();
-            mInputHotFluidHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchInput) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            ((MTEHatchInput) aMetaTileEntity).mRecipeMap = getRecipeMap();
+            mInputHotFluidHatch = (MTEHatchInput) aMetaTileEntity;
             return true;
         }
         return false;
@@ -333,7 +320,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_Adv_HeatExchanger(this.mName);
+        return new MTEAdvHeatExchanger(this.mName);
     }
 
     @Override
@@ -346,18 +333,18 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
         return new String[] {
             StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mProgresstime / 20)
+                + GTUtility.formatNumbers(mProgresstime / 20)
                 + EnumChatFormatting.RESET
                 + " s / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mMaxProgresstime / 20)
+                + GTUtility.formatNumbers(mMaxProgresstime / 20)
                 + EnumChatFormatting.RESET
                 + " s",
             StatCollector.translateToLocal("GT5U.multiblock.usage") + " "
                 + StatCollector.translateToLocal("GT5U.LHE.steam")
                 + ": "
                 + (superheated ? EnumChatFormatting.RED : EnumChatFormatting.YELLOW)
-                + GT_Utility.formatNumbers(superheated ? -2 * lEUt : -lEUt)
+                + GTUtility.formatNumbers(superheated ? -2 * lEUt : -lEUt)
                 + EnumChatFormatting.RESET
                 + " EU/t",
             StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
@@ -379,7 +366,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
                 + StatCollector.translateToLocal("GT5U.LHE.threshold")
                 + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(superheated_threshold)
+                + GTUtility.formatNumbers(superheated_threshold)
                 + EnumChatFormatting.RESET };
     }
 
@@ -402,7 +389,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
 
     public static Block getFrame() {
         if (sFrame == null) {
-            sFrame = BlockBaseModular.getMaterialBlock(ALLOY.TALONITE, BlockTypes.FRAME);
+            sFrame = BlockBaseModular.getMaterialBlock(MaterialsAlloy.TALONITE, BlockTypes.FRAME);
         }
         return sFrame;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java
index a2bb155809..109022932d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java
@@ -4,13 +4,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.GregTech_API.sBlockCasings4;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.GregTechAPI.sBlockCasings4;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.item.ItemStack;
 
@@ -24,29 +24,28 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_Adv_Implosion
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_Implosion> {
+public class MTEAdvImplosionCompressor extends GTPPMultiBlockBase<MTEAdvImplosionCompressor> {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_Adv_Implosion> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEAdvImplosionCompressor> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_Adv_Implosion(int aID, String aName, String aNameRegional) {
+    public MTEAdvImplosionCompressor(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_Adv_Implosion(String aName) {
+    public MTEAdvImplosionCompressor(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_Adv_Implosion(this.mName);
+        return new MTEAdvImplosionCompressor(this.mName);
     }
 
     @Override
@@ -55,8 +54,8 @@ public class GregtechMetaTileEntity_Adv_Implosion
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Factory Grade Advanced Implosion Compressor")
             .addInfo("Speed: +100% | EU Usage: 100% | Parallel: ((Tier/2)+1)")
@@ -71,14 +70,14 @@ public class GregtechMetaTileEntity_Adv_Implosion
             .addEnergyHatch("Any casing", 1)
             .addMaintenanceHatch("Any casing", 1)
             .addMufflerHatch("Any casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_Adv_Implosion> getStructureDefinition() {
+    public IStructureDefinition<MTEAdvImplosionCompressor> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Adv_Implosion>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEAdvImplosionCompressor>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -86,7 +85,7 @@ public class GregtechMetaTileEntity_Adv_Implosion
                 .addElement(
                     'C',
                     ofChain(
-                        buildHatchAdder(GregtechMetaTileEntity_Adv_Implosion.class)
+                        buildHatchAdder(MTEAdvImplosionCompressor.class)
                             .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
                             .casingIndex(48)
                             .dot(1)
@@ -156,7 +155,7 @@ public class GregtechMetaTileEntity_Adv_Implosion
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiAdvImplosion;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvImplosion;
     }
 
     @Override
@@ -171,7 +170,7 @@ public class GregtechMetaTileEntity_Adv_Implosion
 
     @Override
     public int getMaxParallelRecipes() {
-        return (GT_Utility.getTier(this.getMaxInputVoltage()) / 2 + 1);
+        return (GTUtility.getTier(this.getMaxInputVoltage()) / 2 + 1);
     }
 
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java
index 644893964b..7d2628d958 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java
@@ -1,10 +1,10 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.GregTech_API.*;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorEvgenWarGold;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.GregTechAPI.*;
+import static gregtech.api.enums.GTValues.AuthorEvgenWarGold;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,42 +34,41 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 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.SoundResource;
 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.logic.ProcessingLogic;
-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.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.common.blocks.GT_Block_Casings1;
-import gregtech.common.blocks.GT_Block_Casings2;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.common.blocks.BlockCasings1;
+import gregtech.common.blocks.BlockCasings2;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_SteamCentrifuge
-    extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamCentrifuge> implements ISurvivalConstructable {
+public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> implements ISurvivalConstructable {
 
-    public GregtechMetaTileEntity_SteamCentrifuge(String aName) {
+    public MTESteamCentrifuge(String aName) {
         super(aName);
     }
 
-    public GregtechMetaTileEntity_SteamCentrifuge(int aID, String aName, String aNameRegional) {
+    public MTESteamCentrifuge(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_SteamCentrifuge(this.mName);
+        return new MTESteamCentrifuge(this.mName);
     }
 
     @Override
@@ -79,7 +78,7 @@ public class GregtechMetaTileEntity_SteamCentrifuge
 
     private static final String STRUCTUR_PIECE_MAIN = "main";
 
-    private IStructureDefinition<GregtechMetaTileEntity_SteamCentrifuge> STRUCTURE_DEFINITION = null;
+    private IStructureDefinition<MTESteamCentrifuge> STRUCTURE_DEFINITION = null;
     // spotless:off
     private final String[][] shape = new String[][] {
         { " AAA ", "AAAAA", "AAAAA", "AAAAA", " AAA " },
@@ -133,16 +132,16 @@ public class GregtechMetaTileEntity_SteamCentrifuge
     }
 
     protected void updateHatchTexture() {
-        for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mOutputHatches) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mOutputHatches) h.updateTexture(getCasingTextureID());
     }
 
     private int getCasingTextureID() {
         if (tierGearBoxCasing == 2 || tierPipeCasing == 2 || tierFireBoxCasing == 2 || tierMachineCasing == 2)
-            return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0);
-        return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10);
+            return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0);
+        return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10);
     }
 
     @Override
@@ -156,13 +155,13 @@ public class GregtechMetaTileEntity_SteamCentrifuge
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlay() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE);
+    protected GTRenderedTexture getFrontOverlay() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE);
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlayActive() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE);
+    protected GTRenderedTexture getFrontOverlayActive() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE);
     }
 
     @Override
@@ -176,16 +175,16 @@ public class GregtechMetaTileEntity_SteamCentrifuge
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_SteamCentrifuge> getStructureDefinition() {
+    public IStructureDefinition<MTESteamCentrifuge> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
 
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamCentrifuge>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTESteamCentrifuge>builder()
 
                 .addShape(STRUCTUR_PIECE_MAIN, transpose(shape))
                 .addElement(
                     'B',
                     ofBlocksTiered(
-                        GregtechMetaTileEntity_SteamCentrifuge::getTierGearBoxCasing,
+                        MTESteamCentrifuge::getTierGearBoxCasing,
                         ImmutableList.of(Pair.of(sBlockCasings2, 2), Pair.of(sBlockCasings2, 3)),
                         -1,
                         (t, m) -> t.tierGearBoxCasing = m,
@@ -193,7 +192,7 @@ public class GregtechMetaTileEntity_SteamCentrifuge
                 .addElement(
                     'C',
                     ofBlocksTiered(
-                        GregtechMetaTileEntity_SteamCentrifuge::getTierPipeCasing,
+                        MTESteamCentrifuge::getTierPipeCasing,
                         ImmutableList.of(Pair.of(sBlockCasings2, 12), Pair.of(sBlockCasings2, 13)),
                         -1,
                         (t, m) -> t.tierPipeCasing = m,
@@ -201,7 +200,7 @@ public class GregtechMetaTileEntity_SteamCentrifuge
                 .addElement(
                     'D',
                     ofBlocksTiered(
-                        GregtechMetaTileEntity_SteamCentrifuge::getTierFireBoxCasing,
+                        MTESteamCentrifuge::getTierFireBoxCasing,
                         ImmutableList.of(Pair.of(sBlockCasings3, 13), Pair.of(sBlockCasings3, 14)),
                         -1,
                         (t, m) -> t.tierFireBoxCasing = m,
@@ -209,10 +208,10 @@ public class GregtechMetaTileEntity_SteamCentrifuge
                 .addElement(
                     'A',
                     ofChain(
-                        buildSteamInput(GregtechMetaTileEntity_SteamCentrifuge.class).casingIndex(10)
+                        buildSteamInput(MTESteamCentrifuge.class).casingIndex(10)
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMetaTileEntity_SteamCentrifuge.class)
+                        buildHatchAdder(MTESteamCentrifuge.class)
                             .atLeast(SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam, OutputHatch)
                             .casingIndex(10)
                             .dot(1)
@@ -302,7 +301,7 @@ public class GregtechMetaTileEntity_SteamCentrifuge
 
             @Nonnull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 if (availableVoltage < recipe.mEUt) {
                     return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt);
                 }
@@ -311,8 +310,8 @@ public class GregtechMetaTileEntity_SteamCentrifuge
 
             @Override
             @Nonnull
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
-                return GT_OverclockCalculator.ofNoOverclock(recipe)
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
+                return OverclockCalculator.ofNoOverclock(recipe)
                     .setEUtDiscount(1.33F)
                     .setSpeedBoost(1.5F);
             }
@@ -325,8 +324,8 @@ public class GregtechMetaTileEntity_SteamCentrifuge
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Steam Centrifuge")
             .addInfo("33.3% faster than a single block steam machine would run.")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java
index f2debf5981..9588a5d11a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java
@@ -3,9 +3,9 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.GregTech_API.sBlockCasings1;
-import static gregtech.api.GregTech_API.sBlockCasings2;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.GregTechAPI.sBlockCasings1;
+import static gregtech.api.GregTechAPI.sBlockCasings2;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,43 +35,42 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 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.SoundResource;
 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.logic.ProcessingLogic;
-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.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.common.blocks.GT_Block_Casings1;
-import gregtech.common.blocks.GT_Block_Casings2;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.common.blocks.BlockCasings1;
+import gregtech.common.blocks.BlockCasings2;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_SteamCompressor
-    extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamCompressor> implements ISurvivalConstructable {
+public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> implements ISurvivalConstructable {
 
-    public GregtechMetaTileEntity_SteamCompressor(String aName) {
+    public MTESteamCompressor(String aName) {
         super(aName);
     }
 
-    public GregtechMetaTileEntity_SteamCompressor(int aID, String aName, String aNameRegional) {
+    public MTESteamCompressor(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) {
-        return new GregtechMetaTileEntity_SteamCompressor(this.mName);
+        return new MTESteamCompressor(this.mName);
     }
 
     @Override
@@ -81,7 +80,7 @@ public class GregtechMetaTileEntity_SteamCompressor
 
     private static final String STRUCTUR_PIECE_MAIN = "main";
 
-    private IStructureDefinition<GregtechMetaTileEntity_SteamCompressor> STRUCTURE_DEFINITION = null;
+    private IStructureDefinition<MTESteamCompressor> STRUCTURE_DEFINITION = null;
 
     // spotless:off
     private final String[][] shape = new String[][] {
@@ -113,14 +112,14 @@ public class GregtechMetaTileEntity_SteamCompressor
     }
 
     protected void updateHatchTexture() {
-        for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
     }
 
     private int getCasingTextureID() {
-        if (tierMachineCasing == 2) return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0);
-        return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10);
+        if (tierMachineCasing == 2) return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0);
+        return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10);
     }
 
     @Override
@@ -134,13 +133,13 @@ public class GregtechMetaTileEntity_SteamCompressor
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlay() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR);
+    protected GTRenderedTexture getFrontOverlay() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR);
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlayActive() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE);
+    protected GTRenderedTexture getFrontOverlayActive() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE);
     }
 
     @Override
@@ -154,17 +153,17 @@ public class GregtechMetaTileEntity_SteamCompressor
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_SteamCompressor> getStructureDefinition() {
+    public IStructureDefinition<MTESteamCompressor> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamCompressor>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTESteamCompressor>builder()
                 .addShape(STRUCTUR_PIECE_MAIN, transpose(shape))
                 .addElement(
                     'C',
                     ofChain(
-                        buildSteamInput(GregtechMetaTileEntity_SteamCompressor.class).casingIndex(10)
+                        buildSteamInput(MTESteamCompressor.class).casingIndex(10)
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMetaTileEntity_SteamCompressor.class)
+                        buildHatchAdder(MTESteamCompressor.class)
                             .atLeast(SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam)
                             .casingIndex(10)
                             .dot(1)
@@ -243,7 +242,7 @@ public class GregtechMetaTileEntity_SteamCompressor
 
             @Nonnull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 if (availableVoltage < recipe.mEUt) {
                     return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt);
                 }
@@ -252,8 +251,8 @@ public class GregtechMetaTileEntity_SteamCompressor
 
             @Override
             @Nonnull
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
-                return GT_OverclockCalculator.ofNoOverclock(recipe)
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
+                return OverclockCalculator.ofNoOverclock(recipe)
                     .setEUtDiscount(1.33F)
                     .setSpeedBoost(1.5F);
             }
@@ -266,8 +265,8 @@ public class GregtechMetaTileEntity_SteamCompressor
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Steam Compressor")
             .addInfo("33.3% faster than using a single block Steam Compressor.")
@@ -293,7 +292,7 @@ public class GregtechMetaTileEntity_SteamCompressor
             .addStructureInfo(
                 EnumChatFormatting.GOLD + "25-30x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing")
             .addStructureInfo("")
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java
index c444743ca9..76e3ade135 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamForgeHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java
@@ -3,10 +3,10 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.GregTech_API.sBlockCasings1;
-import static gregtech.api.GregTech_API.sBlockCasings2;
-import static gregtech.api.enums.GT_Values.AuthorEvgenWarGold;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.GregTechAPI.sBlockCasings1;
+import static gregtech.api.GregTechAPI.sBlockCasings2;
+import static gregtech.api.enums.GTValues.AuthorEvgenWarGold;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,42 +37,41 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 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.SoundResource;
 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.logic.ProcessingLogic;
-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.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.common.blocks.GT_Block_Casings1;
-import gregtech.common.blocks.GT_Block_Casings2;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.common.blocks.BlockCasings1;
+import gregtech.common.blocks.BlockCasings2;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_SteamForgeHammer
-    extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamForgeHammer> implements ISurvivalConstructable {
+public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer> implements ISurvivalConstructable {
 
-    public GregtechMetaTileEntity_SteamForgeHammer(String aName) {
+    public MTESteamForgeHammer(String aName) {
         super(aName);
     }
 
-    public GregtechMetaTileEntity_SteamForgeHammer(int aID, String aName, String aNameRegional) {
+    public MTESteamForgeHammer(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_SteamForgeHammer(this.mName);
+        return new MTESteamForgeHammer(this.mName);
     }
 
     @Override
@@ -82,7 +81,7 @@ public class GregtechMetaTileEntity_SteamForgeHammer
 
     private static final String STRUCTUR_PIECE_MAIN = "main";
 
-    private IStructureDefinition<GregtechMetaTileEntity_SteamForgeHammer> STRUCTURE_DEFINITION = null;
+    private IStructureDefinition<MTESteamForgeHammer> STRUCTURE_DEFINITION = null;
 
     // spotless:off
     private final String[][] shape = new String[][] {
@@ -110,7 +109,7 @@ public class GregtechMetaTileEntity_SteamForgeHammer
 
     public static int getTierSimpleBlock(Block block, int meta) {
         if (block == Blocks.iron_block && meta == 0) return 1;
-        if (block == GregTech_API.sBlockMetal6 && meta == 13) return 2;
+        if (block == GregTechAPI.sBlockMetal6 && meta == 13) return 2;
         return 0;
     }
 
@@ -133,15 +132,15 @@ public class GregtechMetaTileEntity_SteamForgeHammer
     }
 
     protected void updateHatchTexture() {
-        for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
     }
 
     private int getCasingTextureID() {
         if (tierPipeCasing == 2 || tierMachineCasing == 2 || tierSimpleBlock == 2)
-            return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0);
-        return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10);
+            return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0);
+        return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10);
     }
 
     @Override
@@ -155,13 +154,13 @@ public class GregtechMetaTileEntity_SteamForgeHammer
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlay() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_FORGE_HAMMER);
+    protected GTRenderedTexture getFrontOverlay() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_FORGE_HAMMER);
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlayActive() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_FORGE_HAMMER_ACTIVE);
+    protected GTRenderedTexture getFrontOverlayActive() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_FORGE_HAMMER_ACTIVE);
     }
 
     @Override
@@ -175,16 +174,16 @@ public class GregtechMetaTileEntity_SteamForgeHammer
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_SteamForgeHammer> getStructureDefinition() {
+    public IStructureDefinition<MTESteamForgeHammer> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
 
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamForgeHammer>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTESteamForgeHammer>builder()
 
                 .addShape(STRUCTUR_PIECE_MAIN, transpose(shape))
                 .addElement(
                     'B',
                     ofBlocksTiered(
-                        GregtechMetaTileEntity_SteamForgeHammer::getTierPipeCasing,
+                        MTESteamForgeHammer::getTierPipeCasing,
                         ImmutableList.of(Pair.of(sBlockCasings2, 12), Pair.of(sBlockCasings2, 13)),
                         -1,
                         (t, m) -> t.tierPipeCasing = m,
@@ -192,18 +191,18 @@ public class GregtechMetaTileEntity_SteamForgeHammer
                 .addElement(
                     'C',
                     ofBlocksTiered(
-                        GregtechMetaTileEntity_SteamForgeHammer::getTierSimpleBlock,
-                        ImmutableList.of(Pair.of(Blocks.iron_block, 0), Pair.of(GregTech_API.sBlockMetal6, 13)),
+                        MTESteamForgeHammer::getTierSimpleBlock,
+                        ImmutableList.of(Pair.of(Blocks.iron_block, 0), Pair.of(GregTechAPI.sBlockMetal6, 13)),
                         -1,
                         (t, m) -> t.tierSimpleBlock = m,
                         t -> t.tierSimpleBlock))
                 .addElement(
                     'A',
                     ofChain(
-                        buildSteamInput(GregtechMetaTileEntity_SteamForgeHammer.class).casingIndex(10)
+                        buildSteamInput(MTESteamForgeHammer.class).casingIndex(10)
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMetaTileEntity_SteamForgeHammer.class)
+                        buildHatchAdder(MTESteamForgeHammer.class)
                             .atLeast(SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam)
                             .casingIndex(10)
                             .dot(1)
@@ -296,7 +295,7 @@ public class GregtechMetaTileEntity_SteamForgeHammer
 
             @Nonnull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 if (availableVoltage < recipe.mEUt) {
                     return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt);
                 }
@@ -305,8 +304,8 @@ public class GregtechMetaTileEntity_SteamForgeHammer
 
             @Override
             @Nonnull
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
-                return GT_OverclockCalculator.ofNoOverclock(recipe)
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
+                return OverclockCalculator.ofNoOverclock(recipe)
                     .setEUtDiscount(1.33F)
                     .setSpeedBoost(1.5F);
             }
@@ -319,8 +318,8 @@ public class GregtechMetaTileEntity_SteamForgeHammer
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Steam Forge Hammer")
             .addInfo("33.3% faster than a single block steam machine would run.")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java
index 3a055d7403..43e6245557 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java
@@ -3,9 +3,9 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.GregTech_API.sBlockCasings1;
-import static gregtech.api.GregTech_API.sBlockCasings2;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.GregTechAPI.sBlockCasings1;
+import static gregtech.api.GregTechAPI.sBlockCasings2;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,43 +35,42 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 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.SoundResource;
 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.logic.ProcessingLogic;
-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.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.common.blocks.GT_Block_Casings1;
-import gregtech.common.blocks.GT_Block_Casings2;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.common.blocks.BlockCasings1;
+import gregtech.common.blocks.BlockCasings2;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_SteamMacerator
-    extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamMacerator> implements ISurvivalConstructable {
+public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> implements ISurvivalConstructable {
 
-    public GregtechMetaTileEntity_SteamMacerator(String aName) {
+    public MTESteamMacerator(String aName) {
         super(aName);
     }
 
-    public GregtechMetaTileEntity_SteamMacerator(int aID, String aName, String aNameRegional) {
+    public MTESteamMacerator(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) {
-        return new GregtechMetaTileEntity_SteamMacerator(this.mName);
+        return new MTESteamMacerator(this.mName);
     }
 
     @Override
@@ -81,7 +80,7 @@ public class GregtechMetaTileEntity_SteamMacerator
 
     private static final String STRUCTUR_PIECE_MAIN = "main";
 
-    private IStructureDefinition<GregtechMetaTileEntity_SteamMacerator> STRUCTURE_DEFINITION = null;
+    private IStructureDefinition<MTESteamMacerator> STRUCTURE_DEFINITION = null;
 
     private final String[][] shape = new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
         { "CCC", "CCC", "CCC" } };
@@ -110,14 +109,14 @@ public class GregtechMetaTileEntity_SteamMacerator
     }
 
     protected void updateHatchTexture() {
-        for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
     }
 
     private int getCasingTextureID() {
-        if (tierMachineCasing == 2) return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0);
-        return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10);
+        if (tierMachineCasing == 2) return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0);
+        return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10);
     }
 
     @Override
@@ -131,13 +130,13 @@ public class GregtechMetaTileEntity_SteamMacerator
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlay() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR);
+    protected GTRenderedTexture getFrontOverlay() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR);
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlayActive() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE);
+    protected GTRenderedTexture getFrontOverlayActive() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE);
     }
 
     @Override
@@ -151,17 +150,17 @@ public class GregtechMetaTileEntity_SteamMacerator
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_SteamMacerator> getStructureDefinition() {
+    public IStructureDefinition<MTESteamMacerator> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamMacerator>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTESteamMacerator>builder()
                 .addShape(STRUCTUR_PIECE_MAIN, transpose(shape))
                 .addElement(
                     'C',
                     ofChain(
-                        buildSteamInput(GregtechMetaTileEntity_SteamMacerator.class).casingIndex(10)
+                        buildSteamInput(MTESteamMacerator.class).casingIndex(10)
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMetaTileEntity_SteamMacerator.class)
+                        buildHatchAdder(MTESteamMacerator.class)
                             .atLeast(SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam)
                             .casingIndex(10)
                             .dot(1)
@@ -244,7 +243,7 @@ public class GregtechMetaTileEntity_SteamMacerator
 
             @Nonnull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 if (availableVoltage < recipe.mEUt) {
                     return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt);
                 }
@@ -254,8 +253,8 @@ public class GregtechMetaTileEntity_SteamMacerator
             // note that a basic steam machine has .setEUtDiscount(2F).setSpeedBoost(2F). So these here are bonuses.
             @Override
             @Nonnull
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
-                return GT_OverclockCalculator.ofNoOverclock(recipe)
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
+                return OverclockCalculator.ofNoOverclock(recipe)
                     .setEUtDiscount(1.33F)
                     .setSpeedBoost(1.5F);
             }
@@ -268,8 +267,8 @@ public class GregtechMetaTileEntity_SteamMacerator
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Steam Macerator")
             .addInfo("33.3% faster than using a single block Steam Macerator.")
@@ -295,7 +294,7 @@ public class GregtechMetaTileEntity_SteamMacerator
             .addStructureInfo(
                 EnumChatFormatting.GOLD + "14-22x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing")
             .addStructureInfo("")
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java
index ae91b28152..1fc6e55042 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMixer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java
@@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.GregTech_API.sBlockCasings1;
-import static gregtech.api.GregTech_API.sBlockCasings2;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorEvgenWarGold;
+import static gregtech.api.GregTechAPI.sBlockCasings1;
+import static gregtech.api.GregTechAPI.sBlockCasings2;
+import static gregtech.api.enums.GTValues.AuthorEvgenWarGold;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Mods.EnderIO;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45,42 +45,41 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
 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.logic.ProcessingLogic;
-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.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.common.blocks.GT_Block_Casings1;
-import gregtech.common.blocks.GT_Block_Casings2;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.common.blocks.BlockCasings1;
+import gregtech.common.blocks.BlockCasings2;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamMixer>
-    implements ISurvivalConstructable {
+public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements ISurvivalConstructable {
 
-    public GregtechMetaTileEntity_SteamMixer(String aName) {
+    public MTESteamMixer(String aName) {
         super(aName);
     }
 
-    public GregtechMetaTileEntity_SteamMixer(int aID, String aName, String aNameRegional) {
+    public MTESteamMixer(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_SteamMixer(this.mName);
+        return new MTESteamMixer(this.mName);
     }
 
     @Override
@@ -90,7 +89,7 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa
 
     private static final String STRUCTUR_PIECE_MAIN = "main";
 
-    private IStructureDefinition<GregtechMetaTileEntity_SteamMixer> STRUCTURE_DEFINITION = null;
+    private IStructureDefinition<MTESteamMixer> STRUCTURE_DEFINITION = null;
     // spotless:off
     private final String[][] shape = new String[][]{
         {"       ","   A   ","   A   "," AAAAA ","   A   ","   A   ","       "},
@@ -161,17 +160,17 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa
     }
 
     protected void updateHatchTexture() {
-        for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mOutputHatches) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mInputHatches) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mOutputHatches) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mInputHatches) h.updateTexture(getCasingTextureID());
     }
 
     private int getCasingTextureID() {
         if (tierGearBoxCasing == 2 || tierPipeCasing == 2 || tierMachineCasing == 2 || tierSimpleBlock == 2)
-            return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0);
-        return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10);
+            return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0);
+        return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10);
     }
 
     @Override
@@ -185,13 +184,13 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlay() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE);
+    protected GTRenderedTexture getFrontOverlay() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE);
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlayActive() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE);
+    protected GTRenderedTexture getFrontOverlayActive() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE);
     }
 
     @Override
@@ -205,7 +204,7 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_SteamMixer> getStructureDefinition() {
+    public IStructureDefinition<MTESteamMixer> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
             simpleBlockTiers.put(Blocks.iron_block, 1);
 
@@ -213,13 +212,13 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa
                 simpleBlockTiers.put(GameRegistry.findBlock(EnderIO.ID, "blockIngotStorage"), 6);
             } else simpleBlockTiers.put(Blocks.iron_block, 2);
 
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamMixer>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTESteamMixer>builder()
 
                 .addShape(STRUCTUR_PIECE_MAIN, transpose(shape))
                 .addElement(
                     'B',
                     ofBlocksTiered(
-                        GregtechMetaTileEntity_SteamMixer::getTierGearBoxCasing,
+                        MTESteamMixer::getTierGearBoxCasing,
                         ImmutableList.of(Pair.of(sBlockCasings2, 2), Pair.of(sBlockCasings2, 3)),
                         -1,
                         (t, m) -> t.tierGearBoxCasing = m,
@@ -227,7 +226,7 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa
                 .addElement(
                     'C',
                     ofBlocksTiered(
-                        GregtechMetaTileEntity_SteamMixer::getTierPipeCasing,
+                        MTESteamMixer::getTierPipeCasing,
                         ImmutableList.of(Pair.of(sBlockCasings2, 12), Pair.of(sBlockCasings2, 13)),
                         -1,
                         (t, m) -> t.tierPipeCasing = m,
@@ -238,16 +237,16 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa
                         simpleBlockTierConverter(simpleBlockTiers),
                         getAllSimpleBlockTiers(simpleBlockTiers),
                         -1,
-                        GregtechMetaTileEntity_SteamMixer::setSimpleBlockTier,
-                        GregtechMetaTileEntity_SteamMixer::getSimpleBlockTier))
+                        MTESteamMixer::setSimpleBlockTier,
+                        MTESteamMixer::getSimpleBlockTier))
                 .addElement(
                     'A',
                     ofChain(
-                        buildSteamInput(GregtechMetaTileEntity_SteamMixer.class).casingIndex(10)
+                        buildSteamInput(MTESteamMixer.class).casingIndex(10)
                             .dot(1)
                             .allowOnly(ForgeDirection.NORTH)
                             .build(),
-                        buildHatchAdder(GregtechMetaTileEntity_SteamMixer.class)
+                        buildHatchAdder(MTESteamMixer.class)
                             .atLeast(
                                 SteamHatchElement.InputBus_Steam,
                                 SteamHatchElement.OutputBus_Steam,
@@ -343,7 +342,7 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa
 
             @Nonnull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 if (availableVoltage < recipe.mEUt) {
                     return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt);
                 }
@@ -352,8 +351,8 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa
 
             @Override
             @Nonnull
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
-                return GT_OverclockCalculator.ofNoOverclock(recipe)
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
+                return OverclockCalculator.ofNoOverclock(recipe)
                     .setEUtDiscount(1.33F)
                     .setSpeedBoost(1.5F);
             }
@@ -366,8 +365,8 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Steam Mixer")
             .addInfo("Bronze tier runs recipes up to LV tier")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java
index a245f696f9..438a762da6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java
@@ -1,10 +1,10 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.GregTech_API.*;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_Values.AuthorEvgenWarGold;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.GregTechAPI.*;
+import static gregtech.api.enums.GTValues.AuthorEvgenWarGold;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,48 +40,47 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 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.SoundResource;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
-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.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.common.blocks.GT_Block_Casings1;
-import gregtech.common.blocks.GT_Block_Casings2;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.common.blocks.BlockCasings1;
+import gregtech.common.blocks.BlockCasings2;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase;
 import ic2.core.init.BlocksItems;
 import ic2.core.init.InternalName;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamWasher>
-    implements ISurvivalConstructable {
+public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements ISurvivalConstructable {
 
-    public GregtechMetaTileEntity_SteamWasher(String aName) {
+    public MTESteamWasher(String aName) {
         super(aName);
     }
 
-    public GregtechMetaTileEntity_SteamWasher(int aID, String aName, String aNameRegional) {
+    public MTESteamWasher(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_SteamWasher(this.mName);
+        return new MTESteamWasher(this.mName);
     }
 
     @Override
@@ -91,7 +90,7 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
 
     private static final String STRUCTUR_PIECE_MAIN = "main";
 
-    private IStructureDefinition<GregtechMetaTileEntity_SteamWasher> STRUCTURE_DEFINITION = null;
+    private IStructureDefinition<MTESteamWasher> STRUCTURE_DEFINITION = null;
 
     private final String[][] shape = new String[][] {
         { "         ", "         ", " CCCCCC  ", "         ", "         " },
@@ -142,16 +141,16 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
     }
 
     protected void updateHatchTexture() {
-        for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mInputHatches) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mInputHatches) h.updateTexture(getCasingTextureID());
     }
 
     private int getCasingTextureID() {
         if (tierGearBoxCasing == 2 || tierPipeCasing == 2 || tierMachineCasing == 2)
-            return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0);
-        return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10);
+            return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0);
+        return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10);
     }
 
     @Override
@@ -165,13 +164,13 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlay() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_WASHER);
+    protected GTRenderedTexture getFrontOverlay() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_WASHER);
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlayActive() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_WASHER_ACTIVE);
+    protected GTRenderedTexture getFrontOverlayActive() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_WASHER_ACTIVE);
     }
 
     @Override
@@ -185,16 +184,16 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_SteamWasher> getStructureDefinition() {
+    public IStructureDefinition<MTESteamWasher> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
 
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamWasher>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTESteamWasher>builder()
 
                 .addShape(STRUCTUR_PIECE_MAIN, transpose(shape))
                 .addElement(
                     'B',
                     ofBlocksTiered(
-                        GregtechMetaTileEntity_SteamWasher::getTierGearBoxCasing,
+                        MTESteamWasher::getTierGearBoxCasing,
                         ImmutableList.of(Pair.of(sBlockCasings2, 2), Pair.of(sBlockCasings2, 3)),
                         -1,
                         (t, m) -> t.tierGearBoxCasing = m,
@@ -202,7 +201,7 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
                 .addElement(
                     'C',
                     ofBlocksTiered(
-                        GregtechMetaTileEntity_SteamWasher::getTierPipeCasing,
+                        MTESteamWasher::getTierPipeCasing,
                         ImmutableList.of(Pair.of(sBlockCasings2, 12), Pair.of(sBlockCasings2, 13)),
                         -1,
                         (t, m) -> t.tierPipeCasing = m,
@@ -217,11 +216,11 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
                 .addElement(
                     'A',
                     ofChain(
-                        buildSteamInput(GregtechMetaTileEntity_SteamWasher.class).casingIndex(10)
+                        buildSteamInput(MTESteamWasher.class).casingIndex(10)
                             .dot(1)
                             .allowOnly(ForgeDirection.NORTH)
                             .build(),
-                        buildHatchAdder(GregtechMetaTileEntity_SteamWasher.class)
+                        buildHatchAdder(MTESteamWasher.class)
                             .atLeast(SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam, InputHatch)
                             .casingIndex(10)
                             .dot(1)
@@ -318,7 +317,7 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 if (isBroken) {
                     checkForWater();
                     isBroken = false;
@@ -330,8 +329,8 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
 
             @Override
             @Nonnull
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
-                return GT_OverclockCalculator.ofNoOverclock(recipe)
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
+                return OverclockCalculator.ofNoOverclock(recipe)
                     .setEUtDiscount(1.33F)
                     .setSpeedBoost(1.5F);
             }
@@ -344,8 +343,8 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Steam Washer")
             .addInfo("33.3% faster than a single block steam machine would run.")
@@ -463,8 +462,8 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
     @Override
     public void setMachineModeIcons() {
         machineModeIcons.clear();
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_WASHPLANT);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_SIMPLEWASHER);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_WASHPLANT);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_SIMPLEWASHER);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWaterPump.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java
index 9d727b21ba..8b11690673 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWaterPump.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java
@@ -4,10 +4,10 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorEvgenWarGold;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.enums.GTValues.AuthorEvgenWarGold;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.List;
 
@@ -34,38 +34,37 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 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.SoundResource;
 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 gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.VoidProtectionHelper;
-import gregtech.common.blocks.GT_Block_Casings9;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase;
+import gregtech.common.blocks.BlockCasings9;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_SteamWaterPump
-    extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamWaterPump> implements ISurvivalConstructable {
+public class MTESteamWaterPump extends MTESteamMultiBase<MTESteamWaterPump> implements ISurvivalConstructable {
 
-    public GregtechMetaTileEntity_SteamWaterPump(String aName) {
+    public MTESteamWaterPump(String aName) {
         super(aName);
     }
 
-    public GregtechMetaTileEntity_SteamWaterPump(int aID, String aName, String aNameRegional) {
+    public MTESteamWaterPump(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_SteamWaterPump(this.mName);
+        return new MTESteamWaterPump(this.mName);
     }
 
     @Override
@@ -73,7 +72,7 @@ public class GregtechMetaTileEntity_SteamWaterPump
         return "Water Pump";
     }
 
-    private static IStructureDefinition<GregtechMetaTileEntity_SteamWaterPump> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTESteamWaterPump> STRUCTURE_DEFINITION = null;
 
     private static final int HORIZONTAL_OFF_SET = 1;
     private static final int VERTICAL_OFF_SET = 2;
@@ -111,10 +110,10 @@ public class GregtechMetaTileEntity_SteamWaterPump
 
     // spotless:off
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_SteamWaterPump> getStructureDefinition() {
+    public IStructureDefinition<MTESteamWaterPump> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
 
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamWaterPump>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTESteamWaterPump>builder()
 
                 .addShape(
                     tier1,
@@ -135,15 +134,15 @@ public class GregtechMetaTileEntity_SteamWaterPump
                 .addElement(
                     'C',
                         ofChain(
-                            buildSteamInput(GregtechMetaTileEntity_SteamWaterPump.class)
-                                .casingIndex(((GT_Block_Casings9) GregTech_API.sBlockCasings9).getTextureIndex(2))
+                            buildSteamInput(MTESteamWaterPump.class)
+                                .casingIndex(((BlockCasings9) GregTechAPI.sBlockCasings9).getTextureIndex(2))
                                 .dot(1)
                                 .build(),
-                            buildHatchAdder(GregtechMetaTileEntity_SteamWaterPump.class)
+                            buildHatchAdder(MTESteamWaterPump.class)
                                 .atLeast(OutputHatch)
-                                .casingIndex(((GT_Block_Casings9) GregTech_API.sBlockCasings9).getTextureIndex(2))
+                                .casingIndex(((BlockCasings9) GregTechAPI.sBlockCasings9).getTextureIndex(2))
                                 .dot(1)
-                                .buildAndChain(onElementPass(x -> ++x.mCountCasing, ofBlock(GregTech_API.sBlockCasings9, 2)))
+                                .buildAndChain(onElementPass(x -> ++x.mCountCasing, ofBlock(GregTechAPI.sBlockCasings9, 2)))
                         )
                     )
                 .build();
@@ -214,26 +213,26 @@ public class GregtechMetaTileEntity_SteamWaterPump
         if (side == facing) {
             return new ITexture[] {
                 Textures.BlockIcons
-                    .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings9, 2)),
+                    .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings9, 2)),
                 aActive ? getFrontOverlayActive() : getFrontOverlay() };
         }
-        return new ITexture[] { Textures.BlockIcons
-            .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings9, 2)) };
+        return new ITexture[] {
+            Textures.BlockIcons.getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings9, 2)) };
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlay() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_WATER_PUMP);
+    protected GTRenderedTexture getFrontOverlay() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_WATER_PUMP);
     }
 
     @Override
-    protected GT_RenderedTexture getFrontOverlayActive() {
-        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_WATER_PUMP_ACTIVE);
+    protected GTRenderedTexture getFrontOverlayActive() {
+        return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_WATER_PUMP_ACTIVE);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Water Pump")
             .addInfo("Pumps Water based on humidity")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java
index 506a68ea12..20c14d1ed2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java
@@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -31,35 +31,34 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_AlloyBlastSmelter
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_AlloyBlastSmelter> implements ISurvivalConstructable {
+public class MTEAlloyBlastSmelter extends GTPPMultiBlockBase<MTEAlloyBlastSmelter> implements ISurvivalConstructable {
 
     private int mMode = 0;
     private boolean isUsingControllerCircuit = false;
     private static Item circuit;
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_AlloyBlastSmelter> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEAlloyBlastSmelter> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_AlloyBlastSmelter(final int aID, final String aName, final String aNameRegional) {
+    public MTEAlloyBlastSmelter(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_AlloyBlastSmelter(final String aName) {
+    public MTEAlloyBlastSmelter(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_AlloyBlastSmelter(this.mName);
+        return new MTEAlloyBlastSmelter(this.mName);
     }
 
     @Override
@@ -76,8 +75,8 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Alloy Blast Smelter")
             .addInfo("Allows Complex GT++ alloys to be created")
@@ -95,14 +94,14 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_AlloyBlastSmelter> getStructureDefinition() {
+    public IStructureDefinition<MTEAlloyBlastSmelter> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_AlloyBlastSmelter>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEAlloyBlastSmelter>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -110,7 +109,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
                             { "C~C", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_AlloyBlastSmelter.class)
+                    buildHatchAdder(MTEAlloyBlastSmelter.class)
                         .atLeast(InputBus, InputHatch, OutputBus, OutputHatch, Maintenance, Energy, Muffler)
                         .casingIndex(TAE.GTPP_INDEX(15))
                         .dot(1)
@@ -169,7 +168,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
             .isServerSide()) {
             // Get Controller Circuit
             if (circuit == null) {
-                circuit = GT_Utility.getIntegratedCircuit(0)
+                circuit = GTUtility.getIntegratedCircuit(0)
                     .getItem();
             }
             if (aStack != null && aStack.getItem() == circuit) {
@@ -196,7 +195,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
     @Override
     public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         inputSeparation = !inputSeparation;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation);
     }
@@ -213,7 +212,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiABS;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiABS;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java
index 6cae5e4bcd..41b9abf12e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java
@@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.item.ItemStack;
 
@@ -26,25 +26,24 @@ import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 
-public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity_AutoCrafter>
-    implements ISurvivalConstructable {
+public class MTEAutoCrafter extends GTPPMultiBlockBase<MTEAutoCrafter> implements ISurvivalConstructable {
 
-    protected GT_Recipe lastRecipeToBuffer;
+    protected GTRecipe lastRecipeToBuffer;
     private int casing;
-    private static IStructureDefinition<GT4Entity_AutoCrafter> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEAutoCrafter> STRUCTURE_DEFINITION = null;
 
-    public GT4Entity_AutoCrafter(int aID, String aName, String aNameRegional) {
+    public MTEAutoCrafter(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT4Entity_AutoCrafter(String mName) {
+    public MTEAutoCrafter(String mName) {
         super(mName);
     }
 
@@ -55,7 +54,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity tileEntity) {
-        return new GT4Entity_AutoCrafter(this.mName);
+        return new MTEAutoCrafter(this.mName);
     }
 
     @Override
@@ -80,12 +79,12 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiAutoCrafter;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAutoCrafter;
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Highly Advanced Assembling Machine")
             .addInfo("200% faster than using single block machines of the same voltage")
@@ -101,7 +100,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -121,16 +120,16 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
     }
 
     @Override
-    public IStructureDefinition<GT4Entity_AutoCrafter> getStructureDefinition() {
+    public IStructureDefinition<MTEAutoCrafter> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GT4Entity_AutoCrafter>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEAutoCrafter>builder()
                 .addShape(
                     mName,
                     transpose(
                         new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GT4Entity_AutoCrafter.class)
+                    buildHatchAdder(MTEAutoCrafter.class)
                         .atLeast(InputBus, OutputBus, InputHatch, Maintenance, Energy, Muffler)
                         .casingIndex(TAE.getIndexFromPage(0, 10))
                         .dot(1)
@@ -170,7 +169,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
 
     @Override
     public int getMaxParallelRecipes() {
-        return 2 * (Math.max(1, GT_Utility.getTier(getMaxInputVoltage())));
+        return 2 * (Math.max(1, GTUtility.getTier(getMaxInputVoltage())));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java
index c85e406b6c..051daee9a3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java
@@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
@@ -32,30 +32,29 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.metatileentity.implementations.MTEHatchOutputBus;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.chemistry.IonParticles;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Cyclotron>
-    implements ISurvivalConstructable {
+public class MTECyclotron extends GTPPMultiBlockBase<MTECyclotron> implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_Cyclotron> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTECyclotron> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_Cyclotron(int aID, String aName, String aNameRegional, int tier) {
+    public MTECyclotron(int aID, String aName, String aNameRegional, int tier) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_Cyclotron(String aName) {
+    public MTECyclotron(String aName) {
         super(aName);
     }
 
@@ -75,11 +74,11 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_Cyclotron(this.mName);
+        return new MTECyclotron(this.mName);
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return side != getBaseMetaTileEntity().getFrontFacing();
     }
 
@@ -94,9 +93,9 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_Cyclotron> getStructureDefinition() {
+    public IStructureDefinition<MTECyclotron> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Cyclotron>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTECyclotron>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -115,7 +114,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
                                 "    hh   hh    ", "      hhh      ", "               ", } }))
                 .addElement(
                     'h',
-                    buildHatchAdder(GregtechMetaTileEntity_Cyclotron.class)
+                    buildHatchAdder(MTECyclotron.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
                         .casingIndex(44)
                         .dot(1)
@@ -166,8 +165,8 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Super Magnetic Speed Shooter")
             .addSeparator()
@@ -190,7 +189,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -266,7 +265,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
     @Override
     public boolean onRunningTick(ItemStack aStack) {
         if (this.mOutputBusses.size() > 0) {
-            for (GT_MetaTileEntity_Hatch_OutputBus g : this.mOutputBusses) {
+            for (MTEHatchOutputBus g : this.mOutputBusses) {
                 if (g != null) {
                     for (ItemStack s : g.mInventory) {
                         if (s != null) {
@@ -297,7 +296,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiCyclotron;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiCyclotron;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java
index 3b99849803..676b6e817a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java
@@ -4,14 +4,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -33,32 +33,32 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ElementalDataOrbHolder;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchElementalDataOrbHolder;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase<GregtechMTE_ElementalDuplicator>
+public class MTEElementalDuplicator extends GTPPMultiBlockBase<MTEElementalDuplicator>
     implements ISurvivalConstructable {
 
-    private final ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder> mReplicatorDataOrbHatches = new ArrayList<>();
+    private final ArrayList<MTEHatchElementalDataOrbHolder> mReplicatorDataOrbHatches = new ArrayList<>();
     private static final int CASING_TEXTURE_ID = TAE.getIndexFromPage(0, 3);
     private int mCasing = 0;
 
-    public GregtechMTE_ElementalDuplicator(final int aID, final String aName, final String aNameRegional) {
+    public MTEElementalDuplicator(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMTE_ElementalDuplicator(final String aName) {
+    public MTEElementalDuplicator(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMTE_ElementalDuplicator(this.mName);
+        return new MTEElementalDuplicator(this.mName);
     }
 
     @Override
@@ -67,9 +67,9 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
 
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Produces Elemental Material from UU Matter")
             .addInfo("Speed: +100% | EU Usage: 100% | Parallel: 8 * Tier")
@@ -94,17 +94,17 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
             .addEnergyHatch("Any 1 dot hint", 1)
             .addMaintenanceHatch("Any 1 dot hint", 1)
             .addMufflerHatch("Any 1 dot hint", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static IStructureDefinition<GregtechMTE_ElementalDuplicator> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEElementalDuplicator> STRUCTURE_DEFINITION = null;
 
     @Override
-    public IStructureDefinition<GregtechMTE_ElementalDuplicator> getStructureDefinition() {
+    public IStructureDefinition<MTEElementalDuplicator> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_ElementalDuplicator>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEElementalDuplicator>builder()
 
                 // h = Hatch
                 // c = Casing
@@ -144,15 +144,15 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
                     'h',
                     lazy(
                         t -> ofChain(
-                            buildHatchAdder(GregtechMTE_ElementalDuplicator.class)
+                            buildHatchAdder(MTEElementalDuplicator.class)
                                 .atLeast(InputHatch, OutputBus, OutputHatch, Maintenance, Muffler, Energy)
                                 .casingIndex(getCasingTextureIndex())
                                 .dot(1)
                                 .build(),
-                            buildHatchAdder(GregtechMTE_ElementalDuplicator.class)
-                                .hatchClass(GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.class)
+                            buildHatchAdder(MTEElementalDuplicator.class)
+                                .hatchClass(MTEHatchElementalDataOrbHolder.class)
                                 .shouldReject(x -> x.mReplicatorDataOrbHatches.size() >= 1)
-                                .adder(GregtechMTE_ElementalDuplicator::addDataOrbHatch)
+                                .adder(MTEElementalDuplicator::addDataOrbHatch)
                                 .casingIndex(getCasingTextureIndex())
                                 .dot(1)
                                 .build(),
@@ -242,7 +242,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
             if (aMetaTileEntity == null) {
                 return false;
             }
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_ElementalDataOrbHolder) {
+            if (aMetaTileEntity instanceof MTEHatchElementalDataOrbHolder) {
                 try {
                     return addToMachineListInternal(mReplicatorDataOrbHatches, aMetaTileEntity, aBaseCasingIndex);
                 } catch (Throwable t) {
@@ -293,7 +293,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
     @Override
     protected void setupProcessingLogic(ProcessingLogic logic) {
         super.setupProcessingLogic(logic);
-        for (GT_MetaTileEntity_Hatch_ElementalDataOrbHolder hatch : filterValidMTEs(mReplicatorDataOrbHatches)) {
+        for (MTEHatchElementalDataOrbHolder hatch : filterValidMTEs(mReplicatorDataOrbHatches)) {
             ItemStack orb = hatch.getOrbByCircuit();
             logic.setSpecialSlotItem(orb);
             break;
@@ -302,7 +302,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
 
     @Override
     public int getMaxParallelRecipes() {
-        return (8 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (8 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -312,7 +312,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer;
     }
 
     @Override
@@ -338,7 +338,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
     @Override
     public ArrayList<ItemStack> getStoredInputs() {
         ArrayList<ItemStack> tItems = super.getStoredInputs();
-        for (GT_MetaTileEntity_Hatch_ElementalDataOrbHolder tHatch : filterValidMTEs(mReplicatorDataOrbHatches)) {
+        for (MTEHatchElementalDataOrbHolder tHatch : filterValidMTEs(mReplicatorDataOrbHatches)) {
             tItems.add(tHatch.getOrbByCircuit());
         }
         tItems.removeAll(Collections.singleton(null));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java
index b887c74a47..8e052870fa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java
@@ -2,12 +2,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.List;
 import java.util.Objects;
@@ -39,33 +39,32 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.helpers.FlotationRecipeHandler;
 
-public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<GregtechMTE_FrothFlotationCell>
-    implements ISurvivalConstructable {
+public class MTEFrothFlotationCell extends GTPPMultiBlockBase<MTEFrothFlotationCell> implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMTE_FrothFlotationCell> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEFrothFlotationCell> STRUCTURE_DEFINITION = null;
 
-    public GregtechMTE_FrothFlotationCell(final int aID, final String aName, final String aNameRegional) {
+    public MTEFrothFlotationCell(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMTE_FrothFlotationCell(final String aName) {
+    public MTEFrothFlotationCell(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMTE_FrothFlotationCell(this.mName);
+        return new MTEFrothFlotationCell(this.mName);
     }
 
     @Override
@@ -74,8 +73,8 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Process that milled ore!")
             .addInfo("You can only ever process one type of material per controller")
@@ -90,7 +89,7 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
             .addOutputHatch("Bottom Casing", 1)
             .addEnergyHatch("Bottom Casing", 1)
             .addMaintenanceHatch("Bottom Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -125,9 +124,9 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
     }
 
     @Override
-    public IStructureDefinition<GregtechMTE_FrothFlotationCell> getStructureDefinition() {
+    public IStructureDefinition<MTEFrothFlotationCell> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_FrothFlotationCell>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEFrothFlotationCell>builder()
                 .addShape(
                     mName,
                     new String[][] { { "       ", "       ", "   X   ", "  X~X  ", "   X   ", "       ", "       " },
@@ -141,7 +140,7 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
                         { "  CCC  ", " CCCCC ", "CCCCCCC", "CCCCCCC", "CCCCCCC", " CCCCC ", "  CCC  " }, })
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMTE_FrothFlotationCell.class)
+                    buildHatchAdder(MTEFrothFlotationCell.class)
                         .atLeast(InputBus, InputHatch, OutputHatch, Maintenance, Energy)
                         .casingIndex(getCasingTextureId())
                         .dot(1)
@@ -182,7 +181,7 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiFrothFlotationCell;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiFrothFlotationCell;
     }
 
     @Override
@@ -196,7 +195,7 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 /*
                  * Material checks Makes sure we can only ever use one type of material in this flotation cell. We used
                  * to depend on Alk's hash, but it's unreliable and user-hostile So we're using unlocalized name of
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java
index 0133c8b301..3a7370cf25 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java
@@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls;
 
 import java.util.HashMap;
@@ -40,48 +40,48 @@ import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
 import gregtech.api.util.FishPondFakeRecipe;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_ParallelHelper;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.api.util.ParallelHelper;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import ic2.core.init.BlocksItems;
 import ic2.core.init.InternalName;
 
-public class GregtechMetaTileEntity_IndustrialFishingPond extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialFishingPond> implements ISurvivalConstructable {
+public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFishingPond>
+    implements ISurvivalConstructable {
 
     private boolean isUsingControllerCircuit = false;
-    private static final Item circuit = GT_Utility.getIntegratedCircuit(0)
+    private static final Item circuit = GTUtility.getIntegratedCircuit(0)
         .getItem();
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialFishingPond> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialFishingPond> STRUCTURE_DEFINITION = null;
     private static final Class<?> cofhWater;
 
     static {
         cofhWater = ReflectionUtils.getClass("cofh.asmhooks.block.BlockWater");
     }
 
-    public GregtechMetaTileEntity_IndustrialFishingPond(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialFishingPond(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialFishingPond(final String aName) {
+    public MTEIndustrialFishingPond(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialFishingPond(this.mName);
+        return new MTEIndustrialFishingPond(this.mName);
     }
 
     @Override
@@ -90,8 +90,8 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Fishing Pond")
             .addInfo("Can process (Tier + 1) * 2 recipes")
@@ -112,7 +112,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -122,9 +122,9 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialFishingPond> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialFishingPond> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialFishingPond>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialFishingPond>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -137,7 +137,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
                                 "XXXXXXXXX", "XXXXXXXXX" }, }))
                 .addElement(
                     'X',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialFishingPond.class)
+                    buildHatchAdder(MTEIndustrialFishingPond.class)
                         .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -221,7 +221,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
 
         ItemStack[] mFishOutput = generateLoot(this.mMode);
         mFishOutput = removeNulls(mFishOutput);
-        GT_Recipe g = new GT_Recipe(
+        GTRecipe g = new GTRecipe(
             true,
             new ItemStack[] {},
             mFishOutput,
@@ -232,10 +232,10 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
             200,
             16,
             0);
-        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(g.mEUt)
+        OverclockCalculator calculator = new OverclockCalculator().setRecipeEUt(g.mEUt)
             .setEUt(tEnergy)
             .setDuration(g.mDuration);
-        GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(g)
+        ParallelHelper helper = new ParallelHelper().setRecipe(g)
             .setItemInputs(tItemInputs)
             .setFluidInputs(tFluidInputs)
             .setAvailableEUt(tEnergy)
@@ -267,7 +267,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
 
     @Override
     public int getMaxParallelRecipes() {
-        return (2 * (GT_Utility.getTier(this.getMaxInputVoltage()) + 1));
+        return (2 * (GTUtility.getTier(this.getMaxInputVoltage()) + 1));
     }
 
     @Override
@@ -277,7 +277,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialFishingPond;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialFishingPond;
     }
 
     @Override
@@ -393,7 +393,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
     private int getCircuit(ItemStack[] t) {
         if (!this.isUsingControllerCircuit) {
             for (ItemStack j : t) {
-                if (j.getItem() == GT_Utility.getIntegratedCircuit(0)
+                if (j.getItem() == GTUtility.getIntegratedCircuit(0)
                     .getItem()) {
                     // Fish
                     if (j.getItemDamage() == 14) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java
index 520d52c9c5..4b91b42d9f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java
@@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.ArrayList;
 
@@ -37,36 +37,36 @@ import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_ParallelHelper;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.api.util.ParallelHelper;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_IndustrialRockBreaker extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialRockBreaker> implements ISurvivalConstructable {
+public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase<MTEIndustrialRockBreaker>
+    implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_IndustrialRockBreaker> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEIndustrialRockBreaker> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_IndustrialRockBreaker(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialRockBreaker(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_IndustrialRockBreaker(final String aName) {
+    public MTEIndustrialRockBreaker(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_IndustrialRockBreaker(this.mName);
+        return new MTEIndustrialRockBreaker(this.mName);
     }
 
     @Override
@@ -74,14 +74,14 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
         return "Rock Breaker";
     }
 
-    private static final String casingBaseName = GT_LanguageManager.getTranslation("gtplusplus.blockcasings.2.0.name");
-    private static final String casingMiddleName = GT_LanguageManager
+    private static final String casingBaseName = GTLanguageManager.getTranslation("gtplusplus.blockcasings.2.0.name");
+    private static final String casingMiddleName = GTLanguageManager
         .getTranslation("gtplusplus.blockcasings.2.11.name");
     private static final String anyBaseCasing = "Any " + casingBaseName;
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Rock Breaker")
             .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 8")
@@ -100,14 +100,14 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
             .addEnergyHatch(anyBaseCasing, 1)
             .addMaintenanceHatch(anyBaseCasing, 1)
             .addMufflerHatch(anyBaseCasing, 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_IndustrialRockBreaker> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialRockBreaker> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialRockBreaker>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialRockBreaker>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -115,7 +115,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
                             { "C~C", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_IndustrialRockBreaker.class)
+                    buildHatchAdder(MTEIndustrialRockBreaker.class)
                         .atLeast(InputBus, InputHatch, OutputBus, Maintenance, Energy, Muffler)
                         .casingIndex(TAE.GTPP_INDEX(16))
                         .dot(1)
@@ -182,14 +182,14 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
         return true;
     }
 
-    private static GT_Recipe sRecipe_Cobblestone;
-    private static GT_Recipe sRecipe_SmoothStone;
-    private static GT_Recipe sRecipe_Redstone;
+    private static GTRecipe sRecipe_Cobblestone;
+    private static GTRecipe sRecipe_SmoothStone;
+    private static GTRecipe sRecipe_Redstone;
 
     private static void generateRecipes() {
-        sRecipe_Cobblestone = new GT_Recipe(
+        sRecipe_Cobblestone = new GTRecipe(
             false,
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(1) },
             new ItemStack[] { ItemUtils.getSimpleStack(Blocks.cobblestone) },
             null,
             new int[] { 10000 },
@@ -198,9 +198,9 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
             16,
             32,
             0);
-        sRecipe_SmoothStone = new GT_Recipe(
+        sRecipe_SmoothStone = new GTRecipe(
             false,
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(2) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(2) },
             new ItemStack[] { ItemUtils.getSimpleStack(Blocks.stone) },
             null,
             new int[] { 10000 },
@@ -209,10 +209,10 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
             16,
             32,
             0);
-        sRecipe_Redstone = new GT_Recipe(
+        sRecipe_Redstone = new GTRecipe(
             false,
-            new ItemStack[] { GT_Utility.getIntegratedCircuit(3),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L) },
+            new ItemStack[] { GTUtility.getIntegratedCircuit(3),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L) },
             new ItemStack[] { ItemUtils.getSimpleStack(Blocks.obsidian) },
             null,
             new int[] { 10000 },
@@ -243,8 +243,8 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
         boolean aHasRedstone = false;
         if (!aItems.isEmpty()) {
             for (ItemStack aItem : aItems) {
-                if (GT_Utility
-                    .areStacksEqual(aItem, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) {
+                if (GTUtility
+                    .areStacksEqual(aItem, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) {
                     aHasRedstone = true;
                     break;
                 }
@@ -268,7 +268,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
 
         int aCircuit = aGuiCircuit.getItemDamage();
 
-        GT_Recipe tRecipe = null;
+        GTRecipe tRecipe = null;
         switch (aCircuit) {
             case 1 -> tRecipe = sRecipe_Cobblestone;
             case 2 -> tRecipe = sRecipe_SmoothStone;
@@ -290,7 +290,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
         // Remember last recipe - an optimization for findRecipe()
         this.mLastRecipe = tRecipe;
 
-        GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe)
+        ParallelHelper helper = new ParallelHelper().setRecipe(tRecipe)
             .setItemInputs(aItemInputs)
             .setFluidInputs(aFluidInputs)
             .setAvailableEUt(tEnergy)
@@ -313,7 +313,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
         this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
         this.mEfficiencyIncrease = 10000;
 
-        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt)
+        OverclockCalculator calculator = new OverclockCalculator().setRecipeEUt(tRecipe.mEUt)
             .setEUt(tEnergy)
             .setDuration(tRecipe.mDuration)
             .setEUtDiscount(0.75F)
@@ -332,7 +332,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
 
     @Override
     public int getMaxParallelRecipes() {
-        return (8 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (8 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -342,7 +342,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialRockBreaker;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialRockBreaker;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java
index 96a477bb26..3a5bbaa42a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java
@@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Dynamo;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
-import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.AirIntake;
-import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo;
+import static gregtech.api.enums.HatchElement.Dynamo;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.AirIntake;
+import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTDynamo;
 
 import java.util.ArrayList;
 
@@ -29,31 +29,30 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.metatileentity.implementations.MTEHatch;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.chemistry.RocketFuels;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.core.material.MaterialMisc;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaTileEntity_LargeRocketEngine
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargeRocketEngine> implements ISurvivalConstructable {
+public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngine> implements ISurvivalConstructable {
 
     protected int fuelConsumption;
     protected int fuelValue;
@@ -73,11 +72,11 @@ public class GregtechMetaTileEntity_LargeRocketEngine
     private static FluidStack sAirFluidStack = null;
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_LargeRocketEngine> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTELargeRocketEngine> STRUCTURE_DEFINITION = null;
 
     private static final int CASING_ID = TAE.getIndexFromPage(3, 11);
 
-    public GregtechMetaTileEntity_LargeRocketEngine(final int aID, final String aName, final String aNameRegional) {
+    public MTELargeRocketEngine(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
         this.fuelConsumption = 0;
         this.fuelValue = 0;
@@ -86,7 +85,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
         setAir();
     }
 
-    public GregtechMetaTileEntity_LargeRocketEngine(final String aName) {
+    public MTELargeRocketEngine(final String aName) {
         super(aName);
         this.fuelConsumption = 0;
         this.fuelValue = 0;
@@ -96,8 +95,8 @@ public class GregtechMetaTileEntity_LargeRocketEngine
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Large Rocket Engine")
             .addInfo("Generating Power from Rocket Fuels - Supports TecTech Multi-Amp Dynamos!")
@@ -127,14 +126,14 @@ public class GregtechMetaTileEntity_LargeRocketEngine
             .addMaintenanceHatch("Any Block Touching Inconel Reinforced Casing", 1)
             .addDynamoHatch("Top center line", 2)
             .addMufflerHatch("Back Center", 3)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_LargeRocketEngine> getStructureDefinition() {
+    public IStructureDefinition<MTELargeRocketEngine> getStructureDefinition() {
         if (this.STRUCTURE_DEFINITION == null) {
-            this.STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_LargeRocketEngine>builder()
+            this.STRUCTURE_DEFINITION = StructureDefinition.<MTELargeRocketEngine>builder()
                 .addShape(
                     this.mName,
                     transpose(
@@ -146,7 +145,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
                 // side
                 .addElement(
                     'S',
-                    buildHatchAdder(GregtechMetaTileEntity_LargeRocketEngine.class)
+                    buildHatchAdder(MTELargeRocketEngine.class)
                         .atLeast(ImmutableMap.of(AirIntake, 8, InputBus, 1, InputHatch, 3, Maintenance, 1))
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
@@ -154,7 +153,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
                 // top
                 .addElement(
                     'T',
-                    buildHatchAdder(GregtechMetaTileEntity_LargeRocketEngine.class)
+                    buildHatchAdder(MTELargeRocketEngine.class)
                         .atLeast(ImmutableMap.of(AirIntake, 8, Dynamo.or(TTDynamo), 1, Maintenance, 1))
                         .casingIndex(getCasingTextureIndex())
                         .dot(2)
@@ -222,7 +221,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
             return 0;
         } else {
             int totalAir = 0;
-            for (GT_MetaTileEntity_Hatch_AirIntake u : this.mAirIntakes) {
+            for (METHatchAirIntake u : this.mAirIntakes) {
                 if (u != null && u.mFluid != null) {
                     FluidStack f = u.mFluid;
                     if (f.isFluidEqual(sAirFluidStack)) {
@@ -250,7 +249,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
             return SimpleCheckRecipeResult.ofFailure("no_air");
         } else {
             int aTotalAir = 0;
-            for (GT_MetaTileEntity_Hatch_AirIntake aAirHatch : this.mAirIntakes) {
+            for (METHatchAirIntake aAirHatch : this.mAirIntakes) {
                 if (aAirHatch.mFluid != null) {
                     aTotalAir += aAirHatch.getFluidAmount();
                 }
@@ -258,7 +257,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
             if (aTotalAir >= aAirToConsume) {
                 int aSplitAmount = (aAirToConsume / this.mAirIntakes.size());
                 if (aSplitAmount > 0) {
-                    for (GT_MetaTileEntity_Hatch_AirIntake aAirHatch : mAirIntakes) {
+                    for (METHatchAirIntake aAirHatch : mAirIntakes) {
                         boolean hasIntakeAir = aAirHatch.drain(aSplitAmount, true) != null;
                         if (!hasIntakeAir) {
                             this.freeFuelTicks = 0;
@@ -286,7 +285,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
                     continue;
                 }
                 if (this.freeFuelTicks == 0) {
-                    for (final GT_Recipe aFuel : getRecipeMap().getAllRecipes()) {
+                    for (final GTRecipe aFuel : getRecipeMap().getAllRecipes()) {
                         final FluidStack tLiquid;
                         tLiquid = aFuel.mFluidInputs[0];
                         if (hatchFluid1.isFluidEqual(tLiquid)) {
@@ -295,7 +294,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
                             }
                             this.fuelValue = aFuel.mSpecialValue * 3;
                             this.fuelRemaining = hatchFluid1.amount;
-                            this.lEUt = ((this.mEfficiency < 2000) ? 0 : GT_Values.V[5] << 1);
+                            this.lEUt = ((this.mEfficiency < 2000) ? 0 : GTValues.V[5] << 1);
                             this.mProgresstime = 1;
                             this.mMaxProgresstime = 1;
                             this.mEfficiencyIncrease = this.euProduction / 2000;
@@ -305,7 +304,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
                 } else {
                     this.mEfficiencyIncrease = this.euProduction / 2000;
                     this.freeFuelTicks--;
-                    this.lEUt = ((this.mEfficiency < 1000) ? 0 : GT_Values.V[5] << 1);
+                    this.lEUt = ((this.mEfficiency < 1000) ? 0 : GTValues.V[5] << 1);
                     this.mProgresstime = 1;
                     this.mMaxProgresstime = 1;
                     return CheckRecipeResultRegistry.GENERATING;
@@ -324,7 +323,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
      * @param aFuel
      * @return
      */
-    public boolean consumeFuel(GT_Recipe aFuel, int amount) {
+    public boolean consumeFuel(GTRecipe aFuel, int amount) {
         amount *= this.boostEu ? 0.3 : 0.9;
         this.freeFuelTicks = 0;
         int value = aFuel.mSpecialValue * 3;
@@ -360,7 +359,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
     }
 
     public boolean consumeCO2() {
-        return this.depleteInput(MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(this.boostEu ? 3 : 1))
+        return this.depleteInput(MaterialMisc.CARBON_DIOXIDE.getFluidStack(this.boostEu ? 3 : 1))
             || this.depleteInput(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1)));
     }
 
@@ -388,7 +387,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
         long totalOutput = 0;
         long aFirstVoltageFound = -1;
         boolean aFoundMixedDynamos = false;
-        for (GT_MetaTileEntity_Hatch aDynamo : filterValidMTEs(this.mAllDynamoHatches)) {
+        for (MTEHatch aDynamo : filterValidMTEs(this.mAllDynamoHatches)) {
             long aVoltage = aDynamo.maxEUOutput();
             long aTotal = aDynamo.maxAmperesOut() * aVoltage;
             // Check against voltage to check when hatch mixing
@@ -412,7 +411,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
         int aAmpsToInject;
         int aRemainder;
 
-        for (GT_MetaTileEntity_Hatch aDynamo : filterValidMTEs(this.mAllDynamoHatches)) {
+        for (MTEHatch aDynamo : filterValidMTEs(this.mAllDynamoHatches)) {
             leftToInject = aEU - injected;
             aVoltage = aDynamo.maxEUOutput();
             aAmpsToInject = (int) (leftToInject / aVoltage);
@@ -454,7 +453,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_LargeRocketEngine(this.mName);
+        return new MTELargeRocketEngine(this.mName);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java
index 4403779d09..141fbff41f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java
@@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Dynamo;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo;
+import static gregtech.api.enums.HatchElement.Dynamo;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTDynamo;
 
 import java.util.ArrayList;
 
@@ -24,47 +24,47 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchMaintenance;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 
-public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargeSemifluidGenerator> implements ISurvivalConstructable {
+public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase<MTELargeSemifluidGenerator>
+    implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_LargeSemifluidGenerator> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTELargeSemifluidGenerator> STRUCTURE_DEFINITION = null;
 
     protected int fuelConsumption = 0;
     protected int fuelValue = 0;
     protected int fuelRemaining = 0;
     protected boolean boostEu = false;
 
-    public GregtechMetaTileEntity_LargeSemifluidGenerator(int aID, String aName, String aNameRegional) {
+    public MTELargeSemifluidGenerator(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_LargeSemifluidGenerator(String aName) {
+    public MTELargeSemifluidGenerator(String aName) {
         super(aName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Large Semifluid Generator")
             .addInfo("Engine Intake Casings must not be obstructed in front (only air blocks)")
@@ -83,7 +83,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
             .addDynamoHatch("Back Center", 2)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -130,7 +130,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
         }
 
         for (FluidStack hatchFluid : tFluids) { // Loops through hatches
-            GT_Recipe aFuel = GTPPRecipeMaps.semiFluidFuels.getBackend()
+            GTRecipe aFuel = GTPPRecipeMaps.semiFluidFuels.getBackend()
                 .findFuel(hatchFluid);
             if (aFuel == null) {
                 // Not a valid semi-fluid fuel.
@@ -171,9 +171,9 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_LargeSemifluidGenerator> getStructureDefinition() {
+    public IStructureDefinition<MTELargeSemifluidGenerator> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_LargeSemifluidGenerator>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTELargeSemifluidGenerator>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -181,8 +181,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
                             { "III", "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_LargeSemifluidGenerator.class)
-                        .atLeast(Muffler, InputHatch, Maintenance)
+                    buildHatchAdder(MTELargeSemifluidGenerator.class).atLeast(Muffler, InputHatch, Maintenance)
                         .casingIndex(getCasingTextureIndex())
                         .dot(1)
                         .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
@@ -220,11 +219,11 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
+            if (aMetaTileEntity instanceof MTEHatchMaintenance) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) {
+            } else if (aMetaTileEntity instanceof MTEHatchMuffler) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
+            } else if (aMetaTileEntity instanceof MTEHatchInput) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
             }
         }
@@ -236,7 +235,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo || this.isThisHatchMultiDynamo(aTileEntity)) {
+            if (aMetaTileEntity instanceof MTEHatchDynamo || this.isThisHatchMultiDynamo(aTileEntity)) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
             }
         }
@@ -244,7 +243,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
     }
 
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     public byte getCasingMeta() {
@@ -252,7 +251,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
     }
 
     public Block getIntakeBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     public byte getIntakeMeta() {
@@ -260,7 +259,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
     }
 
     public Block getGearboxBlock() {
-        return GregTech_API.sBlockCasings2;
+        return GregTechAPI.sBlockCasings2;
     }
 
     public byte getGearboxMeta() {
@@ -273,7 +272,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_LargeSemifluidGenerator(this.mName);
+        return new MTELargeSemifluidGenerator(this.mName);
     }
 
     @Override
@@ -298,7 +297,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiLargeSemiFluidGenerator;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiLargeSemiFluidGenerator;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java
index ee989d22ca..0bcf503daf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java
@@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -50,23 +50,22 @@ import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.config.machinestats.ConfigMassFabricator;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GregtechMetaTileEntity_MassFabricator
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_MassFabricator> implements ISurvivalConstructable {
+public class MTEMassFabricator extends GTPPMultiBlockBase<MTEMassFabricator> implements ISurvivalConstructable {
 
     public static int sUUAperUUM = 1;
     public static int sUUASpeedBonus = 4;
@@ -86,13 +85,13 @@ public class GregtechMetaTileEntity_MassFabricator
     private static final ItemStack[] mScrap = new ItemStack[2];
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_MassFabricator> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEMassFabricator> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_MassFabricator(final int aID, final String aName, final String aNameRegional) {
+    public MTEMassFabricator(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_MassFabricator(final String aName) {
+    public MTEMassFabricator(final String aName) {
         super(aName);
     }
 
@@ -102,8 +101,8 @@ public class GregtechMetaTileEntity_MassFabricator
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Matter Fabricator")
             .addInfo("Speed: +0% | EU Usage: 80%")
@@ -124,7 +123,7 @@ public class GregtechMetaTileEntity_MassFabricator
             .addEnergyHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -173,9 +172,9 @@ public class GregtechMetaTileEntity_MassFabricator
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_MassFabricator> getStructureDefinition() {
+    public IStructureDefinition<MTEMassFabricator> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_MassFabricator>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEMassFabricator>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -185,7 +184,7 @@ public class GregtechMetaTileEntity_MassFabricator
                             { "CC~CC", "CHHHC", "CHHHC", "CHHHC", "CCCCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntity_MassFabricator.class)
+                    buildHatchAdder(MTEMassFabricator.class)
                         .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Energy, Muffler)
                         .casingIndex(TAE.GTPP_INDEX(9))
                         .dot(1)
@@ -221,7 +220,7 @@ public class GregtechMetaTileEntity_MassFabricator
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiMassFabricator;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMassFabricator;
     }
 
     @Override
@@ -231,7 +230,7 @@ public class GregtechMetaTileEntity_MassFabricator
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_MassFabricator(this.mName);
+        return new MTEMassFabricator(this.mName);
     }
 
     /**
@@ -261,7 +260,7 @@ public class GregtechMetaTileEntity_MassFabricator
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 if (mMode == MODE_SCRAP) {
                     if (recipe.mOutputs == null) {
                         return SimpleCheckRecipeResult.ofSuccess("no_scrap");
@@ -272,16 +271,16 @@ public class GregtechMetaTileEntity_MassFabricator
 
             @Nonnull
             @Override
-            protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
+            protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
                 if (mMode == MODE_SCRAP) {
                     if (inputItems != null) {
                         for (ItemStack item : inputItems) {
                             if (item == null || item.stackSize == 0) continue;
-                            ItemStack aPotentialOutput = GT_ModHandler
-                                .getRecyclerOutput(GT_Utility.copyAmount(1, item), 0);
-                            GT_Recipe recipe = new GT_Recipe(
+                            ItemStack aPotentialOutput = GTModHandler
+                                .getRecyclerOutput(GTUtility.copyAmount(1, item), 0);
+                            GTRecipe recipe = new GTRecipe(
                                 false,
-                                new ItemStack[] { GT_Utility.copyAmount(1, item) },
+                                new ItemStack[] { GTUtility.copyAmount(1, item) },
                                 aPotentialOutput == null ? null : new ItemStack[] { aPotentialOutput },
                                 null,
                                 new int[] { 2000 },
@@ -309,7 +308,7 @@ public class GregtechMetaTileEntity_MassFabricator
 
     @Override
     public int getMaxParallelRecipes() {
-        return this.mMode == MODE_SCRAP ? 64 : 8 * (Math.max(1, GT_Utility.getTier(getMaxInputVoltage())));
+        return this.mMode == MODE_SCRAP ? 64 : 8 * (Math.max(1, GTUtility.getTier(getMaxInputVoltage())));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java
index 5bea6bb91f..3da77cf783 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java
@@ -4,14 +4,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Dynamo;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_RecipeConstants.LFTR_OUTPUT_POWER;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.filterByMTETier;
+import static gregtech.api.enums.HatchElement.Dynamo;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTRecipeConstants.LFTR_OUTPUT_POWER;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.filterByMTETier;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -32,42 +32,41 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-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.objects.GT_ItemStack;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchMaintenance;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.nuclear.NUCLIDE;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.core.material.MaterialsElements;
+import gtPlusPlus.core.material.nuclear.MaterialsNuclides;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 
-public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<GregtechMTE_NuclearReactor>
-    implements ISurvivalConstructable {
+public class MTENuclearReactor extends GTPPMultiBlockBase<MTENuclearReactor> implements ISurvivalConstructable {
 
     protected int mFuelRemaining = 0;
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMTE_NuclearReactor> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTENuclearReactor> STRUCTURE_DEFINITION = null;
 
-    public GregtechMTE_NuclearReactor(final int aID, final String aName, final String aNameRegional) {
+    public MTENuclearReactor(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMTE_NuclearReactor(final String aName) {
+    public MTENuclearReactor(final String aName) {
         super(aName);
     }
 
@@ -87,8 +86,8 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.")
             .addInfo("Produces energy and new elements from Radioactive Beta Decay!")
@@ -111,7 +110,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
             .addStructureInfo("All other hatches must be IV+ tier.")
             .addStructureInfo("4x Output Hatches or 1x Output Hatch (ME), 1+ Input Hatches")
             .addStructureInfo("4x Dynamo Hatches, 4x Mufflers")
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -128,7 +127,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
     }
 
     @Override
-    public boolean allowCoverOnSide(final ForgeDirection side, final GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(final ForgeDirection side, final GTItemStack aStack) {
         return side != this.getBaseMetaTileEntity()
             .getFrontFacing();
     }
@@ -174,19 +173,16 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
+            if (aMetaTileEntity instanceof MTEHatchMaintenance) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo dynamo
-                && dynamo.getTierForStructure() >= 4
+            } else if (aMetaTileEntity instanceof MTEHatchDynamo dynamo && dynamo.getTierForStructure() >= 4
                 && dynamo.getTierForStructure() <= 6) {
                     return addToMachineList(aTileEntity, aBaseCasingIndex);
-                } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input hatch
-                    && hatch.getTierForStructure() >= 5) {
-                        return addToMachineList(aTileEntity, aBaseCasingIndex);
-                    } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output hatch
-                        && hatch.getTierForStructure() >= 5) {
-                            return addToMachineList(aTileEntity, aBaseCasingIndex);
-                        }
+                } else if (aMetaTileEntity instanceof MTEHatchInput hatch && hatch.getTierForStructure() >= 5) {
+                    return addToMachineList(aTileEntity, aBaseCasingIndex);
+                } else if (aMetaTileEntity instanceof MTEHatchOutput hatch && hatch.getTierForStructure() >= 5) {
+                    return addToMachineList(aTileEntity, aBaseCasingIndex);
+                }
         }
         return false;
     }
@@ -196,7 +192,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler hatch && hatch.getTierForStructure() >= 5) {
+            if (aMetaTileEntity instanceof MTEHatchMuffler hatch && hatch.getTierForStructure() >= 5) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
             }
         }
@@ -204,9 +200,9 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
     }
 
     @Override
-    public IStructureDefinition<GregtechMTE_NuclearReactor> getStructureDefinition() {
+    public IStructureDefinition<MTENuclearReactor> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_NuclearReactor>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTENuclearReactor>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -218,18 +214,18 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
                 .addElement(
                     'C',
                     ofChain(
-                        buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(Maintenance)
+                        buildHatchAdder(MTENuclearReactor.class).atLeast(Maintenance)
                             .casingIndex(TAE.GTPP_INDEX(12))
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(InputHatch, OutputHatch)
-                            .adder(GregtechMTE_NuclearReactor::addNuclearReactorEdgeList)
+                        buildHatchAdder(MTENuclearReactor.class).atLeast(InputHatch, OutputHatch)
+                            .adder(MTENuclearReactor::addNuclearReactorEdgeList)
                             .hatchItemFilterAnd(t -> filterByMTETier(5, Integer.MAX_VALUE))
                             .casingIndex(TAE.GTPP_INDEX(12))
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(Dynamo)
-                            .adder(GregtechMTE_NuclearReactor::addNuclearReactorEdgeList)
+                        buildHatchAdder(MTENuclearReactor.class).atLeast(Dynamo)
+                            .adder(MTENuclearReactor::addNuclearReactorEdgeList)
                             .hatchItemFilterAnd(t -> filterByMTETier(4, 6))
                             .casingIndex(TAE.GTPP_INDEX(12))
                             .dot(1)
@@ -237,8 +233,8 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
                         onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 12))))
                 .addElement(
                     'X',
-                    buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(Muffler)
-                        .adder(GregtechMTE_NuclearReactor::addNuclearReactorTopList)
+                    buildHatchAdder(MTENuclearReactor.class).atLeast(Muffler)
+                        .adder(MTENuclearReactor::addNuclearReactorTopList)
                         .hatchItemFilterAnd(t -> filterByMTETier(5, Integer.MAX_VALUE))
                         .casingIndex(TAE.GTPP_INDEX(12))
                         .dot(1)
@@ -314,33 +310,33 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMTE_NuclearReactor(this.mName);
+        return new MTENuclearReactor(this.mName);
     }
 
     public boolean turnCasingActive(final boolean status) {
         // TODO
         if (this.mDynamoHatches != null) {
-            for (final GT_MetaTileEntity_Hatch_Dynamo hatch : this.mDynamoHatches) {
+            for (final MTEHatchDynamo hatch : this.mDynamoHatches) {
                 hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12));
             }
         }
         if (this.mMufflerHatches != null) {
-            for (final GT_MetaTileEntity_Hatch_Muffler hatch : this.mMufflerHatches) {
+            for (final MTEHatchMuffler hatch : this.mMufflerHatches) {
                 hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12));
             }
         }
         if (this.mOutputHatches != null) {
-            for (final GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) {
+            for (final MTEHatchOutput hatch : this.mOutputHatches) {
                 hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12));
             }
         }
         if (this.mInputHatches != null) {
-            for (final GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) {
+            for (final MTEHatchInput hatch : this.mInputHatches) {
                 hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12));
             }
         }
         if (this.mMaintenanceHatches != null) {
-            for (final GT_MetaTileEntity_Hatch_Maintenance hatch : this.mMaintenanceHatches) {
+            for (final MTEHatchMaintenance hatch : this.mMaintenanceHatches) {
                 hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12));
             }
         }
@@ -353,8 +349,8 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
 
             @NotNull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
-                return GT_OverclockCalculator
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
+                return OverclockCalculator
                     .ofNoOverclock(recipe.getMetadataOrDefault(LFTR_OUTPUT_POWER, 0) * 4L, recipe.mDuration);
             }
 
@@ -370,13 +366,13 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 mFuelRemaining = 0;
                 int li2bef4 = 0;
                 FluidStack aFuelFluid = null;
                 for (FluidStack aFluidInput : recipe.mFluidInputs) {
                     if (!aFluidInput.getFluid()
-                        .equals(NUCLIDE.Li2BeF4.getFluid())) {
+                        .equals(MaterialsNuclides.Li2BeF4.getFluid())) {
                         aFuelFluid = aFluidInput;
                         break;
                     }
@@ -386,7 +382,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
                         if (fluidStack.isFluidEqual(aFuelFluid)) {
                             mFuelRemaining += fluidStack.amount;
                         } else if (fluidStack.getFluid()
-                            .equals(NUCLIDE.Li2BeF4.getFluid())) {
+                            .equals(MaterialsNuclides.Li2BeF4.getFluid())) {
                                 li2bef4 += fluidStack.amount;
                             }
                     }
@@ -500,7 +496,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
         if (this.mEfficiency == this.getMaxEfficiency(null)) {
             // Try output some Uranium-233
             if (MathUtils.randInt(1, 300) == 1) {
-                this.addOutput(ELEMENT.getInstance().URANIUM233.getFluidStack(MathUtils.randInt(1, 10)));
+                this.addOutput(MaterialsElements.getInstance().URANIUM233.getFluidStack(MathUtils.randInt(1, 10)));
             }
         }
         return super.onRunningTick(aStack);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java
index 9f25f59f1f..b3f3f2b136 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java
@@ -4,20 +4,20 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.ExoticEnergy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_OreDictUnificator.getAssociation;
-import static gregtech.api.util.GT_ParallelHelper.addFluidsLong;
-import static gregtech.api.util.GT_ParallelHelper.addItemsLong;
-import static gregtech.api.util.GT_ParallelHelper.calculateChancedOutputMultiplier;
-import static gregtech.api.util.GT_RecipeBuilder.BUCKETS;
-import static gregtech.api.util.GT_RecipeBuilder.INGOTS;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.ExoticEnergy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTOreDictUnificator.getAssociation;
+import static gregtech.api.util.GTRecipeBuilder.BUCKETS;
+import static gregtech.api.util.GTRecipeBuilder.INGOTS;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.ParallelHelper.addFluidsLong;
+import static gregtech.api.util.ParallelHelper.addItemsLong;
+import static gregtech.api.util.ParallelHelper.calculateChancedOutputMultiplier;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -51,7 +51,7 @@ import com.gtnewhorizon.structurelib.structure.StructureUtility;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
@@ -60,29 +60,28 @@ 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_ExtendedPowerMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_ParallelHelper;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.ParallelHelper;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 @SuppressWarnings("SpellCheckingInspection")
-public class GregtechMetaTileEntity_QuantumForceTransformer
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GregtechMetaTileEntity_QuantumForceTransformer>
+public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase<MTEQuantumForceTransformer>
     implements ISurvivalConstructable {
 
     private int mCasing;
@@ -90,13 +89,13 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
     protected int mFocusingTier = 0;
     protected int mMaxParallel = 0;
     private boolean mFluidMode = false, doFermium = false, doNeptunium = false;
-    private static final Fluid mNeptunium = ELEMENT.getInstance().NEPTUNIUM.getPlasma();
-    private static final Fluid mFermium = ELEMENT.getInstance().FERMIUM.getPlasma();
+    private static final Fluid mNeptunium = MaterialsElements.getInstance().NEPTUNIUM.getPlasma();
+    private static final Fluid mFermium = MaterialsElements.getInstance().FERMIUM.getPlasma();
     private static final String MAIN_PIECE = "main";
-    private GT_MetaTileEntity_Hatch_Input mNeptuniumHatch;
-    private GT_MetaTileEntity_Hatch_Input mFermiumHatch;
-    private static final IStructureDefinition<GregtechMetaTileEntity_QuantumForceTransformer> STRUCTURE_DEFINITION = StructureDefinition
-        .<GregtechMetaTileEntity_QuantumForceTransformer>builder()
+    private MTEHatchInput mNeptuniumHatch;
+    private MTEHatchInput mFermiumHatch;
+    private static final IStructureDefinition<MTEQuantumForceTransformer> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEQuantumForceTransformer>builder()
         .addShape(
             MAIN_PIECE,
             new String[][] { // A - 142, B - 234, C - 177, D - 96, E - 224, H - 36, M - 21
@@ -183,8 +182,8 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
                     craftingTierConverter(),
                     getAllCraftingTiers(),
                     0,
-                    GregtechMetaTileEntity_QuantumForceTransformer::setCraftingTier,
-                    GregtechMetaTileEntity_QuantumForceTransformer::getCraftingTier)))
+                    MTEQuantumForceTransformer::setCraftingTier,
+                    MTEQuantumForceTransformer::getCraftingTier)))
         .addElement(
             'B',
             withChannel(
@@ -193,60 +192,56 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
                     focusingTierConverter(),
                     getAllFocusingTiers(),
                     0,
-                    GregtechMetaTileEntity_QuantumForceTransformer::setFocusingTier,
-                    GregtechMetaTileEntity_QuantumForceTransformer::getFocusingTier)))
+                    MTEQuantumForceTransformer::setFocusingTier,
+                    MTEQuantumForceTransformer::getFocusingTier)))
         .addElement('C', ofBlock(ModBlocks.blockCasings4Misc, 4))
         .addElement('D', ofBlock(ModBlocks.blockCasings2Misc, 12))
         .addElement('E', lazy(t -> ofBlock(t.getCasingBlock1(), t.getCasingMeta1())))
         .addElement(
             'H',
-            buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
+            buildHatchAdder(MTEQuantumForceTransformer.class)
                 .atLeast(InputBus, InputHatch, Maintenance, Energy.or(ExoticEnergy))
                 .casingIndex(TAE.getIndexFromPage(0, 10))
                 .dot(4)
                 .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
         .addElement(
             'T',
-            buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
-                .atLeast(OutputBus, OutputHatch, Maintenance)
+            buildHatchAdder(MTEQuantumForceTransformer.class).atLeast(OutputBus, OutputHatch, Maintenance)
                 .casingIndex(TAE.getIndexFromPage(0, 10))
                 .dot(5)
                 .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
         .addElement(
             'Z',
-            buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
-                .hatchClass(GT_MetaTileEntity_Hatch_Input.class)
-                .adder(GregtechMetaTileEntity_QuantumForceTransformer::addNeptuniumHatch)
+            buildHatchAdder(MTEQuantumForceTransformer.class).hatchClass(MTEHatchInput.class)
+                .adder(MTEQuantumForceTransformer::addNeptuniumHatch)
                 .casingIndex(TAE.getIndexFromPage(0, 10))
                 .dot(5)
                 .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
         .addElement(
             'X',
-            buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
-                .hatchClass(GT_MetaTileEntity_Hatch_Input.class)
-                .adder(GregtechMetaTileEntity_QuantumForceTransformer::addFermiumHatch)
+            buildHatchAdder(MTEQuantumForceTransformer.class).hatchClass(MTEHatchInput.class)
+                .adder(MTEQuantumForceTransformer::addFermiumHatch)
                 .casingIndex(TAE.getIndexFromPage(0, 10))
                 .dot(5)
                 .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
         .build();
 
-    public GregtechMetaTileEntity_QuantumForceTransformer(final int aID, final String aName,
-        final String aNameRegional) {
+    public MTEQuantumForceTransformer(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_QuantumForceTransformer(final String aName) {
+    public MTEQuantumForceTransformer(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_QuantumForceTransformer(this.mName);
+        return new MTEQuantumForceTransformer(this.mName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Quantum Force Transformer")
             .addInfo("Controller Block for the Quantum Force Transformer")
             .addInfo("Allows Complex chemical lines to be performed instantly in one step")
@@ -292,7 +287,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
                     + EnumChatFormatting.GRAY
                     + " side of Controller")
             .toolTipFinisher(
-                GT_Values.AuthorBlueWeabo + EnumChatFormatting.RESET
+                GTValues.AuthorBlueWeabo + EnumChatFormatting.RESET
                     + EnumChatFormatting.GREEN
                     + " + Steelux"
                     + EnumChatFormatting.RESET
@@ -301,7 +296,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_QuantumForceTransformer> getStructureDefinition() {
+    public IStructureDefinition<MTEQuantumForceTransformer> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -457,7 +452,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 if (recipe.mSpecialValue > getCraftingTier()) {
                     return CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue);
                 }
@@ -519,7 +514,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
 
             @NotNull
             @Override
-            public GT_ParallelHelper createParallelHelper(@Nonnull GT_Recipe recipe) {
+            public ParallelHelper createParallelHelper(@Nonnull GTRecipe recipe) {
                 return super.createParallelHelper(recipe).setCustomItemOutputCalculation(parallel -> {
                     ArrayList<ItemStack> items = new ArrayList<>();
 
@@ -567,15 +562,14 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
             private int findProgrammedCircuitNumber() {
                 if (isInputSeparationEnabled()) {
                     for (ItemStack stack : inputItems) {
-                        if (GT_Utility.isAnyIntegratedCircuit(stack)) {
+                        if (GTUtility.isAnyIntegratedCircuit(stack)) {
                             return stack.getItemDamage() - 1;
                         }
                     }
                     return -1;
                 } else {
                     final ItemStack controllerStack = getControllerSlot();
-                    return GT_Utility.isAnyIntegratedCircuit(controllerStack) ? controllerStack.getItemDamage() - 1
-                        : -1;
+                    return GTUtility.isAnyIntegratedCircuit(controllerStack) ? controllerStack.getItemDamage() - 1 : -1;
                 }
             }
         };
@@ -654,12 +648,12 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
         return false;
     }
 
-    public static int getBaseOutputChance(GT_Recipe tRecipe) {
+    public static int getBaseOutputChance(GTRecipe tRecipe) {
         int aOutputsAmount = tRecipe.mOutputs.length + tRecipe.mFluidOutputs.length;
         return 10000 / aOutputsAmount;
     }
 
-    private int[] getOutputChances(GT_Recipe tRecipe, int aChanceIncreased) {
+    private int[] getOutputChances(GTRecipe tRecipe, int aChanceIncreased) {
         int difference = getFocusingTier() - tRecipe.mSpecialValue;
         int aOutputsAmount = tRecipe.mOutputs.length + tRecipe.mFluidOutputs.length;
         int aChancePerOutput = 10000 / aOutputsAmount;
@@ -719,7 +713,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
     @Override
     public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         mFluidMode = !mFluidMode;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             StatCollector.translateToLocal("miscutils.machines.QFTFluidMode") + " " + mFluidMode);
     }
@@ -728,10 +722,10 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-            ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-            ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = null;
-            mNeptuniumHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchInput) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null;
+            mNeptuniumHatch = (MTEHatchInput) aMetaTileEntity;
             return true;
         }
         return false;
@@ -741,10 +735,10 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-            ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-            ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = null;
-            mFermiumHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchInput) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null;
+            mFermiumHatch = (MTEHatchInput) aMetaTileEntity;
             return true;
         }
         return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java
index 8a6564858e..2160f43546 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java
@@ -4,14 +4,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.filterByMTETier;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.filterByMTETier;
 
 import net.minecraft.item.ItemStack;
 
@@ -26,25 +26,24 @@ import gregtech.api.interfaces.IIconContainer;
 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_Muffler;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 
-public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Refinery>
-    implements ISurvivalConstructable {
+public class MTERefinery extends GTPPMultiBlockBase<MTERefinery> implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GregtechMetaTileEntity_Refinery> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTERefinery> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntity_Refinery(final int aID, final String aName, final String aNameRegional) {
+    public MTERefinery(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_Refinery(final String aName) {
+    public MTERefinery(final String aName) {
         super(aName);
     }
 
@@ -54,8 +53,8 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Fission Fuel Processing Unit")
             .addInfo("Refines fluorides and Uranium into nuclear fuel for the LFTR")
@@ -79,7 +78,7 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
             .addStructureInfo("Muffler's Tier must be IV+")
             .addStructureInfo("2-4x Input Hatches, 1-2x Output Hatches")
             .addStructureInfo("1x Muffler, 1x Maintenance Hatch, 1x Energy Hatch")
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -119,8 +118,7 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler
-                && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 5) {
+            if (aMetaTileEntity instanceof MTEHatchMuffler && ((MTEHatchMuffler) aMetaTileEntity).mTier >= 5) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
             }
         }
@@ -128,9 +126,9 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_Refinery> getStructureDefinition() {
+    public IStructureDefinition<MTERefinery> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Refinery>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTERefinery>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -140,13 +138,13 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
                 .addElement(
                     'X',
                     ofChain(
-                        buildHatchAdder(GregtechMetaTileEntity_Refinery.class)
+                        buildHatchAdder(MTERefinery.class)
                             .atLeast(Energy, Maintenance, OutputHatch, OutputBus, InputHatch)
                             .casingIndex(TAE.GTPP_INDEX(18))
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMetaTileEntity_Refinery.class).atLeast(Muffler)
-                            .adder(GregtechMetaTileEntity_Refinery::addMufflerToMachineList)
+                        buildHatchAdder(MTERefinery.class).atLeast(Muffler)
+                            .adder(MTERefinery::addMufflerToMachineList)
                             .hatchItemFilterAnd(t -> filterByMTETier(6, Integer.MAX_VALUE))
                             .casingIndex(TAE.GTPP_INDEX(18))
                             .dot(1)
@@ -200,7 +198,7 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiRefinery;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiRefinery;
     }
 
     @Override
@@ -215,6 +213,6 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_Refinery(this.mName);
+        return new MTERefinery(this.mName);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java
index 0f3d201cb5..085cb1b784 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java
@@ -3,10 +3,10 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.ArrayList;
 
@@ -37,19 +37,18 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.core.material.MaterialMisc;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import gtPlusPlus.xmod.gregtech.common.tileentities.misc.TileEntitySolarHeater;
+import gtPlusPlus.xmod.gregtech.common.tileentities.misc.MTESolarHeater;
 
-public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_SolarTower>
-    implements ISurvivalConstructable {
+public class MTESolarTower extends GTPPMultiBlockBase<MTESolarTower> implements ISurvivalConstructable {
 
     // 862
     private static final int mCasingTextureID = TAE.getIndexFromPage(3, 9);
@@ -59,19 +58,19 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
     private int mCasing3;
     private int mCasing4;
 
-    public ArrayList<TileEntitySolarHeater> mSolarHeaters = new ArrayList<>();
+    public ArrayList<MTESolarHeater> mSolarHeaters = new ArrayList<>();
 
-    public GregtechMetaTileEntity_SolarTower(final int aID, final String aName, final String aNameRegional) {
+    public MTESolarTower(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMetaTileEntity_SolarTower(final String aName) {
+    public MTESolarTower(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_SolarTower(this.mName);
+        return new MTESolarTower(this.mName);
     }
 
     @Override
@@ -80,15 +79,15 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
     }
 
     @Override
-    protected final GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected final MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Contributing Green Energy towards the future")
             .addInfo("Surround with rings of Solar Reflectors")
             .addInfo("The Reflectors increase the internal heat value of the Tower (see below for formula)")
             .addInfo("Each Reflector ring increases tier, the first ring is required for the Tower to work")
-            .addInfo("Input: " + MISC_MATERIALS.SOLAR_SALT_COLD.getLocalizedName())
-            .addInfo("Output: " + MISC_MATERIALS.SOLAR_SALT_HOT.getLocalizedName())
+            .addInfo("Input: " + MaterialMisc.SOLAR_SALT_COLD.getLocalizedName())
+            .addInfo("Output: " + MaterialMisc.SOLAR_SALT_HOT.getLocalizedName())
             .addInfo("Every cycle (10 seconds), heat increases and all the Cold Solar Salt is heated")
             .addInfo("Converting Cold to Hot Solar Salt reduces heat, equal to the amount converted")
             .addInfo("This conversion only happens if heat >= 30000 and controller efficiency = 100%")
@@ -110,7 +109,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
             .addInputHatch("Any 2 dot hint(min 1)", 2)
             .addOutputHatch("Any 2 dot hint(min 1)", 2)
             .addMaintenanceHatch("Any 2 dot hint", 2)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -125,11 +124,11 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
     private static final String SOLAR_HEATER_RING_4 = STRUCTURE_PIECE_SOLAR_HEATER_RING[3];
     private static final String SOLAR_HEATER_RING_5 = STRUCTURE_PIECE_SOLAR_HEATER_RING[4];
 
-    private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>> STRUCTURE_DEFINITION = new ClassValue<>() {
+    private static final ClassValue<IStructureDefinition<MTESolarTower>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
-        protected IStructureDefinition<GregtechMetaTileEntity_SolarTower> computeValue(Class<?> type) {
-            return StructureDefinition.<GregtechMetaTileEntity_SolarTower>builder()
+        protected IStructureDefinition<MTESolarTower> computeValue(Class<?> type) {
+            return StructureDefinition.<MTESolarTower>builder()
 
                 // s = salt
                 // c = thermal containment
@@ -226,9 +225,8 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
                 .addElement(
                     'g',
                     lazy(
-                        t -> buildHatchAdder(GregtechMetaTileEntity_SolarTower.class)
-                            .hatchClass(TileEntitySolarHeater.class)
-                            .adder(GregtechMetaTileEntity_SolarTower::addSolarHeater)
+                        t -> buildHatchAdder(MTESolarTower.class).hatchClass(MTESolarHeater.class)
+                            .adder(MTESolarTower::addSolarHeater)
                             // Use a positive casing index to make adder builder happy
                             .casingIndex(1)
                             .dot(1)
@@ -249,8 +247,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
                 .addElement(
                     'h',
                     lazy(
-                        t -> buildHatchAdder(GregtechMetaTileEntity_SolarTower.class)
-                            .atLeast(InputHatch, OutputHatch, Maintenance)
+                        t -> buildHatchAdder(MTESolarTower.class).atLeast(InputHatch, OutputHatch, Maintenance)
                             .casingIndex(t.getCasingTextureIndex())
                             .dot(2)
                             .buildAndChain(
@@ -387,7 +384,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_SolarTower> getStructureDefinition() {
+    public IStructureDefinition<MTESolarTower> getStructureDefinition() {
         return STRUCTURE_DEFINITION.get(getClass());
     }
 
@@ -497,7 +494,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof TileEntitySolarHeater mTile) {
+            if (aMetaTileEntity instanceof MTESolarHeater mTile) {
                 if (!mTile.hasSolarTower() && mTile.canSeeSky()) {
                     // Logger.INFO("Found Solar Reflector, Injecting Data.");
                     mTile.setSolarTower(this);
@@ -544,9 +541,9 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
             if (aHeaters > 0 && w.isDaytime()) {
                 if (w.isRaining() && this.getBaseMetaTileEntity()
                     .getBiome().rainfall > 0.0F) {
-                    this.mHeatLevel += GT_Utility.safeInt((long) ((aHeaters / 2) * aEfficiency * (10 + aTier)));
+                    this.mHeatLevel += GTUtility.safeInt((long) ((aHeaters / 2) * aEfficiency * (10 + aTier)));
                 } else {
-                    this.mHeatLevel += GT_Utility.safeInt((long) (aHeaters * aEfficiency * (10 + aTier)));
+                    this.mHeatLevel += GTUtility.safeInt((long) (aHeaters * aEfficiency * (10 + aTier)));
                 }
             }
 
@@ -562,10 +559,10 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
 
         if (this.mEfficiency == this.getMaxEfficiency(null) && this.mHeatLevel >= 30000) {
             if (mColdSalt == null) {
-                mColdSalt = MISC_MATERIALS.SOLAR_SALT_COLD.getFluid();
+                mColdSalt = MaterialMisc.SOLAR_SALT_COLD.getFluid();
             }
             if (mHotSalt == null) {
-                mHotSalt = MISC_MATERIALS.SOLAR_SALT_HOT.getFluid();
+                mHotSalt = MaterialMisc.SOLAR_SALT_HOT.getFluid();
             }
             ArrayList<FluidStack> aFluids = this.getStoredFluids();
             for (FluidStack aFluid : aFluids) {
@@ -656,7 +653,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
     }
 
     private void resetSolarHeaters() {
-        for (TileEntitySolarHeater aTile : this.mSolarHeaters) {
+        for (MTESolarHeater aTile : this.mSolarHeaters) {
             aTile.clearSolarTower();
         }
         this.mSolarHeaters.clear();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java
index 694444f423..8889cbd501 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java
@@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.stream.Stream;
 
@@ -30,7 +30,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
@@ -39,22 +39,21 @@ import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_ParallelHelper;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.ParallelHelper;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Entity_ThermalBoiler>
-    implements ISurvivalConstructable {
+public class MTEThermalBoiler extends GTPPMultiBlockBase<MTEThermalBoiler> implements ISurvivalConstructable {
 
     private int mCasing;
-    private static IStructureDefinition<GT4Entity_ThermalBoiler> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEThermalBoiler> STRUCTURE_DEFINITION = null;
 
     private static final int lavaFilterResilience = 30; // Damage lava filter with 1/n probability every operation.
     private int dryHeatCounter = 0; // Counts up to dryHeatMaximum to check for explosion conditions.
@@ -70,17 +69,17 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
     private static final Fluid fluidSHSteam = FluidUtils.getSuperHeatedSteam(1)
         .getFluid();
 
-    public GT4Entity_ThermalBoiler(int aID, String aName, String aNameRegional) {
+    public MTEThermalBoiler(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT4Entity_ThermalBoiler(String mName) {
+    public MTEThermalBoiler(String mName) {
         super(mName);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT4Entity_ThermalBoiler(this.mName);
+        return new MTEThermalBoiler(this.mName);
     }
 
     @Override
@@ -121,7 +120,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
             // We still want to run if we lack water (and subsequently explode).
             @NotNull
             @Override
-            protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
+            protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
                 if (lastRecipe != null && depleteInput(lastRecipe.mFluidInputs[0], true)) {
                     return Stream.of(lastRecipe);
                 }
@@ -135,8 +134,8 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
 
             @NotNull
             @Override
-            protected GT_ParallelHelper createParallelHelper(@Nonnull GT_Recipe recipe) {
-                GT_Recipe adjustedRecipe = recipe.copy();
+            protected ParallelHelper createParallelHelper(@Nonnull GTRecipe recipe) {
+                GTRecipe adjustedRecipe = recipe.copy();
 
                 // Hack the recipe logic to not consume water, so that we can explode.
                 for (FluidStack inputFluid : adjustedRecipe.mFluidInputs) {
@@ -241,7 +240,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
 
     private boolean useWater(int steamAmount) {
         // Round up to not dupe decimal amounts of water.
-        int waterAmount = Math.floorDiv(steamAmount + GT_Values.STEAM_PER_WATER - 1, GT_Values.STEAM_PER_WATER);
+        int waterAmount = Math.floorDiv(steamAmount + GTValues.STEAM_PER_WATER - 1, GTValues.STEAM_PER_WATER);
         if (depleteInput(FluidUtils.getWater(waterAmount)) || depleteInput(FluidUtils.getDistilledWater(waterAmount))) {
             dryHeatCounter = 0;
             return true;
@@ -250,7 +249,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
             if (dryHeatCounter < dryHeatMaximum) {
                 ++dryHeatCounter;
             } else {
-                GT_Log.exp.println(this.mName + " was too hot and had no more Water!");
+                GTLog.exp.println(this.mName + " was too hot and had no more Water!");
                 explodeMultiblock(); // Generate crater
             }
             return false;
@@ -273,12 +272,12 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiThermalBoiler;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiThermalBoiler;
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Thermal Boiler Controller")
             .addInfo("Converts Water & Heat into Steam")
@@ -295,7 +294,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
             .addOutputHatch("Any Casing", 1)
             .addMaintenanceHatch("Any Casing", 1)
             .addMufflerHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -315,16 +314,16 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
     }
 
     @Override
-    public IStructureDefinition<GT4Entity_ThermalBoiler> getStructureDefinition() {
+    public IStructureDefinition<MTEThermalBoiler> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GT4Entity_ThermalBoiler>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEThermalBoiler>builder()
                 .addShape(
                     mName,
                     transpose(
                         new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GT4Entity_ThermalBoiler.class)
+                    buildHatchAdder(MTEThermalBoiler.class)
                         .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Muffler)
                         .casingIndex(TAE.getIndexFromPage(0, 1))
                         .dot(1)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java
index 8017ffbf47..6f8dd28c03 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java
@@ -3,31 +3,31 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
-import static gregtech.common.items.ID_MetaTool_01.BRANCHCUTTER;
-import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_HV;
-import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_LV;
-import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_MV;
-import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_HV;
-import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_LV;
-import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_MV;
-import static gregtech.common.items.ID_MetaTool_01.KNIFE;
-import static gregtech.common.items.ID_MetaTool_01.POCKET_BRANCHCUTTER;
-import static gregtech.common.items.ID_MetaTool_01.POCKET_KNIFE;
-import static gregtech.common.items.ID_MetaTool_01.POCKET_MULTITOOL;
-import static gregtech.common.items.ID_MetaTool_01.POCKET_SAW;
-import static gregtech.common.items.ID_MetaTool_01.POCKET_WIRECUTTER;
-import static gregtech.common.items.ID_MetaTool_01.SAW;
-import static gregtech.common.items.ID_MetaTool_01.WIRECUTTER;
-import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTEnergy;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.common.items.IDMetaTool01.BRANCHCUTTER;
+import static gregtech.common.items.IDMetaTool01.BUZZSAW_HV;
+import static gregtech.common.items.IDMetaTool01.BUZZSAW_LV;
+import static gregtech.common.items.IDMetaTool01.BUZZSAW_MV;
+import static gregtech.common.items.IDMetaTool01.CHAINSAW_HV;
+import static gregtech.common.items.IDMetaTool01.CHAINSAW_LV;
+import static gregtech.common.items.IDMetaTool01.CHAINSAW_MV;
+import static gregtech.common.items.IDMetaTool01.KNIFE;
+import static gregtech.common.items.IDMetaTool01.POCKET_BRANCHCUTTER;
+import static gregtech.common.items.IDMetaTool01.POCKET_KNIFE;
+import static gregtech.common.items.IDMetaTool01.POCKET_MULTITOOL;
+import static gregtech.common.items.IDMetaTool01.POCKET_SAW;
+import static gregtech.common.items.IDMetaTool01.POCKET_WIRECUTTER;
+import static gregtech.common.items.IDMetaTool01.SAW;
+import static gregtech.common.items.IDMetaTool01.WIRECUTTER;
+import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTEnergy;
 
 import java.util.ArrayList;
 import java.util.EnumMap;
@@ -51,38 +51,38 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import forestry.api.arboriculture.IToolGrafter;
 import forestry.api.arboriculture.ITree;
 import forestry.api.arboriculture.TreeManager;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Mods;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 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.implementations.GT_MetaTileEntity_Hatch_InputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.VoidProtectionHelper;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.ID_MetaTool_01;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_InputBus_ME;
+import gregtech.common.items.IDMetaTool01;
+import gregtech.common.items.MetaGeneratedTool01;
+import gregtech.common.tileentities.machines.MTEHatchInputBusME;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
+import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderTreeFarm;
 
-public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntityTreeFarm>
-    implements ISurvivalConstructable {
+public class MTETreeFarm extends GTPPMultiBlockBase<MTETreeFarm> implements ISurvivalConstructable {
 
     public static int CASING_TEXTURE_ID;
     private static final int TICKS_PER_OPERATION = 100;
@@ -91,21 +91,21 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
 
     private int mCasing;
     public static String mCasingName = "Sterile Farm Casing";
-    private static IStructureDefinition<GregtechMetaTileEntityTreeFarm> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTETreeFarm> STRUCTURE_DEFINITION = null;
 
-    public GregtechMetaTileEntityTreeFarm(final int aID, final String aName, final String aNameRegional) {
+    public MTETreeFarm(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(1, 15);
     }
 
-    public GregtechMetaTileEntityTreeFarm(final String aName) {
+    public MTETreeFarm(final String aName) {
         super(aName);
         CASING_TEXTURE_ID = TAE.getIndexFromPage(1, 15);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntityTreeFarm(this.mName);
+        return new MTETreeFarm(this.mName);
     }
 
     @Override
@@ -114,8 +114,8 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller block for the Tree Growth Simulator")
             .addInfo("Farms and harvests trees using EU")
@@ -144,7 +144,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
             .addEnergyHatch("Any casing", 1)
             .addMaintenanceHatch("Any casing", 1)
             .addMufflerHatch("Any casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -176,7 +176,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus_ME) return false;
+        if (aMetaTileEntity instanceof MTEHatchInputBusME) return false;
         return super.addInputBusToMachineList(aTileEntity, aBaseCasingIndex);
     }
 
@@ -208,7 +208,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiTreeFarm;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiTreeFarm;
     }
 
     @Override
@@ -217,16 +217,16 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
     }
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntityTreeFarm> getStructureDefinition() {
+    public IStructureDefinition<MTETreeFarm> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntityTreeFarm>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTETreeFarm>builder()
                 .addShape(
                     mName,
                     transpose(
                         new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, }))
                 .addElement(
                     'C',
-                    buildHatchAdder(GregtechMetaTileEntityTreeFarm.class)
+                    buildHatchAdder(MTETreeFarm.class)
                         .atLeast(
                             InputHatch,
                             OutputHatch,
@@ -264,7 +264,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
          * In previous versions, a saw used to go in the controller slot. We do not want an update to stop processing of
          * a machine set up like this. Instead, a sapling is placed in this slot at the start of the next operation.
          */
-        if (aStack.getItem() instanceof GT_MetaGenerated_Tool_01) return true;
+        if (aStack.getItem() instanceof MetaGeneratedTool01) return true;
         return false;
     }
 
@@ -343,7 +343,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
                     return SimpleCheckRecipeResult.ofFailure("no_output_for_sapling");
                 }
 
-                int tier = Math.max(1, GT_Utility.getTier(availableVoltage * availableAmperage));
+                int tier = Math.max(1, GTUtility.getTier(availableVoltage * availableAmperage));
                 int tierMultiplier = getTierMultiplier(tier);
 
                 List<ItemStack> outputs = new ArrayList<>();
@@ -376,7 +376,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
                 }
 
                 duration = TICKS_PER_OPERATION;
-                calculatedEut = GT_Values.VP[tier];
+                calculatedEut = GTValues.VP[tier];
 
                 for (Mode mode : Mode.values()) {
                     if (outputPerMode.get(mode) != null) {
@@ -407,11 +407,11 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
                 continue;
             }
             boolean canDamage = shouldDamage
-                ? GT_ModHandler.damageOrDechargeItem(stack, TOOL_DAMAGE_PER_OPERATION, TOOL_CHARGE_PER_OPERATION, null)
-                : GT_ModHandler.damageOrDechargeItem(stack, 0, 0, null);
+                ? GTModHandler.damageOrDechargeItem(stack, TOOL_DAMAGE_PER_OPERATION, TOOL_CHARGE_PER_OPERATION, null)
+                : GTModHandler.damageOrDechargeItem(stack, 0, 0, null);
             if (shouldDamage) {
-                if (!canDamage || GT_ModHandler.isElectricItem(stack)
-                    && !GT_ModHandler.canUseElectricItem(stack, TOOL_CHARGE_PER_OPERATION)) {
+                if (!canDamage || GTModHandler.isElectricItem(stack)
+                    && !GTModHandler.canUseElectricItem(stack, TOOL_CHARGE_PER_OPERATION)) {
                     depleteInput(stack);
                     addOutput(stack);
                 }
@@ -436,7 +436,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
         int damage = toolStack.getItemDamage();
         switch (mode) {
             case LOG:
-                if (tool instanceof GT_MetaGenerated_Tool_01) {
+                if (tool instanceof MetaGeneratedTool01) {
 
                     if (damage == SAW.ID || damage == POCKET_SAW.ID || damage == POCKET_MULTITOOL.ID) {
                         return 1;
@@ -453,7 +453,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
                 break;
 
             case SAPLING:
-                if (tool instanceof GT_MetaGenerated_Tool_01
+                if (tool instanceof MetaGeneratedTool01
                     && (damage == BRANCHCUTTER.ID || damage == POCKET_BRANCHCUTTER.ID
                         || damage == POCKET_MULTITOOL.ID)) {
                     return 1;
@@ -468,7 +468,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
                 if (tool instanceof ItemShears && tool.isDamageable()) {
                     return 1;
                 }
-                if (tool instanceof GT_MetaGenerated_Tool_01) {
+                if (tool instanceof MetaGeneratedTool01) {
                     if (damage == POCKET_MULTITOOL.ID) {
                         return 1;
                     }
@@ -484,7 +484,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
                 break;
 
             case FRUIT:
-                if (tool instanceof GT_MetaGenerated_Tool_01
+                if (tool instanceof MetaGeneratedTool01
                     && (damage == KNIFE.ID || damage == POCKET_KNIFE.ID || damage == POCKET_MULTITOOL.ID)) {
                     return 1;
                 }
@@ -539,9 +539,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
      */
     private boolean legacyToolSwap() {
         ItemStack controllerSlot = getControllerSlot();
-        if (controllerSlot == null || !(controllerSlot.getItem() instanceof GT_MetaGenerated_Tool_01)) return false;
+        if (controllerSlot == null || !(controllerSlot.getItem() instanceof MetaGeneratedTool01)) return false;
 
-        for (GT_MetaTileEntity_Hatch_InputBus inputBus : filterValidMTEs(mInputBusses)) {
+        for (MTEHatchInputBus inputBus : filterValidMTEs(mInputBusses)) {
             ItemStack[] inventory = inputBus.getRealInventory();
             for (int slot = 0; slot < inventory.length; ++slot) {
                 if (isValidSapling(inventory[slot])) {
@@ -663,7 +663,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
     /**
      * Registers outputs for a sapling. This method assumes that output in mode SAPLING is the same as the input
      * sapling. Output amount is further modified by mode, machine tier, and tool used. Recipes are added in
-     * {@link gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_TreeFarm}.
+     * {@link RecipeLoaderTreeFarm}.
      *
      * @param sapling The input sapling to farm, and also the output in mode SAPLING.
      * @param log     ItemStack to output in mode LOG.
@@ -676,7 +676,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
 
     /**
      * Registers outputs for a sapling. Output amount is further modified by mode, machine tier, and tool used. Recipes
-     * are added in {@link gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_TreeFarm}.
+     * are added in {@link RecipeLoaderTreeFarm}.
      *
      * @param saplingIn  The input sapling to farm.
      * @param log        ItemStack to output in mode LOG.
@@ -734,30 +734,30 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
      */
     private static final ItemStack[][] altToolsForNEI;
     static {
-        GT_MetaGenerated_Tool toolInstance = GT_MetaGenerated_Tool_01.INSTANCE;
+        MetaGeneratedTool toolInstance = MetaGeneratedTool01.INSTANCE;
         altToolsForNEI = new ItemStack[][] {
             // Mode.LOG
             { toolInstance.getToolWithStats(SAW.ID, 1, null, null, null),
                 toolInstance.getToolWithStats(POCKET_SAW.ID, 1, null, null, null),
-                toolInstance.getToolWithStats(ID_MetaTool_01.BUZZSAW_LV.ID, 1, null, null, null),
+                toolInstance.getToolWithStats(IDMetaTool01.BUZZSAW_LV.ID, 1, null, null, null),
                 toolInstance.getToolWithStats(CHAINSAW_LV.ID, 1, null, null, null),
-                toolInstance.getToolWithStats(ID_MetaTool_01.BUZZSAW_MV.ID, 1, null, null, null),
+                toolInstance.getToolWithStats(IDMetaTool01.BUZZSAW_MV.ID, 1, null, null, null),
                 toolInstance.getToolWithStats(CHAINSAW_MV.ID, 1, null, null, null),
-                toolInstance.getToolWithStats(ID_MetaTool_01.BUZZSAW_HV.ID, 1, null, null, null),
+                toolInstance.getToolWithStats(IDMetaTool01.BUZZSAW_HV.ID, 1, null, null, null),
                 toolInstance.getToolWithStats(CHAINSAW_HV.ID, 1, null, null, null), },
             // Mode.SAPLING
-            { toolInstance.getToolWithStats(ID_MetaTool_01.BRANCHCUTTER.ID, 1, null, null, null),
-                toolInstance.getToolWithStats(ID_MetaTool_01.POCKET_BRANCHCUTTER.ID, 1, null, null, null),
-                GT_ModHandler.getModItem(Mods.Forestry.ID, "grafter", 1, 0), },
+            { toolInstance.getToolWithStats(IDMetaTool01.BRANCHCUTTER.ID, 1, null, null, null),
+                toolInstance.getToolWithStats(IDMetaTool01.POCKET_BRANCHCUTTER.ID, 1, null, null, null),
+                GTModHandler.getModItem(Mods.Forestry.ID, "grafter", 1, 0), },
             // Mode.LEAVES
             { new ItemStack(Items.shears),
-                toolInstance.getToolWithStats(ID_MetaTool_01.WIRECUTTER.ID, 1, null, null, null),
-                toolInstance.getToolWithStats(ID_MetaTool_01.POCKET_WIRECUTTER.ID, 1, null, null, null),
+                toolInstance.getToolWithStats(IDMetaTool01.WIRECUTTER.ID, 1, null, null, null),
+                toolInstance.getToolWithStats(IDMetaTool01.POCKET_WIRECUTTER.ID, 1, null, null, null),
                 MetaGeneratedGregtechTools.getInstance()
                     .getToolWithStats(MetaGeneratedGregtechTools.ELECTRIC_SNIPS, 1, null, null, null), },
             // Mode.FRUIT
-            { toolInstance.getToolWithStats(ID_MetaTool_01.KNIFE.ID, 1, null, null, null),
-                toolInstance.getToolWithStats(ID_MetaTool_01.POCKET_KNIFE.ID, 1, null, null, null), } };
+            { toolInstance.getToolWithStats(IDMetaTool01.KNIFE.ID, 1, null, null, null),
+                toolInstance.getToolWithStats(IDMetaTool01.POCKET_KNIFE.ID, 1, null, null, null), } };
     }
 
     /**
@@ -804,7 +804,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
 
         GTPPRecipeMaps.treeGrowthSimulatorFakeRecipes.addFakeRecipe(
             false,
-            new GT_Recipe.GT_Recipe_WithAlt(
+            new GTRecipe.GTRecipe_WithAlt(
                 false,
                 null, // All inputs are taken from aAtl argument.
                 outputStacks,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java
index 7e5200e16c..1223158f31 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java
@@ -4,10 +4,10 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.stream.Stream;
 
@@ -21,48 +21,47 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TAE;
 import gregtech.api.interfaces.IIconContainer;
 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_Input;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_StreamUtil;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTStreamUtil;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm;
+import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderAlgaeFarm;
 import ic2.core.init.BlocksItems;
 import ic2.core.init.InternalName;
+import tectech.thing.casing.TTCasingsContainer;
 
-public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<GregtechMTE_AlgaePondBase>
-    implements ISurvivalConstructable {
+public class MTEAlgaePondBase extends GTPPMultiBlockBase<MTEAlgaePondBase> implements ISurvivalConstructable {
 
     private int mLevel = -1;
     private int mCasing;
-    private static IStructureDefinition<GregtechMTE_AlgaePondBase> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEAlgaePondBase> STRUCTURE_DEFINITION = null;
     private int checkMeta;
     private static final Class<?> cofhWater;
 
@@ -70,17 +69,17 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
         cofhWater = ReflectionUtils.getClass("cofh.asmhooks.block.BlockWater");
     }
 
-    public GregtechMTE_AlgaePondBase(final int aID, final String aName, final String aNameRegional) {
+    public MTEAlgaePondBase(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMTE_AlgaePondBase(final String aName) {
+    public MTEAlgaePondBase(final String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMTE_AlgaePondBase(this.mName);
+        return new MTEAlgaePondBase(this.mName);
     }
 
     @Override
@@ -89,8 +88,8 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Grows Algae!")
             .addInfo("Controller Block for the Algae Farm")
@@ -108,7 +107,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
             .addInputBus("Any Casing", 1)
             .addOutputBus("Any Casing", 1)
             .addInputHatch("Any Casing", 1)
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -121,9 +120,9 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
     }
 
     @Override
-    public IStructureDefinition<GregtechMTE_AlgaePondBase> getStructureDefinition() {
+    public IStructureDefinition<MTEAlgaePondBase> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_AlgaePondBase>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEAlgaePondBase>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -137,23 +136,23 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
                 .addElement(
                     'C',
                     ofChain(
-                        buildHatchAdder(GregtechMTE_AlgaePondBase.class).atLeast(InputHatch, InputBus, OutputBus)
+                        buildHatchAdder(MTEAlgaePondBase.class).atLeast(InputHatch, InputBus, OutputBus)
                             .casingIndex(TAE.getIndexFromPage(1, 15))
                             .dot(1)
                             .build(),
                         onElementPass(
                             x -> ++x.mCasing,
                             addTieredBlock(
-                                GregTech_API.sBlockCasings1,
-                                GregtechMTE_AlgaePondBase::setMeta,
-                                GregtechMTE_AlgaePondBase::getMeta,
+                                GregTechAPI.sBlockCasings1,
+                                MTEAlgaePondBase::setMeta,
+                                MTEAlgaePondBase::getMeta,
                                 10)),
                         onElementPass(
                             x -> ++x.mCasing,
                             addTieredBlock(
-                                TT_Container_Casings.sBlockCasingsNH,
-                                GregtechMTE_AlgaePondBase::setMeta,
-                                GregtechMTE_AlgaePondBase::getMeta,
+                                TTCasingsContainer.sBlockCasingsNH,
+                                MTEAlgaePondBase::setMeta,
+                                MTEAlgaePondBase::getMeta,
                                 10,
                                 15))))
                 .addElement('X', ofBlock(ModBlocks.blockCasings2Misc, 15))
@@ -184,7 +183,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
             && mInputHatches.size() >= 1
             && mOutputBusses.size() >= 1) {
             mLevel = checkMeta - 1;
-            for (GT_MetaTileEntity_Hatch_Input inputHatch : mInputHatches) {
+            for (MTEHatchInput inputHatch : mInputHatches) {
                 if (inputHatch.mTier < mLevel) {
                     return false;
                 }
@@ -310,7 +309,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
 
     @Override
     public int getPollutionPerSecond(final ItemStack aStack) {
-        return CORE.ConfigSwitches.pollutionPerSecondMultiAlgaePond;
+        return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAlgaePond;
     }
 
     @Override
@@ -333,14 +332,14 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
 
             @Nonnull
             @Override
-            protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
-                return GT_StreamUtil
-                    .ofNullable(RecipeLoader_AlgaeFarm.getTieredRecipeFromCache(mLevel, isUsingCompost(inputItems)));
+            protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
+                return GTStreamUtil
+                    .ofNullable(RecipeLoaderAlgaeFarm.getTieredRecipeFromCache(mLevel, isUsingCompost(inputItems)));
             }
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 if (!checkForWater()) {
                     return SimpleCheckRecipeResult.ofFailure("no_water");
                 }
@@ -353,8 +352,8 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
     private boolean isUsingCompost(ItemStack[] aItemInputs) {
         ItemStack aCompost = ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1);
         for (ItemStack i : aItemInputs) {
-            if (GT_Utility.areStacksEqual(aCompost, i)) {
-                if (i.stackSize >= RecipeLoader_AlgaeFarm.compostForTier(mLevel)) {
+            if (GTUtility.areStacksEqual(aCompost, i)) {
+                if (i.stackSize >= RecipeLoaderAlgaeFarm.compostForTier(mLevel)) {
                     return true;
                 }
             }
@@ -375,8 +374,8 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
             int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ;
             aInitStructureCheck = aBaseMetaTileEntity.getBlockOffset(xDir, -1, zDir);
             aInitStructureCheckMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir, -1, zDir);
-            if (aInitStructureCheck == GregTech_API.sBlockCasings1
-                || aInitStructureCheck == TT_Container_Casings.sBlockCasingsNH) {
+            if (aInitStructureCheck == GregTechAPI.sBlockCasings1
+                || aInitStructureCheck == TTCasingsContainer.sBlockCasingsNH) {
                 return aInitStructureCheckMeta;
             }
             return 0;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java
index b359a3b831..2046de6c1c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java
@@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.c
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.filterByMTETier;
-import static gregtech.api.util.GT_StructureUtility.ofCoil;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.filterByMTETier;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,7 +38,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import com.gtnewhorizon.structurelib.structure.StructureUtility;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IIconContainer;
@@ -46,36 +46,35 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.GregTechTileClientEvents;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-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_Output;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+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.MTEHatchOutput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutputBus;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.tileentities.machines.IDualInputHatch;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Triplet;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_Catalysts;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.MTEHatchCatalysts;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<GregtechMTE_ChemicalPlant>
-    implements ISurvivalConstructable {
+public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> implements ISurvivalConstructable {
 
     private int mSolidCasingTier = 0;
     private int mMachineCasingTier = 0;
@@ -87,24 +86,24 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
     private int checkPipe;
     private int maxTierOfHatch;
     private int mCasing;
-    private static IStructureDefinition<GregtechMTE_ChemicalPlant> STRUCTURE_DEFINITION = null;
+    private static IStructureDefinition<MTEChemicalPlant> STRUCTURE_DEFINITION = null;
 
-    private final ArrayList<GT_MetaTileEntity_Hatch_Catalysts> mCatalystBuses = new ArrayList<>();
+    private final ArrayList<MTEHatchCatalysts> mCatalystBuses = new ArrayList<>();
 
     private static final HashMap<Integer, Triplet<Block, Integer, Integer>> mTieredBlockRegistry = new HashMap<>();
 
-    public GregtechMTE_ChemicalPlant(final int aID, final String aName, final String aNameRegional) {
+    public MTEChemicalPlant(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregtechMTE_ChemicalPlant(final String aName) {
+    public MTEChemicalPlant(final String aName) {
         super(aName);
     }
 
     public static boolean registerMachineCasingForTier(int aTier, Block aBlock, int aMeta, int aCasingTextureID) {
         Triplet<Block, Integer, Integer> aCasingData = new Triplet<>(aBlock, aMeta, aCasingTextureID);
         if (mTieredBlockRegistry.containsKey(aTier)) {
-            CORE.crash(
+            GTPPCore.crash(
                 "Tried to register a Machine casing for tier " + aTier
                     + " to the Chemical Plant, however this tier already contains one.");
         }
@@ -124,7 +123,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMTE_ChemicalPlant(this.mName);
+        return new MTEChemicalPlant(this.mName);
     }
 
     @Override
@@ -133,8 +132,8 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Chemical Plant")
             .addInfo("Heavy Industry, now right at your doorstep!")
@@ -152,7 +151,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
             .addSubChannelUsage("machine", "tier machine casing")
             .addSubChannelUsage("coil", "heating coil blocks")
             .addSubChannelUsage("pipe", "pipe casing blocks")
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -181,15 +180,15 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
     }
 
     @Override
-    public IStructureDefinition<GregtechMTE_ChemicalPlant> getStructureDefinition() {
+    public IStructureDefinition<MTEChemicalPlant> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
-            IStructureElement<GregtechMTE_ChemicalPlant> allCasingsElement = withChannel(
+            IStructureElement<MTEChemicalPlant> allCasingsElement = withChannel(
                 "casing",
                 ofChain(
                     IntStream.range(0, 8)
-                        .mapToObj(GregtechMTE_ChemicalPlant::ofSolidCasing)
+                        .mapToObj(MTEChemicalPlant::ofSolidCasing)
                         .collect(Collectors.toList())));
-            STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_ChemicalPlant>builder()
+            STRUCTURE_DEFINITION = StructureDefinition.<MTEChemicalPlant>builder()
                 .addShape(
                     mName,
                     transpose(
@@ -204,13 +203,12 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
                 .addElement(
                     'C',
                     ofChain(
-                        buildHatchAdder(GregtechMTE_ChemicalPlant.class).atLeast(Maintenance)
+                        buildHatchAdder(MTEChemicalPlant.class).atLeast(Maintenance)
                             .casingIndex(getCasingTextureID())
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMTE_ChemicalPlant.class)
-                            .atLeast(InputHatch, OutputHatch, InputBus, OutputBus)
-                            .adder(GregtechMTE_ChemicalPlant::addChemicalPlantList)
+                        buildHatchAdder(MTEChemicalPlant.class).atLeast(InputHatch, OutputHatch, InputBus, OutputBus)
+                            .adder(MTEChemicalPlant::addChemicalPlantList)
                             .hatchItemFilterAnd(
                                 (t, s) -> filterByMTETier(
                                     Integer.MIN_VALUE,
@@ -218,10 +216,9 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
                             .casingIndex(getCasingTextureID())
                             .dot(1)
                             .build(),
-                        buildHatchAdder(GregtechMTE_ChemicalPlant.class)
-                            .hatchClass(GT_MetaTileEntity_Hatch_Catalysts.class)
+                        buildHatchAdder(MTEChemicalPlant.class).hatchClass(MTEHatchCatalysts.class)
                             .shouldReject(t -> t.mCatalystBuses.size() >= 1)
-                            .adder(GregtechMTE_ChemicalPlant::addChemicalPlantList)
+                            .adder(MTEChemicalPlant::addChemicalPlantList)
                             .casingIndex(getCasingTextureID())
                             .dot(1)
                             .build(),
@@ -232,23 +229,21 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
                     withChannel(
                         "machine",
                         addTieredBlock(
-                            GregTech_API.sBlockCasings1,
-                            GregtechMTE_ChemicalPlant::setMachineMeta,
-                            GregtechMTE_ChemicalPlant::getMachineMeta,
+                            GregTechAPI.sBlockCasings1,
+                            MTEChemicalPlant::setMachineMeta,
+                            MTEChemicalPlant::getMachineMeta,
                             10)))
                 .addElement(
                     'H',
-                    withChannel(
-                        "coil",
-                        ofCoil(GregtechMTE_ChemicalPlant::setCoilMeta, GregtechMTE_ChemicalPlant::getCoilMeta)))
+                    withChannel("coil", ofCoil(MTEChemicalPlant::setCoilMeta, MTEChemicalPlant::getCoilMeta)))
                 .addElement(
                     'P',
                     withChannel(
                         "pipe",
                         addTieredBlock(
-                            GregTech_API.sBlockCasings2,
-                            GregtechMTE_ChemicalPlant::setPipeMeta,
-                            GregtechMTE_ChemicalPlant::getPipeMeta,
+                            GregTechAPI.sBlockCasings2,
+                            MTEChemicalPlant::setPipeMeta,
+                            MTEChemicalPlant::getPipeMeta,
                             12,
                             16)))
                 .build();
@@ -256,11 +251,11 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
         return STRUCTURE_DEFINITION;
     }
 
-    private static IStructureElement<GregtechMTE_ChemicalPlant> ofSolidCasing(int aIndex) {
-        return new IStructureElement<GregtechMTE_ChemicalPlant>() {
+    private static IStructureElement<MTEChemicalPlant> ofSolidCasing(int aIndex) {
+        return new IStructureElement<MTEChemicalPlant>() {
 
             @Override
-            public boolean check(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z) {
+            public boolean check(MTEChemicalPlant t, World world, int x, int y, int z) {
                 if (check(aIndex, world, x, y, z)) {
                     t.checkCasing[aIndex]++;
                     t.mCasing++;
@@ -284,7 +279,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
             }
 
             @Override
-            public boolean spawnHint(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z, ItemStack trigger) {
+            public boolean spawnHint(MTEChemicalPlant t, World world, int x, int y, int z, ItemStack trigger) {
                 StructureLibAPI.hintParticle(
                     world,
                     x,
@@ -298,8 +293,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
             }
 
             @Override
-            public boolean placeBlock(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z,
-                ItemStack trigger) {
+            public boolean placeBlock(MTEChemicalPlant t, World world, int x, int y, int z, ItemStack trigger) {
                 return world.setBlock(
                     x,
                     y,
@@ -313,8 +307,8 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
 
             @Nullable
             @Override
-            public BlocksToPlace getBlocksToPlace(GregtechMTE_ChemicalPlant gregtechMTE_chemicalPlant, World world,
-                int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) {
+            public BlocksToPlace getBlocksToPlace(MTEChemicalPlant gregtechMTE_chemicalPlant, World world, int x, int y,
+                int z, ItemStack trigger, AutoPlaceEnvironment env) {
                 return BlocksToPlace.create(
                     mTieredBlockRegistry.get(getIndex(trigger.stackSize))
                         .getValue_1(),
@@ -323,7 +317,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
             }
 
             @Override
-            public PlaceResult survivalPlaceBlock(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z,
+            public PlaceResult survivalPlaceBlock(MTEChemicalPlant t, World world, int x, int y, int z,
                 ItemStack trigger, AutoPlaceEnvironment env) {
                 if (check(getIndex(trigger.stackSize), world, x, y, z)) return PlaceResult.SKIP;
                 return StructureUtility.survivalPlaceBlock(
@@ -385,14 +379,14 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
     }
 
     public void updateHatchTexture() {
-        for (GT_MetaTileEntity_Hatch h : mCatalystBuses) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mCatalystBuses) h.updateTexture(getCasingTextureID());
         for (IDualInputHatch h : mDualInputHatches) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mInputBusses) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mMaintenanceHatches) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mEnergyHatches) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mOutputBusses) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mInputHatches) h.updateTexture(getCasingTextureID());
-        for (GT_MetaTileEntity_Hatch h : mOutputHatches) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mInputBusses) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mMaintenanceHatches) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mEnergyHatches) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mOutputBusses) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mInputHatches) h.updateTexture(getCasingTextureID());
+        for (MTEHatch h : mOutputHatches) h.updateTexture(getCasingTextureID());
     }
 
     public final boolean addChemicalPlantList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
@@ -400,24 +394,24 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Catalysts) {
+            if (aMetaTileEntity instanceof MTEHatchCatalysts) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
-                maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mTier);
+            } else if (aMetaTileEntity instanceof MTEHatchInputBus) {
+                maxTierOfHatch = Math.max(maxTierOfHatch, ((MTEHatchInputBus) aMetaTileEntity).mTier);
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
+            } else if (aMetaTileEntity instanceof MTEHatchMaintenance) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) {
-                maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity).mTier);
+            } else if (aMetaTileEntity instanceof MTEHatchEnergy) {
+                maxTierOfHatch = Math.max(maxTierOfHatch, ((MTEHatchEnergy) aMetaTileEntity).mTier);
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) {
-                maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity).mTier);
+            } else if (aMetaTileEntity instanceof MTEHatchOutputBus) {
+                maxTierOfHatch = Math.max(maxTierOfHatch, ((MTEHatchOutputBus) aMetaTileEntity).mTier);
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
-                maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier);
+            } else if (aMetaTileEntity instanceof MTEHatchInput) {
+                maxTierOfHatch = Math.max(maxTierOfHatch, ((MTEHatchInput) aMetaTileEntity).mTier);
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) {
-                maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity).mTier);
+            } else if (aMetaTileEntity instanceof MTEHatchOutput) {
+                maxTierOfHatch = Math.max(maxTierOfHatch, ((MTEHatchOutput) aMetaTileEntity).mTier);
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
             }
         }
@@ -475,7 +469,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
     public boolean addToMachineList(IGregTechTileEntity aTileEntity) {
         int aMaxTier = getMachineCasingTier();
         final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_TieredMachineBlock aMachineBlock) {
+        if (aMetaTileEntity instanceof MTETieredMachineBlock aMachineBlock) {
             int aTileTier = aMachineBlock.mTier;
             if (aTileTier > aMaxTier) {
                 log("Hatch tier too high.");
@@ -513,7 +507,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
         if (aMetaTileEntity == null) {
             return false;
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Catalysts) {
+        if (aMetaTileEntity instanceof MTEHatchCatalysts) {
             log("Found GT_MetaTileEntity_Hatch_Catalysts");
             return addToMachineListInternal(mCatalystBuses, aMetaTileEntity, aBaseCasingIndex);
         }
@@ -583,7 +577,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 if (recipe.mSpecialValue > mSolidCasingTier) {
                     return CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue + 1);
                 }
@@ -616,7 +610,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
 
             @NotNull
             @Override
-            protected CheckRecipeResult onRecipeStart(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult onRecipeStart(@NotNull GTRecipe recipe) {
                 if (catalyst != null) {
                     damageCatalyst(catalyst, getCurrentParallels());
                 }
@@ -635,7 +629,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
     @Override
     public void updateSlots() {
         super.updateSlots();
-        for (GT_MetaTileEntity_Hatch_Catalysts h : mCatalystBuses) {
+        for (MTEHatchCatalysts h : mCatalystBuses) {
             h.updateSlots();
             h.tryFillUsageSlots();
         }
@@ -644,7 +638,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
     private ItemStack findCatalyst(ItemStack[] aItemInputs, ItemStack catalyst) {
         if (aItemInputs != null) {
             for (ItemStack item : aItemInputs) {
-                if (GT_Utility.areStacksEqual(item, catalyst, true)) {
+                if (GTUtility.areStacksEqual(item, catalyst, true)) {
                     return item;
                 }
             }
@@ -665,7 +659,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
      */
     public ArrayList<ItemStack> getCatalystInputs() {
         ArrayList<ItemStack> tItems = new ArrayList<>();
-        for (GT_MetaTileEntity_Hatch_Catalysts tHatch : filterValidMTEs(mCatalystBuses)) {
+        for (MTEHatchCatalysts tHatch : filterValidMTEs(mCatalystBuses)) {
             AutoMap<ItemStack> aHatchContent = tHatch.getContentUsageSlots();
             if (!aHatchContent.isEmpty()) {
                 tItems.addAll(aHatchContent);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java
index 2e3370fe4c..1f97f38402 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java
@@ -4,17 +4,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.ExoticEnergy;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofCoil;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.ExoticEnergy;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,13 +28,13 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.api.enums.GT_Values;
+import bartworks.API.BorosilicateGlass;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
@@ -42,22 +42,21 @@ 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_ExtendedPowerMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatch;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GregTechMetaTileEntity_MegaAlloyBlastSmelter>
+public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTEMegaAlloyBlastSmelter>
     implements ISurvivalConstructable {
 
     private static final int MAX_PARALLELS = 256;
@@ -67,8 +66,8 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
     private float energyDiscount = 1;
     private boolean hasNormalCoils;
 
-    private static final IStructureDefinition<GregTechMetaTileEntity_MegaAlloyBlastSmelter> STRUCTURE_DEFINITION = StructureDefinition
-        .<GregTechMetaTileEntity_MegaAlloyBlastSmelter>builder()
+    private static final IStructureDefinition<MTEMegaAlloyBlastSmelter> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEMegaAlloyBlastSmelter>builder()
         .addShape(
             "main",
             new String[][] {
@@ -123,21 +122,19 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
                 ofChain(
                     onElementPass(
                         te -> te.hasNormalCoils = false,
-                        ofCoil(
-                            GregTechMetaTileEntity_MegaAlloyBlastSmelter::setCoilLevel,
-                            GregTechMetaTileEntity_MegaAlloyBlastSmelter::getCoilLevel)),
+                        ofCoil(MTEMegaAlloyBlastSmelter::setCoilLevel, MTEMegaAlloyBlastSmelter::getCoilLevel)),
                     onElementPass(te -> te.hasNormalCoils = true, ofBlock(ModBlocks.blockCasingsMisc, 14)))))
 
         .addElement(
             'Z',
-            buildHatchAdder(GregTechMetaTileEntity_MegaAlloyBlastSmelter.class)
+            buildHatchAdder(MTEMegaAlloyBlastSmelter.class)
                 .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Energy, ExoticEnergy)
                 .casingIndex(TAE.GTPP_INDEX(15))
                 .dot(1)
                 .buildAndChain(ofBlock(ModBlocks.blockCasingsMisc, 15)))
         .addElement(
             'E',
-            buildHatchAdder(GregTechMetaTileEntity_MegaAlloyBlastSmelter.class).atLeast(Maintenance)
+            buildHatchAdder(MTEMegaAlloyBlastSmelter.class).atLeast(Maintenance)
                 .casingIndex(TAE.GTPP_INDEX(15))
                 .dot(2)
                 .buildAndChain(ofBlock(ModBlocks.blockCasingsMisc, 15)))
@@ -151,11 +148,11 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
         .addElement('F', Muffler.newAny(TAE.GTPP_INDEX(15), 3))
         .build();
 
-    public GregTechMetaTileEntity_MegaAlloyBlastSmelter(int aID, String aName, String aNameRegional) {
+    public MTEMegaAlloyBlastSmelter(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GregTechMetaTileEntity_MegaAlloyBlastSmelter(String aName) {
+    public MTEMegaAlloyBlastSmelter(String aName) {
         super(aName);
     }
 
@@ -170,16 +167,16 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
-                if (glassTier < GT_Utility.getTier(recipe.mEUt)) {
-                    return CheckRecipeResultRegistry.insufficientMachineTier(GT_Utility.getTier(recipe.mEUt));
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
+                if (glassTier < GTUtility.getTier(recipe.mEUt)) {
+                    return CheckRecipeResultRegistry.insufficientMachineTier(GTUtility.getTier(recipe.mEUt));
                 }
                 return CheckRecipeResultRegistry.SUCCESSFUL;
             }
 
             @NotNull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
                 calculateEnergyDiscount(coilLevel, recipe);
                 return super.createOverclockCalculator(recipe).setSpeedBoost(speedBonus)
                     .setEUtDiscount(energyDiscount);
@@ -208,7 +205,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
         if (mMaintenanceHatches.size() != 1) return false;
         if (mMufflerHatches.size() != 1) return false;
         if (this.glassTier < 10 && !getExoticAndNormalEnergyHatchList().isEmpty()) {
-            for (GT_MetaTileEntity_Hatch hatchEnergy : getExoticAndNormalEnergyHatchList()) {
+            for (MTEHatch hatchEnergy : getExoticAndNormalEnergyHatchList()) {
                 if (this.glassTier < hatchEnergy.mTier) {
                     return false;
                 }
@@ -216,8 +213,8 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
         }
         // Disallow lasers if the glass is below UV tier
         if (glassTier < 8) {
-            for (GT_MetaTileEntity_Hatch hatchEnergy : getExoticEnergyHatches()) {
-                if (hatchEnergy.getConnectionType() == GT_MetaTileEntity_Hatch.ConnectionType.LASER) {
+            for (MTEHatch hatchEnergy : getExoticEnergyHatches()) {
+                if (hatchEnergy.getConnectionType() == MTEHatch.ConnectionType.LASER) {
                     return false;
                 }
             }
@@ -250,8 +247,8 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
         speedBonus = 1 - 0.05f * bonusTier;
     }
 
-    private void calculateEnergyDiscount(HeatingCoilLevel lvl, GT_Recipe recipe) {
-        int recipeTier = GT_Utility.getTier(recipe.mEUt);
+    private void calculateEnergyDiscount(HeatingCoilLevel lvl, GTRecipe recipe) {
+        int recipeTier = GTUtility.getTier(recipe.mEUt);
         int tierDifference = lvl != null ? lvl.getTier() + 1 - recipeTier : 0;
         if (tierDifference < 0) {
             energyDiscount = 1;
@@ -266,8 +263,8 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
     }
 
     @Override
-    public List<GT_MetaTileEntity_Hatch> getExoticAndNormalEnergyHatchList() {
-        List<GT_MetaTileEntity_Hatch> tHatches = new ArrayList<>();
+    public List<MTEHatch> getExoticAndNormalEnergyHatchList() {
+        List<MTEHatch> tHatches = new ArrayList<>();
         tHatches.addAll(mExoticEnergyHatches);
         tHatches.addAll(mEnergyHatches);
         return tHatches;
@@ -279,13 +276,13 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
     }
 
     @Override
-    public IStructureDefinition<GregTechMetaTileEntity_MegaAlloyBlastSmelter> getStructureDefinition() {
+    public IStructureDefinition<MTEMegaAlloyBlastSmelter> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Fluid Alloy Cooker")
             .addInfo("Controller block for the Mega Alloy Blast Smelter")
             .addInfo(
@@ -338,7 +335,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
         int paras = getBaseMetaTileEntity().isActive() ? processingLogic.getCurrentParallels() : 0;
         int moreSpeed = (int) ((1 - speedBonus) * 100);
         int lessEnergy = (int) ((1 - energyDiscount) * 100);
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mExoticEnergyHatches)) {
+        for (MTEHatch tHatch : filterValidMTEs(mExoticEnergyHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -348,40 +345,40 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
         return new String[] { "------------ Critical Information ------------",
             StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mProgresstime)
+                + GTUtility.formatNumbers(mProgresstime)
                 + EnumChatFormatting.RESET
                 + "t / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mMaxProgresstime)
+                + GTUtility.formatNumbers(mMaxProgresstime)
                 + EnumChatFormatting.RESET
                 + "t",
             StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(storedEnergy)
+                + GTUtility.formatNumbers(storedEnergy)
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxEnergy)
+                + GTUtility.formatNumbers(maxEnergy)
                 + EnumChatFormatting.RESET
                 + " EU",
             StatCollector.translateToLocal("GT5U.multiblock.usage") + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(-lEUt)
+                + GTUtility.formatNumbers(-lEUt)
                 + EnumChatFormatting.RESET
                 + " EU/t",
             StatCollector.translateToLocal("GT5U.multiblock.mei") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(getAverageInputVoltage())
+                + GTUtility.formatNumbers(getAverageInputVoltage())
                 + EnumChatFormatting.RESET
                 + " EU/t(*"
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(getMaxInputAmps())
+                + GTUtility.formatNumbers(getMaxInputAmps())
                 + EnumChatFormatting.RESET
                 + "A) "
                 + StatCollector.translateToLocal("GT5U.machines.tier")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Values.VN[GT_Utility.getTier(getAverageInputVoltage())]
+                + GTValues.VN[GTUtility.getTier(getAverageInputVoltage())]
                 + EnumChatFormatting.RESET,
             "Parallels: " + EnumChatFormatting.BLUE + paras + EnumChatFormatting.RESET,
             "Speed Bonus: " + EnumChatFormatting.BLUE + moreSpeed + "%" + EnumChatFormatting.RESET,
@@ -391,7 +388,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregTechMetaTileEntity_MegaAlloyBlastSmelter(this.mName);
+        return new MTEMegaAlloyBlastSmelter(this.mName);
     }
 
     @Override
@@ -434,7 +431,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
             super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ);
         } else {
             inputSeparation = !inputSeparation;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation);
         }
@@ -446,9 +443,9 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
         if (aPlayer.isSneaking()) {
             batchMode = !batchMode;
             if (batchMode) {
-                GT_Utility.sendChatToPlayer(aPlayer, "Batch recipes.");
+                GTUtility.sendChatToPlayer(aPlayer, "Batch recipes.");
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, "Don't batch recipes.");
+                GTUtility.sendChatToPlayer(aPlayer, "Don't batch recipes.");
             }
         }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java
index 84fac40265..e57a7d7e77 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines;
 
-import static gtPlusPlus.core.lib.CORE.RANDOM;
+import static gtPlusPlus.core.lib.GTPPCore.RANDOM;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -17,18 +17,18 @@ import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
 import gregtech.api.recipe.maps.FuelBackend;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 @SuppressWarnings("deprecation")
-public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbineBase {
+public class MTELargeTurbineGas extends MTELargerTurbineBase {
 
     private static final HashSet<Fluid> BLACKLIST = new HashSet<>();
 
@@ -38,17 +38,17 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin
                 .getFluid());
     }
 
-    public GT_MTE_LargeTurbine_Gas(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbineGas(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MTE_LargeTurbine_Gas(String aName) {
+    public MTELargeTurbineGas(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MTE_LargeTurbine_Gas(mName);
+        return new MTELargeTurbineGas(mName);
     }
 
     @Override
@@ -76,7 +76,7 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin
         if (aLiquid == null) {
             return 0;
         }
-        GT_Recipe tFuel = getRecipeMap().getBackend()
+        GTRecipe tFuel = getRecipeMap().getBackend()
             .findFuel(aLiquid);
         if (tFuel != null) {
             return tFuel.mSpecialValue;
@@ -126,15 +126,15 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin
                 // wastes the extra fuel and generate aOptFlow directly
                 depleteInput(new FluidStack(firstFuelType, 1));
                 this.storedFluid += 1;
-                return GT_Utility.safeInt((long) aOptFlow * (long) aBaseEff / 10000L);
+                return GTUtility.safeInt((long) aOptFlow * (long) aBaseEff / 10000L);
             }
 
-            actualOptimalFlow = GT_Utility.safeInt((long) (aOptFlow * (double) flowMultipliers[1] / fuelValue));
+            actualOptimalFlow = GTUtility.safeInt((long) (aOptFlow * (double) flowMultipliers[1] / fuelValue));
             this.realOptFlow = actualOptimalFlow;
 
-            int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow * 1.25f)); // Allowed to use up to 125% of
-                                                                                        // optimal flow. Variable
-                                                                                        // required outside of loop for
+            int remainingFlow = GTUtility.safeInt((long) (actualOptimalFlow * 1.25f)); // Allowed to use up to 125% of
+                                                                                       // optimal flow. Variable
+                                                                                       // required outside of loop for
             // multi-hatch scenarios.
             int flow = 0;
             int totalFlow = 0;
@@ -151,14 +151,14 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin
                 }
             }
             if (totalFlow <= 0) return 0;
-            tEU = GT_Utility.safeInt((long) totalFlow * fuelValue);
+            tEU = GTUtility.safeInt((long) totalFlow * fuelValue);
 
             if (totalFlow == actualOptimalFlow) {
-                tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L);
+                tEU = GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L);
             } else {
                 float efficiency = 1.0f - Math.abs((totalFlow - actualOptimalFlow) / (float) actualOptimalFlow);
                 tEU *= efficiency;
-                tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L);
+                tEU = GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L);
             }
 
             return tEU;
@@ -198,11 +198,11 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin
 
     @Override
     protected ITexture getTextureFrontFace() {
-        return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
+        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
     }
 
     @Override
     protected ITexture getTextureFrontFaceActive() {
-        return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
+        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbinePlasma.java
index db99b52be1..310463e0d5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbinePlasma.java
@@ -13,37 +13,37 @@ import org.jetbrains.annotations.NotNull;
 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.objects.GT_RenderedTexture;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
 import gregtech.api.recipe.maps.FuelBackend;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 @SuppressWarnings("deprecation")
-public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTurbineBase {
+public class MTELargeTurbinePlasma extends MTELargerTurbineBase {
 
     private static final HashSet<Fluid> BLACKLIST = new HashSet<>();
 
-    public GT_MTE_LargeTurbine_Plasma(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbinePlasma(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MTE_LargeTurbine_Plasma(String aName) {
+    public MTELargeTurbinePlasma(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MTE_LargeTurbine_Plasma(mName);
+        return new MTELargeTurbinePlasma(mName);
     }
 
     @Override
@@ -71,7 +71,7 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
         if (aLiquid == null) {
             return 0;
         }
-        GT_Recipe tFuel = getRecipeMap().getBackend()
+        GTRecipe tFuel = getRecipeMap().getBackend()
             .findFuel(aLiquid);
         if (tFuel != null) {
             return tFuel.mSpecialValue;
@@ -98,9 +98,9 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
     public @NotNull CheckRecipeResult checkProcessing() {
 
         try {
-            ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies();
+            ArrayList<MTEHatchTurbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies();
             if (aEmptyTurbineRotorHatches.size() > 0) {
-                hatch: for (GT_MetaTileEntity_Hatch_Turbine aHatch : aEmptyTurbineRotorHatches) {
+                hatch: for (MTEHatchTurbine aHatch : aEmptyTurbineRotorHatches) {
                     ArrayList<ItemStack> aTurbines = getAllBufferedTurbines();
                     for (ItemStack aTurbineItem : aTurbines) {
                         if (aTurbineItem == null) {
@@ -140,29 +140,30 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
 
                     ItemStack aStack = getFullTurbineAssemblies().get(0)
                         .getTurbine();
-                    aTotalBaseEff += GT_Utility.safeInt(
-                        (long) ((5F + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F));
-                    aTotalOptimalFlow += GT_Utility.safeInt(
-                        (long) Math.max(
-                            Float.MIN_NORMAL,
-                            ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack)
-                                .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed
-                                * 50));
+                    aTotalBaseEff += GTUtility.safeInt(
+                        (long) ((5F + ((MetaGeneratedTool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F));
+                    aTotalOptimalFlow += GTUtility
+                        .safeInt(
+                            (long) Math.max(
+                                Float.MIN_NORMAL,
+                                ((MetaGeneratedTool) aStack.getItem()).getToolStats(aStack)
+                                    .getSpeedMultiplier() * MetaGeneratedTool.getPrimaryMaterial(aStack).mToolSpeed
+                                    * 50));
 
                     // Calculate total EU/t (as shown on turbine tooltip (Fast mode doesn't affect))
                     double aEUPerTurbine = aTotalOptimalFlow * 40
                         * 0.0105
-                        * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mPlasmaMultiplier
-                        * (50.0f + (10.0f * ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack)));
+                        * MetaGeneratedTool.getPrimaryMaterial(aStack).mPlasmaMultiplier
+                        * (50.0f + (10.0f * ((MetaGeneratedTool) aStack.getItem()).getToolCombatDamage(aStack)));
                     aTotalOptimalFlow *= getSpeedMultiplier();
 
                     if (aTotalOptimalFlow < 0) {
                         aTotalOptimalFlow = 100;
                     }
 
-                    flowMultipliers[0] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mSteamMultiplier;
-                    flowMultipliers[1] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mGasMultiplier;
-                    flowMultipliers[2] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mPlasmaMultiplier;
+                    flowMultipliers[0] = MetaGeneratedTool.getPrimaryMaterial(aStack).mSteamMultiplier;
+                    flowMultipliers[1] = MetaGeneratedTool.getPrimaryMaterial(aStack).mGasMultiplier;
+                    flowMultipliers[2] = MetaGeneratedTool.getPrimaryMaterial(aStack).mPlasmaMultiplier;
                     baseEff = MathUtils.roundToClosestInt(aTotalBaseEff);
                     optFlow = MathUtils.roundToClosestInt(aTotalOptimalFlow);
                     euPerTurbine = MathUtils.roundToClosestInt(aEUPerTurbine);
@@ -194,7 +195,7 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
             // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the
             // difference in power level (per tick)
             // This is how much the turbine can actually change during this tick
-            int maxChangeAllowed = Math.max(10, GT_Utility.safeInt((long) Math.abs(difference) / 100));
+            int maxChangeAllowed = Math.max(10, GTUtility.safeInt((long) Math.abs(difference) / 100));
 
             if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed
                                                            // change
@@ -232,13 +233,13 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
             FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process.
                                                                           // Doesn't matter which one. Ignore the rest!
             int fuelValue = getFuelValue(firstFuelType);
-            actualOptimalFlow = GT_Utility
+            actualOptimalFlow = GTUtility
                 .safeInt((long) Math.ceil((double) aOptFlow * (double) flowMultipliers[2] / (double) fuelValue));
             this.realOptFlow = actualOptimalFlow; // For scanner info
 
-            int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow * 1.25f)); // Allowed to use up to 125% of
-                                                                                        // optimal flow. Variable
-                                                                                        // required outside of loop for
+            int remainingFlow = GTUtility.safeInt((long) (actualOptimalFlow * 1.25f)); // Allowed to use up to 125% of
+                                                                                       // optimal flow. Variable
+                                                                                       // required outside of loop for
             // multi-hatch scenarios.
             int flow = 0;
             int totalFlow = 0;
@@ -266,15 +267,15 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
                 }
             }
             if (totalFlow <= 0) return 0;
-            tEU = GT_Utility.safeInt((long) ((fuelValue / 20D) * (double) totalFlow));
+            tEU = GTUtility.safeInt((long) ((fuelValue / 20D) * (double) totalFlow));
 
             if (totalFlow == actualOptimalFlow) {
-                tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU));
+                tEU = GTUtility.safeInt((long) (aBaseEff / 10000D * tEU));
             } else {
                 double efficiency = 1.0D - Math.abs((totalFlow - actualOptimalFlow) / (float) actualOptimalFlow);
 
                 tEU = (int) (tEU * efficiency);
-                tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU));
+                tEU = GTUtility.safeInt((long) (aBaseEff / 10000D * tEU));
             }
 
             return tEU;
@@ -304,11 +305,11 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
 
     @Override
     protected ITexture getTextureFrontFace() {
-        return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
+        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
     }
 
     @Override
     protected ITexture getTextureFrontFaceActive() {
-        return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
+        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java
index 6c3db51577..0ef3ef0256 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java
@@ -10,24 +10,24 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTurbineBase {
+public class MTELargeTurbineSCSteam extends MTELargerTurbineBase {
 
-    public GT_MTE_LargeTurbine_SCSteam(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbineSCSteam(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MTE_LargeTurbine_SCSteam(String aName) {
+    public MTELargeTurbineSCSteam(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MTE_LargeTurbine_SCSteam(mName);
+        return new MTELargeTurbineSCSteam(mName);
     }
 
     @Override
@@ -71,7 +71,7 @@ public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTu
         storedFluid = 0;
         FluidStack tSCSteam = FluidRegistry.getFluidStack("supercriticalsteam", 1);
         for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) {
-            if (GT_Utility.areFluidsEqual(aFluids.get(i), tSCSteam, true)) {
+            if (GTUtility.areFluidsEqual(aFluids.get(i), tSCSteam, true)) {
                 flow = Math.min(aFluids.get(i).amount, remainingFlow); // try to use up w/o exceeding remainingFlow
                 depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount
                 this.storedFluid += aFluids.get(i).amount;
@@ -81,7 +81,7 @@ public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTu
         }
         if (totalFlow <= 0) return 0;
         tEU = totalFlow;
-        addOutput(GT_ModHandler.getSteam(totalFlow * 100));
+        addOutput(GTModHandler.getSteam(totalFlow * 100));
         if (totalFlow != realOptFlow) {
             float efficiency = 1.0f - Math.abs((totalFlow - (float) realOptFlow) / (float) realOptFlow);
             // if(totalFlow>aOptFlow){efficiency = 1.0f;}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java
index d1346d3a51..7fdc36450d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java
@@ -8,35 +8,35 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-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.objects.GTRenderedTexture;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 @SuppressWarnings("deprecation")
-public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTurbineBase {
+public class MTELargeTurbineSHSteam extends MTELargerTurbineBase {
 
     public boolean achievement = false;
     private boolean looseFit = false;
 
-    public GT_MTE_LargeTurbine_SHSteam(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbineSHSteam(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MTE_LargeTurbine_SHSteam(String aName) {
+    public MTELargeTurbineSHSteam(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MTE_LargeTurbine_SHSteam(mName);
+        return new MTELargeTurbineSHSteam(mName);
     }
 
     @Override
@@ -103,7 +103,7 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
                 totalFlow += flow; // track total input used
                 if (!achievement) {
                     try {
-                        GT_Mod.achievements.issueAchievement(
+                        GTMod.achievements.issueAchievement(
                             this.getBaseMetaTileEntity()
                                 .getWorld()
                                 .getPlayerEntityByName(
@@ -120,7 +120,7 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
         }
         if (totalFlow <= 0) return 0;
         tEU = totalFlow;
-        addOutput(GT_ModHandler.getSteam(totalFlow));
+        addOutput(GTModHandler.getSteam(totalFlow));
         if (totalFlow != realOptFlow) {
             float efficiency = 1.0f - Math.abs((totalFlow - (float) realOptFlow) / (float) realOptFlow);
             // if(totalFlow>aOptFlow){efficiency = 1.0f;}
@@ -141,7 +141,7 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
         // (Tight/Loose changes on every action, Slow/Fast changes every other action, all pairs are cycled this way)
         if (side == getBaseMetaTileEntity().getFrontFacing()) {
             looseFit ^= true;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 looseFit ? "Fitting is Loose (Higher Flow)" : "Fitting is Tight (Higher Efficiency)");
         }
@@ -157,7 +157,7 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
 
     @Override
     public int getDamageToComponent(ItemStack aStack) {
-        return (looseFit && CORE.RANDOM.nextInt(4) == 0) ? 0 : 1;
+        return (looseFit && GTPPCore.RANDOM.nextInt(4) == 0) ? 0 : 1;
     }
 
     @Override
@@ -194,11 +194,11 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
 
     @Override
     protected ITexture getTextureFrontFace() {
-        return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
+        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
     }
 
     @Override
     protected ITexture getTextureFrontFaceActive() {
-        return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
+        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java
index c882b84aab..68cfc8cd1e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines;
 
-import static gtPlusPlus.core.lib.CORE.RANDOM;
+import static gtPlusPlus.core.lib.GTPPCore.RANDOM;
 
 import java.util.ArrayList;
 
@@ -10,35 +10,35 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 @SuppressWarnings("deprecation")
-public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurbineBase {
+public class MTELargeTurbineSteam extends MTELargerTurbineBase {
 
     private float water;
     private boolean achievement = false;
     private boolean looseFit = false;
 
-    public GT_MTE_LargeTurbine_Steam(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbineSteam(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MTE_LargeTurbine_Steam(String aName) {
+    public MTELargeTurbineSteam(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MTE_LargeTurbine_Steam(mName);
+        return new MTELargeTurbineSteam(mName);
     }
 
     @Override
@@ -115,7 +115,7 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
                 remainingFlow -= flow; // track amount we're allowed to continue depleting from hatches
                 totalFlow += flow; // track total input used
                 if (!achievement) {
-                    GT_Mod.achievements.issueAchievement(
+                    GTMod.achievements.issueAchievement(
                         this.getBaseMetaTileEntity()
                             .getWorld()
                             .getPlayerEntityByName(
@@ -131,7 +131,7 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
         if (totalFlow <= 0) return 0;
         tEU = totalFlow;
         int waterToOutput = useWater(totalFlow / 160.0f);
-        addOutput(GT_ModHandler.getDistilledWater(waterToOutput));
+        addOutput(GTModHandler.getDistilledWater(waterToOutput));
         if (totalFlow != realOptFlow) {
             float efficiency = 1.0f - Math.abs((totalFlow - (float) realOptFlow) / (float) realOptFlow);
             // if(totalFlow>aOptFlow){efficiency = 1.0f;}
@@ -152,7 +152,7 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
         // (Tight/Loose changes on every action, Slow/Fast changes every other action, all pairs are cycled this way)
         if (side == getBaseMetaTileEntity().getFrontFacing()) {
             looseFit ^= true;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 looseFit ? "Fitting: Loose - More Flow" : "Fitting: Tight - More Efficiency");
         }
@@ -205,11 +205,11 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
 
     @Override
     protected ITexture getTextureFrontFace() {
-        return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
+        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
     }
 
     @Override
     protected ITexture getTextureFrontFaceActive() {
-        return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
+        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
index c343d170f2..69e3580f11 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
@@ -2,15 +2,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.t
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-import static gregtech.api.enums.GT_HatchElement.Dynamo;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
-import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo;
+import static gregtech.api.enums.HatchElement.Dynamo;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.enums.HatchElement.Muffler;
+import static gregtech.api.enums.HatchElement.OutputHatch;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTDynamo;
 
 import java.util.ArrayList;
 
@@ -36,30 +36,30 @@ 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.items.GT_MetaGenerated_Tool;
-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_InputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.ShutDownReason;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 
-public abstract class GregtechMetaTileEntity_LargerTurbineBase
-    extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargerTurbineBase> implements ISurvivalConstructable {
+public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerTurbineBase>
+    implements ISurvivalConstructable {
 
     protected int baseEff = 0;
     protected long optFlow = 0;
@@ -74,15 +74,15 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
     public ITexture frontFace;
     public ITexture frontFaceActive;
 
-    public ArrayList<GT_MetaTileEntity_Hatch_Turbine> mTurbineRotorHatches = new ArrayList<>();
+    public ArrayList<MTEHatchTurbine> mTurbineRotorHatches = new ArrayList<>();
 
-    public GregtechMetaTileEntity_LargerTurbineBase(int aID, String aName, String aNameRegional) {
+    public MTELargerTurbineBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         frontFace = getTextureFrontFace();
         frontFaceActive = getTextureFrontFaceActive();
     }
 
-    public GregtechMetaTileEntity_LargerTurbineBase(String aName) {
+    public MTELargerTurbineBase(String aName) {
         super(aName);
         frontFace = getTextureFrontFace();
         frontFaceActive = getTextureFrontFaceActive();
@@ -99,8 +99,8 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
     protected abstract boolean requiresOutputHatch();
 
     @Override
-    protected final GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected final MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the XL " + getTurbineType() + " Turbine")
             .addInfo("Runs as fast as 16 Large Turbines of the same type, takes the space of 12")
@@ -133,17 +133,17 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
         if (requiresMufflers()) {
             tt.addMufflerHatch("Any 7 dot hint (x4)", 7);
         }
-        tt.toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+        tt.toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() {
+    private static final ClassValue<IStructureDefinition<MTELargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
         @SuppressWarnings("SpellCheckingInspection")
-        protected IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase> computeValue(Class<?> type) {
-            return StructureDefinition.<GregtechMetaTileEntity_LargerTurbineBase>builder()
+        protected IStructureDefinition<MTELargerTurbineBase> computeValue(Class<?> type) {
+            return StructureDefinition.<MTELargerTurbineBase>builder()
                 // c = turbine casing
                 // s = turbine shaft
                 // t = turbine housing
@@ -165,16 +165,15 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
                 .addElement(
                     't',
                     lazy(
-                        t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class)
-                            .adder(GregtechMetaTileEntity_LargerTurbineBase::addTurbineHatch)
-                            .hatchClass(GT_MetaTileEntity_Hatch_Turbine.class)
+                        t -> buildHatchAdder(MTELargerTurbineBase.class).adder(MTELargerTurbineBase::addTurbineHatch)
+                            .hatchClass(MTEHatchTurbine.class)
                             .casingIndex(t.getCasingTextureIndex())
                             .dot(1)
                             .build()))
                 .addElement(
                     'h',
                     lazy(
-                        t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class)
+                        t -> buildHatchAdder(MTELargerTurbineBase.class)
                             .atLeast(InputBus, InputHatch, OutputHatch, Dynamo.or(TTDynamo), Maintenance)
                             .casingIndex(t.getCasingTextureIndex())
                             .dot(4)
@@ -182,7 +181,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
                 .addElement(
                     'm',
                     lazy(
-                        t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class).atLeast(Muffler)
+                        t -> buildHatchAdder(MTELargerTurbineBase.class).atLeast(Muffler)
                             .casingIndex(t.getCasingTextureIndex())
                             .dot(7)
                             .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
@@ -191,7 +190,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
     };
 
     @Override
-    public IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase> getStructureDefinition() {
+    public IStructureDefinition<MTELargerTurbineBase> getStructureDefinition() {
         return STRUCTURE_DEFINITION.get(getClass());
     }
 
@@ -204,7 +203,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
 
     public final double getMufflerReduction() {
         double totalReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             totalReduction += ((double) tHatch.calculatePollutionReduction(100)) / 100;
         }
         return totalReduction / 4;
@@ -267,7 +266,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
         if (aMetaTileEntity == null) {
             return false;
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine aTurbineHatch) {
+        if (aMetaTileEntity instanceof MTEHatchTurbine aTurbineHatch) {
             log("Found GT_MetaTileEntity_Hatch_Turbine");
             updateTexture(aTileEntity, aBaseCasingIndex);
             IGregTechTileEntity g = this.getBaseMetaTileEntity();
@@ -307,7 +306,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
     public abstract int getFuelValue(FluidStack aLiquid);
 
     public static boolean isValidTurbine(ItemStack aTurbine) {
-        return (aTurbine != null && aTurbine.getItem() instanceof GT_MetaGenerated_Tool
+        return (aTurbine != null && aTurbine.getItem() instanceof MetaGeneratedTool
             && aTurbine.getItemDamage() >= 170
             && aTurbine.getItemDamage() <= 176);
     }
@@ -332,15 +331,15 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
     }
 
     public boolean areAllTurbinesTheSame() {
-        ArrayList<GT_MetaTileEntity_Hatch_Turbine> aTurbineAssemblies = getFullTurbineAssemblies();
+        ArrayList<MTEHatchTurbine> aTurbineAssemblies = getFullTurbineAssemblies();
         if (aTurbineAssemblies.size() < 12) {
             log("Found " + aTurbineAssemblies.size() + ", expected 12.");
             return false;
         }
         AutoMap<Materials> aTurbineMats = new AutoMap<>();
         AutoMap<Integer> aTurbineSizes = new AutoMap<>();
-        for (GT_MetaTileEntity_Hatch_Turbine aHatch : aTurbineAssemblies) {
-            aTurbineMats.add(GT_MetaGenerated_Tool.getPrimaryMaterial(aHatch.getTurbine()));
+        for (MTEHatchTurbine aHatch : aTurbineAssemblies) {
+            aTurbineMats.add(MetaGeneratedTool.getPrimaryMaterial(aHatch.getTurbine()));
             aTurbineSizes.add(getTurbineSize(aHatch.getTurbine()));
         }
         Materials aBaseMat = aTurbineMats.get(0);
@@ -383,10 +382,10 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
         };
     }
 
-    protected ArrayList<GT_MetaTileEntity_Hatch_Turbine> getEmptyTurbineAssemblies() {
-        ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = new ArrayList<>();
+    protected ArrayList<MTEHatchTurbine> getEmptyTurbineAssemblies() {
+        ArrayList<MTEHatchTurbine> aEmptyTurbineRotorHatches = new ArrayList<>();
         // log("Checking "+mTurbineRotorHatches.size()+" Assemblies for empties.");
-        for (GT_MetaTileEntity_Hatch_Turbine aTurbineHatch : this.mTurbineRotorHatches) {
+        for (MTEHatchTurbine aTurbineHatch : this.mTurbineRotorHatches) {
             if (!aTurbineHatch.hasTurbine()) {
                 aEmptyTurbineRotorHatches.add(aTurbineHatch);
             }
@@ -394,10 +393,10 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
         return aEmptyTurbineRotorHatches;
     }
 
-    protected ArrayList<GT_MetaTileEntity_Hatch_Turbine> getFullTurbineAssemblies() {
-        ArrayList<GT_MetaTileEntity_Hatch_Turbine> aTurbineRotorHatches = new ArrayList<>();
+    protected ArrayList<MTEHatchTurbine> getFullTurbineAssemblies() {
+        ArrayList<MTEHatchTurbine> aTurbineRotorHatches = new ArrayList<>();
         // log("Checking "+mTurbineRotorHatches.size()+" Assemblies for Turbines.");
-        for (GT_MetaTileEntity_Hatch_Turbine aTurbineHatch : this.mTurbineRotorHatches) {
+        for (MTEHatchTurbine aTurbineHatch : this.mTurbineRotorHatches) {
             if (aTurbineHatch.hasTurbine()) {
                 // log("Found Assembly with Turbine.");
                 aTurbineRotorHatches.add(aTurbineHatch);
@@ -411,10 +410,10 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
             return;
         }
         startRecipeProcessing();
-        for (GT_MetaTileEntity_Hatch_InputBus aInputBus : this.mInputBusses) {
+        for (MTEHatchInputBus aInputBus : this.mInputBusses) {
             for (int slot = aInputBus.getSizeInventory() - 1; slot >= 0; slot--) {
                 ItemStack aStack = aInputBus.getStackInSlot(slot);
-                if (aStack != null && GT_Utility.areStacksEqual(aStack, aTurbine)) {
+                if (aStack != null && GTUtility.areStacksEqual(aStack, aTurbine)) {
                     aStack.stackSize -= aTurbine.stackSize;
                     updateSlots();
                     endRecipeProcessing();
@@ -428,9 +427,9 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
     @Override
     public @NotNull CheckRecipeResult checkProcessing() {
         try {
-            ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies();
+            ArrayList<MTEHatchTurbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies();
             if (aEmptyTurbineRotorHatches.size() > 0) {
-                hatch: for (GT_MetaTileEntity_Hatch_Turbine aHatch : aEmptyTurbineRotorHatches) {
+                hatch: for (MTEHatchTurbine aHatch : aEmptyTurbineRotorHatches) {
                     ArrayList<ItemStack> aTurbines = getAllBufferedTurbines();
                     for (ItemStack aTurbineItem : aTurbines) {
                         if (aTurbineItem == null) {
@@ -464,22 +463,21 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
 
                     ItemStack aStack = getFullTurbineAssemblies().get(0)
                         .getTurbine();
-                    aTotalBaseEff += GT_Utility.safeInt(
-                        (long) ((5F + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F));
-                    aTotalOptimalFlow += GT_Utility.safeInt(
+                    aTotalBaseEff += GTUtility.safeInt(
+                        (long) ((5F + ((MetaGeneratedTool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F));
+                    aTotalOptimalFlow += GTUtility.safeInt(
                         (long) Math.max(
                             Float.MIN_NORMAL,
-                            ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack)
-                                .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed
-                                * 50)
+                            ((MetaGeneratedTool) aStack.getItem()).getToolStats(aStack)
+                                .getSpeedMultiplier() * MetaGeneratedTool.getPrimaryMaterial(aStack).mToolSpeed * 50)
                             * getSpeedMultiplier());
                     if (aTotalOptimalFlow < 0) {
                         aTotalOptimalFlow = 100;
                     }
 
-                    flowMultipliers[0] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mSteamMultiplier;
-                    flowMultipliers[1] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mGasMultiplier;
-                    flowMultipliers[2] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mPlasmaMultiplier;
+                    flowMultipliers[0] = MetaGeneratedTool.getPrimaryMaterial(aStack).mSteamMultiplier;
+                    flowMultipliers[1] = MetaGeneratedTool.getPrimaryMaterial(aStack).mGasMultiplier;
+                    flowMultipliers[2] = MetaGeneratedTool.getPrimaryMaterial(aStack).mPlasmaMultiplier;
                     baseEff = MathUtils.roundToClosestInt(aTotalBaseEff);
                     optFlow = MathUtils.roundToClosestInt(aTotalOptimalFlow);
                     if (optFlow <= 0 || baseEff <= 0) {
@@ -498,7 +496,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
             // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the
             // difference in power level (per tick)
             // This is how much the turbine can actually change during this tick
-            int maxChangeAllowed = Math.max(10, GT_Utility.safeInt(Math.abs(difference) / 100));
+            int maxChangeAllowed = Math.max(10, GTUtility.safeInt(Math.abs(difference) / 100));
 
             if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed
                                                            // change
@@ -538,7 +536,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
             if (getBaseMetaTileEntity().getRandomNumber(6000) < getMaintenanceThreshold()) {
                 causeMaintenanceIssue();
             }
-            for (GT_MetaTileEntity_Hatch_Turbine aHatch : getFullTurbineAssemblies()) {
+            for (MTEHatchTurbine aHatch : getFullTurbineAssemblies()) {
                 // This cycle depletes durability from the turbine rotors.
                 // The amount of times it is run depends on turbineDamageMultiplier
                 // In XL turbines, durability loss is around 5.2-5.3x faster than in singles
@@ -595,20 +593,20 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
         int tDura;
 
         StringBuilder aTurbineDamage = new StringBuilder();
-        for (GT_MetaTileEntity_Hatch_Turbine aHatch : this.getFullTurbineAssemblies()) {
+        for (MTEHatchTurbine aHatch : this.getFullTurbineAssemblies()) {
             ItemStack aTurbine = aHatch.getTurbine();
             tDura = MathUtils.safeInt(
-                (long) (100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(aTurbine)
-                    * (GT_MetaGenerated_Tool.getToolDamage(aTurbine)) + 1));
+                (long) (100.0f / MetaGeneratedTool.getToolMaxDamage(aTurbine)
+                    * (MetaGeneratedTool.getToolDamage(aTurbine)) + 1));
             aTurbineDamage.append(EnumChatFormatting.RED)
-                .append(GT_Utility.formatNumbers(tDura))
+                .append(GTUtility.formatNumbers(tDura))
                 .append(EnumChatFormatting.RESET)
                 .append("% | ");
         }
 
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch_Dynamo tHatch : filterValidMTEs(mDynamoHatches)) {
+        for (MTEHatchDynamo tHatch : filterValidMTEs(mDynamoHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -624,27 +622,27 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
             // 8 Lines available for information panels
             tRunning + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(((lEUt * mEfficiency) / 10000))
+                + GTUtility.formatNumbers(((lEUt * mEfficiency) / 10000))
                 + EnumChatFormatting.RESET
                 + " EU/t",
             tMaintenance,
             StatCollector.translateToLocal("GT5U.turbine.efficiency") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers((mEfficiency / 100F))
+                + GTUtility.formatNumbers((mEfficiency / 100F))
                 + EnumChatFormatting.RESET
                 + "%",
             StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(storedEnergy)
+                + GTUtility.formatNumbers(storedEnergy)
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxEnergy)
+                + GTUtility.formatNumbers(maxEnergy)
                 + EnumChatFormatting.RESET
                 + " EU",
             StatCollector.translateToLocal("GT5U.turbine.flow") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(MathUtils.safeInt((long) realOptFlow))
+                + GTUtility.formatNumbers(MathUtils.safeInt((long) realOptFlow))
                 + EnumChatFormatting.RESET
                 + " L/s"
                 + EnumChatFormatting.YELLOW
@@ -654,18 +652,18 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
                 + ")",
             StatCollector.translateToLocal("GT5U.turbine.fuel") + ": "
                 + EnumChatFormatting.GOLD
-                + GT_Utility.formatNumbers(storedFluid)
+                + GTUtility.formatNumbers(storedFluid)
                 + EnumChatFormatting.RESET
                 + "L",
             StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + aTurbineDamage,
             StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mPollutionReduction)
+                + GTUtility.formatNumbers(mPollutionReduction)
                 + EnumChatFormatting.RESET
                 + " %" };
         if (!aIsSteam) ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": "
             + EnumChatFormatting.YELLOW
-            + GT_Utility.formatNumbers(MathUtils.safeInt((long) realOptFlow))
+            + GTUtility.formatNumbers(MathUtils.safeInt((long) realOptFlow))
             + EnumChatFormatting.RESET
             + " L/t";
         return ret;
@@ -680,7 +678,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
     public boolean polluteEnvironment(int aPollutionLevel) {
         if (this.requiresMufflers()) {
             mPollution += aPollutionLevel * getPollutionMultiplier() * mufflerReduction;
-            for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+            for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
                 if (mPollution >= 10000) {
                     if (PollutionUtils.addPollution(this.getBaseMetaTileEntity(), 10000)) {
                         mPollution -= 10000;
@@ -765,7 +763,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
     @Override
     public void onRemoval() {
         super.onRemoval();
-        for (GT_MetaTileEntity_Hatch_Turbine h : this.mTurbineRotorHatches) {
+        for (MTEHatchTurbine h : this.mTurbineRotorHatches) {
             h.clearController();
         }
         disableAllTurbineHatches();
@@ -789,7 +787,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
         if (this.mTurbineRotorHatches.isEmpty() || ((System.currentTimeMillis() / 1000) - mLastHatchUpdate) <= 2) {
             return;
         }
-        for (GT_MetaTileEntity_Hatch_Turbine h : filterValidMTEs(this.mTurbineRotorHatches)) {
+        for (MTEHatchTurbine h : filterValidMTEs(this.mTurbineRotorHatches)) {
             h.setActive(aState);
         }
 
@@ -828,7 +826,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
     public boolean addEnergyOutputMultipleDynamos(long aEU, boolean aAllowMixedVoltageDynamos) {
         int injected = 0;
         long aFirstVoltageFound = -1;
-        for (GT_MetaTileEntity_Hatch aDynamo : filterValidMTEs(mAllDynamoHatches)) {
+        for (MTEHatch aDynamo : filterValidMTEs(mAllDynamoHatches)) {
             long aVoltage = aDynamo.maxEUOutput();
             // Check against voltage to check when hatch mixing
             if (aFirstVoltageFound == -1) {
@@ -841,7 +839,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
         int aAmpsToInject;
         int aRemainder;
         int ampsOnCurrentHatch;
-        for (GT_MetaTileEntity_Hatch aDynamo : filterValidMTEs(mAllDynamoHatches)) {
+        for (MTEHatch aDynamo : filterValidMTEs(mAllDynamoHatches)) {
             leftToInject = aEU - injected;
             aVoltage = aDynamo.maxEUOutput();
             aAmpsToInject = (int) (leftToInject / aVoltage);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index 13bef7c885..7476cd2b90 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -6,14 +6,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElement
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onlyIf;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel;
-import static gregtech.api.enums.GT_HatchElement.Dynamo;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
-import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo;
-import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTEnergy;
+import static gregtech.api.enums.HatchElement.Dynamo;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.Maintenance;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofHatchAdderOptional;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTDynamo;
+import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTEnergy;
 
 import javax.annotation.Nullable;
 
@@ -49,37 +49,37 @@ import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-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_Maintenance;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.metatileentity.implementations.MTEHatchMaintenance;
+import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.MovingAverageLong;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.preloader.asm.AsmConfig;
-import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
 
-public class GregtechMetaTileEntity_PowerSubStationController extends
-    GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_PowerSubStationController> implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_PowerSubStationController
+    extends GTPPMultiBlockBase<GregtechMetaTileEntity_PowerSubStationController> implements ISurvivalConstructable {
 
     private static enum TopState {
         MayBeTop,
@@ -118,8 +118,8 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Consumes " + this.ENERGY_TAX + "% of the average voltage of all energy type hatches")
             .addInfo("Does not require maintenance")
@@ -135,7 +135,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
             .addEnergyHatch("Any Casing", 1)
             .addSubChannelUsage("capacitor", "Vanadium Capacitor Cell Tier")
             .addSubChannelUsage("height", "Height of structure")
-            .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+            .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
         return tt;
     }
 
@@ -144,7 +144,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         if (side == facing) {
             return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(24)),
-                new GT_RenderedTexture(
+                new GTRenderedTexture(
                     aActive ? Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE
                         : Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER) };
         }
@@ -160,7 +160,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         // if (mBatteryCapacity <= 0) return false;
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -214,7 +214,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
     public static int getMaxHatchTier(int aCellTier) {
         switch (aCellTier) {
             case 9 -> {
-                return GT_Values.VOLTAGE_NAMES[9].equals("Ultimate High Voltage") ? 15 : 9;
+                return GTValues.VOLTAGE_NAMES[9].equals("Ultimate High Voltage") ? 15 : 9;
             }
             default -> {
                 if (aCellTier < 4) {
@@ -434,13 +434,13 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
         }
         int tier = getMaxHatchTier(level);
         long volSum = 0;
-        for (GT_MetaTileEntity_Hatch hatch : mAllDynamoHatches) {
+        for (MTEHatch hatch : mAllDynamoHatches) {
             if (hatch.mTier > tier || hatch.mTier < 3) {
                 return false;
             }
             volSum += (8L << (hatch.mTier * 2));
         }
-        for (GT_MetaTileEntity_Hatch hatch : mAllEnergyHatches) {
+        for (MTEHatch hatch : mAllEnergyHatches) {
             if (hatch.mTier > tier || hatch.mTier < 3) {
                 return false;
             }
@@ -458,11 +458,11 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
             return false;
         } else {
             IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) {
+            if (aMetaTileEntity instanceof MTEHatchEnergy) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) {
+            } else if (aMetaTileEntity instanceof MTEHatchDynamo) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
-            } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
+            } else if (aMetaTileEntity instanceof MTEHatchMaintenance) {
                 return addToMachineList(aTileEntity, aBaseCasingIndex);
             } else {
                 if (isThisHatchMultiDynamo(aMetaTileEntity)) {
@@ -624,18 +624,18 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
         long aInputAverage = 0;
         long aOutputAverage = 0;
         // Input Power
-        for (GT_MetaTileEntity_Hatch THatch : filterValidMTEs(this.mDischargeHatches)) {
+        for (MTEHatch THatch : filterValidMTEs(this.mDischargeHatches)) {
             aInputAverage += drawEnergyFromHatch(THatch);
         }
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(this.mAllEnergyHatches)) {
+        for (MTEHatch tHatch : filterValidMTEs(this.mAllEnergyHatches)) {
             aInputAverage += drawEnergyFromHatch(tHatch);
         }
 
         // Output Power
-        for (GT_MetaTileEntity_Hatch THatch : filterValidMTEs(this.mChargeHatches)) {
+        for (MTEHatch THatch : filterValidMTEs(this.mChargeHatches)) {
             aOutputAverage += addEnergyToHatch(THatch);
         }
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(this.mAllDynamoHatches)) {
+        for (MTEHatch tHatch : filterValidMTEs(this.mAllDynamoHatches)) {
             aOutputAverage += addEnergyToHatch(tHatch);
         }
         // reset progress time
@@ -680,10 +680,10 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
 
         String storedEnergyText;
         if (this.getEUVar() > this.mBatteryCapacity) {
-            storedEnergyText = EnumChatFormatting.RED + GT_Utility.formatNumbers(this.getEUVar())
+            storedEnergyText = EnumChatFormatting.RED + GTUtility.formatNumbers(this.getEUVar())
                 + EnumChatFormatting.RESET;
         } else {
-            storedEnergyText = EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.getEUVar())
+            storedEnergyText = EnumChatFormatting.GREEN + GTUtility.formatNumbers(this.getEUVar())
                 + EnumChatFormatting.RESET;
         }
 
@@ -693,10 +693,10 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
 
         return new String[] { "Ergon Energy - District Sub-Station", "Stored EU: " + storedEnergyText,
             "Capacity: " + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(this.maxEUStore())
+                + GTUtility.formatNumbers(this.maxEUStore())
                 + EnumChatFormatting.RESET,
             "Running Costs: " + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(this.computeEnergyTax())
+                + GTUtility.formatNumbers(this.computeEnergyTax())
                 + EnumChatFormatting.RESET
                 + " EU/t",
             "Controller Mode: " + mode,
@@ -710,23 +710,23 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
                 + "]",
             "----------------------", "Stats for Nerds",
             "Average Input: " + EnumChatFormatting.BLUE
-                + GT_Utility.formatNumbers(this.getAverageEuAdded())
+                + GTUtility.formatNumbers(this.getAverageEuAdded())
                 + EnumChatFormatting.RESET
                 + " EU",
             "Average Output: " + EnumChatFormatting.GOLD
-                + GT_Utility.formatNumbers(this.getAverageEuConsumed())
+                + GTUtility.formatNumbers(this.getAverageEuConsumed())
                 + EnumChatFormatting.RESET
                 + " EU",
             "Total Input: " + EnumChatFormatting.BLUE
-                + GT_Utility.formatNumbers(this.mTotalEnergyAdded)
+                + GTUtility.formatNumbers(this.mTotalEnergyAdded)
                 + EnumChatFormatting.RESET
                 + " EU",
             "Total Output: " + EnumChatFormatting.GOLD
-                + GT_Utility.formatNumbers(this.mTotalEnergyConsumed)
+                + GTUtility.formatNumbers(this.mTotalEnergyConsumed)
                 + EnumChatFormatting.RESET
                 + " EU",
             "Total Costs: " + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(this.mTotalEnergyLost)
+                + GTUtility.formatNumbers(this.mTotalEnergyLost)
                 + EnumChatFormatting.RESET
                 + " EU", };
     }
@@ -844,7 +844,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setPos(4, 4)
                 .setSize(149, 149))
             .widget(new SlotWidget(inventoryHandler, 0).setPos(154, 4))
@@ -896,13 +896,13 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
                     .setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setPos(10, 40))
             .widget(
-                new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ENERGY_FRAME)
+                new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_ENERGY_FRAME)
                     .setPos(4, 155)
                     .setSize(149, 7))
             .widget(new FakeSyncWidget.FloatSyncer(this::getProgress, val -> clientProgress = val))
             .widget(
                 new ProgressBar().setProgress(this::getProgress)
-                    .setTexture(GTPP_UITextures.PROGRESSBAR_PSS_ENERGY, 147)
+                    .setTexture(GTPPUITextures.PROGRESSBAR_PSS_ENERGY, 147)
                     .setDirection(ProgressBar.Direction.RIGHT)
                     .setPos(5, 156)
                     .setSize(147, 5))
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/MTESolarHeater.java
index 141f4bbc43..64925c9bb1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/MTESolarHeater.java
@@ -11,34 +11,34 @@ 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_TieredMachineBlock;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_SolarTower;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTESolarTower;
 
-public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock {
+public class MTESolarHeater extends MTETieredMachineBlock {
 
     public boolean mHasTower = false;
-    private GregtechMetaTileEntity_SolarTower mTower = null;
+    private MTESolarTower mTower = null;
 
     private int mTX, mTY, mTZ;
     private Byte mRequiredFacing;
 
-    public TileEntitySolarHeater(final int aID, final String aName, final String aNameRegional, final int aTier,
+    public MTESolarHeater(final int aID, final String aName, final String aNameRegional, final int aTier,
         final String aDescription, final int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
     }
 
-    public TileEntitySolarHeater(final String aName, final int aTier, final String[] aDescription,
+    public MTESolarHeater(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures, final int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        return ArrayUtils.addAll(this.mDescriptionArray, "Point me at a Solar Tower", CORE.GT_Tooltip.get());
+        return ArrayUtils.addAll(this.mDescriptionArray, "Point me at a Solar Tower", GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -68,54 +68,54 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
     }
 
     public ITexture[] getFront(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) };
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
-            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new TileEntitySolarHeater(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, 0);
+        return new MTESolarHeater(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, 0);
     }
 
     @Override
@@ -247,7 +247,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return false;
     }
 
@@ -258,7 +258,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
         return mHasTower;
     }
 
-    public GregtechMetaTileEntity_SolarTower getSolarTower() {
+    public MTESolarTower getSolarTower() {
         if (this.mHasTower) {
             return mTower;
         }
@@ -280,7 +280,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
         return false;
     }
 
-    public boolean setSolarTower(GregtechMetaTileEntity_SolarTower aTowerTile) {
+    public boolean setSolarTower(MTESolarTower aTowerTile) {
         if (!hasSolarTower()) {
             this.mTX = aTowerTile.getBaseMetaTileEntity()
                 .getXCoord();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneBase.java
index ee6ccff4b1..6da66be563 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneBase.java
@@ -9,25 +9,25 @@ import org.apache.commons.lang3.ArrayUtils;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_ItemStack;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
+import gregtech.api.objects.GTItemStack;
+import gtPlusPlus.core.lib.GTPPCore;
 
-public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_TieredMachineBlock {
+public abstract class MTERedstoneBase extends MTETieredMachineBlock {
 
     protected int mOpenerCount;
 
-    public GT_MetaTileEntity_RedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTERedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_RedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTERedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_RedstoneBase(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTERedstoneBase(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
@@ -38,7 +38,7 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return side != getBaseMetaTileEntity().getFrontFacing();
     }
 
@@ -106,6 +106,6 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T
 
     @Override
     public String[] getDescription() {
-        return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get());
+        return ArrayUtils.add(this.mDescriptionArray, GTPPCore.GT_Tooltip.get());
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneButtonPanel.java
index 174a13d3c8..a83d05f928 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneButtonPanel.java
@@ -8,11 +8,11 @@ import gregtech.api.enums.Textures;
 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;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
-public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_RedstoneBase {
+public class MTERedstoneButtonPanel extends MTERedstoneBase {
 
     public byte mRedstoneStrength = 0, mType = 0, mUpdate = 0;
 
@@ -24,7 +24,7 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
         }
     }
 
-    public GT_MetaTileEntity_RedstoneButtonPanel(int aID) {
+    public MTERedstoneButtonPanel(int aID) {
         super(
             aID,
             "redstone.button.panel",
@@ -34,14 +34,13 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
             "Right-click with Screwdriver to change Button Design");
     }
 
-    public GT_MetaTileEntity_RedstoneButtonPanel(final String aName, String[] aDescription,
-        final ITexture[][][] aTextures) {
+    public MTERedstoneButtonPanel(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 5, 0, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneButtonPanel(this.mName, mDescriptionArray, this.mTextures);
+        return new MTERedstoneButtonPanel(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -162,7 +161,7 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         if (side == facing) {
             return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
-                new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
+                new GTRenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
         }
         return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (side == facing ? 0
             : side == facing.getOpposite() ? 1
@@ -175,31 +174,31 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_Off) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_On) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_On) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_Off) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_On) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneCircuitBlock.java
index 3b9b9af9a0..20cd569e24 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneCircuitBlock.java
@@ -24,44 +24,42 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_CircuitryBehavior;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.CircuitryBehavior;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-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_RedstoneCircuitBlock extends GT_MetaTileEntity_RedstoneBase
-    implements IRedstoneCircuitBlock, IAddUIWidgets {
+public class MTERedstoneCircuitBlock extends MTERedstoneBase implements IRedstoneCircuitBlock, IAddUIWidgets {
 
     public int mGate = 0, mGateData[] = new int[] { 0, 0, 0, 0, 0, 0, 0, 0 };
     public boolean bOutput = true;
 
-    public GT_MetaTileEntity_RedstoneCircuitBlock(int aID) {
+    public MTERedstoneCircuitBlock(int aID) {
         super(aID, "redstone.circuit", "Redstone Circuit Block", 1, 5, "Computes Redstone");
     }
 
-    public GT_MetaTileEntity_RedstoneCircuitBlock(final String aName, String[] aDescription,
-        final ITexture[][][] aTextures) {
+    public MTERedstoneCircuitBlock(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 1, 5, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneCircuitBlock(this.mName, mDescriptionArray, this.mTextures);
+        return new MTERedstoneCircuitBlock(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -111,12 +109,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
 
     @Override
     public long maxEUInput() {
-        return GT_Values.V[1];
+        return GTValues.V[1];
     }
 
     @Override
     public long maxEUOutput() {
-        return bOutput ? GT_Values.V[1] : 0;
+        return bOutput ? GTValues.V[1] : 0;
     }
 
     @Override
@@ -136,12 +134,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
 
     @Override
     public long maxEUStore() {
-        return GT_Values.V[3] * 1024;
+        return GTValues.V[3] * 1024;
     }
 
     @Override
     public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -160,37 +158,37 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
 
     public void switchGateForward(boolean aShift) {
         try {
-            Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet();
+            Set<Integer> tKeys = GregTechAPI.sCircuitryBehaviors.keySet();
             ArrayList<Integer> tList = new ArrayList<>();
             tList.addAll(tKeys);
             if (tList.size() <= 0) return;
             Collections.sort(tList);
-            if (!GregTech_API.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0);
+            if (!GregTechAPI.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0);
             int tIndex = Collections.binarySearch(tList, mGate);
             tIndex += aShift ? 16 : 1;
             while (tIndex >= tList.size()) tIndex -= tList.size();
             mGate = tList.get(tIndex);
             switchGate();
         } catch (Throwable e) {
-            GT_Log.err.print(e);
+            GTLog.err.print(e);
         }
     }
 
     public void switchGateBackward(boolean aShift) {
         try {
-            Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet();
+            Set<Integer> tKeys = GregTechAPI.sCircuitryBehaviors.keySet();
             ArrayList<Integer> tList = new ArrayList<>();
             tList.addAll(tKeys);
             if (tList.size() <= 0) return;
             Collections.sort(tList);
-            if (!GregTech_API.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0);
+            if (!GregTechAPI.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0);
             int tIndex = Collections.binarySearch(tList, mGate);
             tIndex -= aShift ? 16 : 1;
             while (tIndex < 0) tIndex += tList.size();
             mGate = tList.get(tIndex);
             switchGate();
         } catch (Throwable e) {
-            GT_Log.err.print(e);
+            GTLog.err.print(e);
         }
     }
 
@@ -214,28 +212,28 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
     }
 
     public void stackGateData(int aIndex, ItemStack aStack) {
-        mGateData[aIndex] = GT_Utility.stackToInt(aStack);
+        mGateData[aIndex] = GTUtility.stackToInt(aStack);
         validateGateData();
     }
 
     private void switchGate() {
         resetRedstone();
         Arrays.fill(mGateData, 0);
-        GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate);
+        CircuitryBehavior tBehaviour = GregTechAPI.sCircuitryBehaviors.get(mGate);
         if (tBehaviour != null) try {
             tBehaviour.initParameters(mGateData, this);
         } catch (Throwable e) {
-            GT_Log.err.print(e);
+            GTLog.err.print(e);
         }
         validateGateData();
     }
 
     private void validateGateData() {
-        GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate);
+        CircuitryBehavior tBehaviour = GregTechAPI.sCircuitryBehaviors.get(mGate);
         if (tBehaviour != null) try {
             tBehaviour.validateParameters(mGateData, this);
         } catch (Throwable e) {
-            GT_Log.err.print(e);
+            GTLog.err.print(e);
         }
     }
 
@@ -254,7 +252,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
             mInventory[0] = mInventory[1] = mInventory[2] = mInventory[3] = mInventory[4] = null;
             if (getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU()) {
                 if (getBaseMetaTileEntity().isActive()) {
-                    GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate);
+                    CircuitryBehavior tBehaviour = GregTechAPI.sCircuitryBehaviors.get(mGate);
                     if (tBehaviour != null) {
                         try {
                             tBehaviour.onTick(mGateData, this);
@@ -267,7 +265,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                             if (tBehaviour.displayItemStack(mGateData, this, 3))
                                 mInventory[4] = getCoverByID(mGateData[3]);
                         } catch (Throwable e) {
-                            GT_Log.err.print(e);
+                            GTLog.err.print(e);
                         }
                     }
                 }
@@ -313,11 +311,11 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
     public static final Map<Integer, ItemStack> sCoversItems = new HashMap<>();
 
     private static void initCovers() {
-        for (GT_ItemStack aKey : GregTech_API.sCovers.keySet()) {
+        for (GTItemStack aKey : GregTechAPI.sCovers.keySet()) {
             ItemStack aStack = aKey.toStack()
                 .copy();
             if (aStack != null) {
-                sCoversItems.put(GT_Utility.stackToInt(aStack), aStack);
+                sCoversItems.put(GTUtility.stackToInt(aStack), aStack);
             }
         }
     }
@@ -398,8 +396,8 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
     }
 
     @Override
-    public GT_CoverBehavior getCover(ForgeDirection side) {
-        return (GT_CoverBehavior) getBaseMetaTileEntity().getCoverBehaviorAtSideNew(side);
+    public CoverBehavior getCover(ForgeDirection side) {
+        return (CoverBehavior) getBaseMetaTileEntity().getCoverBehaviorAtSideNew(side);
     }
 
     @Override
@@ -443,48 +441,48 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + 1];
     }
 
-    private GT_RenderedTexture getBase() {
-        return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+    private GTRenderedTexture getBase() {
+        return new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) };
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off),
-            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off),
+            new GTRenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On),
-            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On),
+            new GTRenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) };
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) };
     }
 
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_REDSTONE_CIRCUIT_SCREEN)
+            new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_REDSTONE_CIRCUIT_SCREEN)
                 .setPos(43, 5)
                 .setSize(108, 72));
         for (int i = 0; i < 4; i++) {
@@ -497,12 +495,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                         index,
                         clickData.mouseButton == 0 ? clickData.shift ? +128 : +1 : clickData.shift ? -128 : -1);
                 } else {
-                    tStack = GT_Utility.copy(tStack);
+                    tStack = GTUtility.copy(tStack);
                     if (clickData.mouseButton != 0) tStack.setItemDamage(OreDictionary.WILDCARD_VALUE);
                     stackGateData(index, tStack);
                 }
             })
-                .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_PLUS_MINUS)
+                .setBackground(GTUITextures.BUTTON_STANDARD, GTPPUITextures.OVERLAY_BUTTON_PLUS_MINUS)
                 .setPos(7, 5 + i * 18)
                 .setSize(18, 18))
                 .widget(
@@ -512,16 +510,16 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
         }
         builder.widget(
             new CycleButtonWidget().setToggle(() -> bOutput, val -> bOutput = val)
-                .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY)
+                .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                .setStaticTexture(GTUITextures.OVERLAY_BUTTON_EMIT_ENERGY)
                 .addTooltip("Toggle EU Output")
                 .setPos(151, 5)
                 .setSize(18, 18))
             .widget(
                 new CycleButtonWidget()
                     .setToggle(() -> getBaseMetaTileEntity().isActive(), val -> getBaseMetaTileEntity().setActive(val))
-                    .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                    .setStaticTexture(GTPP_UITextures.OVERLAY_BUTTON_ACTIVE_STATE)
+                    .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                    .setStaticTexture(GTPPUITextures.OVERLAY_BUTTON_ACTIVE_STATE)
                     .addTooltip("Toggle Active State")
                     .setPos(151, 23)
                     .setSize(18, 18))
@@ -529,7 +527,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 if (clickData.mouseButton == 0) switchGateForward(clickData.shift);
                 else switchGateBackward(clickData.shift);
             })
-                .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_CHANGE_MODE)
+                .setBackground(GTUITextures.BUTTON_STANDARD, GTPPUITextures.OVERLAY_BUTTON_CHANGE_MODE)
                 .addTooltip("Change Redstone Circuit")
                 .setPos(151, 41)
                 .setSize(18, 18));
@@ -543,12 +541,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
         builder.widget(new DrawableWidget().setDrawable(() -> {
             if (getBaseMetaTileEntity().getErrorDisplayID() > 0) {
                 if ((getBaseMetaTileEntity().getTimer() / 5) % 2 == 0) {
-                    return GTPP_UITextures.PICTURE_ELECTRICITY_ERROR;
+                    return GTPPUITextures.PICTURE_ELECTRICITY_ERROR;
                 } else {
                     return null;
                 }
             } else {
-                return GTPP_UITextures.PICTURE_ELECTRICITY_FINE;
+                return GTPPUITextures.PICTURE_ELECTRICITY_FINE;
             }
         })
             .setPos(140, 9)
@@ -559,7 +557,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                     val -> getBaseMetaTileEntity().setErrorDisplayID(val)));
 
         builder.widget(TextWidget.dynamicString(() -> {
-            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+            CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
             if (tCircuit != null) return tCircuit.getName();
             return "";
         })
@@ -567,7 +565,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
             .setDefaultColor(COLOR_TEXT_WHITE.get())
             .setPos(46, 8))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) return tCircuit.getDescription();
                 return "";
             })
@@ -575,7 +573,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(46, 19))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 0);
                 return "";
             })
@@ -583,7 +581,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(46, 33))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 1);
                 return "";
             })
@@ -591,7 +589,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(46, 44))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 2);
                 return "";
             })
@@ -599,7 +597,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(46, 55))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 3);
                 return "";
             })
@@ -607,10 +605,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(46, 66))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) {
                     String tString = tCircuit.getDataDisplay(mGateData, 0);
-                    return tString == null ? GT_Utility.parseNumberToString(mGateData[0]) : tString;
+                    return tString == null ? GTUtility.parseNumberToString(mGateData[0]) : tString;
                 }
                 return "";
             })
@@ -618,10 +616,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(99, 33))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) {
                     String tString = tCircuit.getDataDisplay(mGateData, 1);
-                    return tString == null ? GT_Utility.parseNumberToString(mGateData[1]) : tString;
+                    return tString == null ? GTUtility.parseNumberToString(mGateData[1]) : tString;
                 }
                 return "";
             })
@@ -629,10 +627,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(99, 44))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) {
                     String tString = tCircuit.getDataDisplay(mGateData, 2);
-                    return tString == null ? GT_Utility.parseNumberToString(mGateData[2]) : tString;
+                    return tString == null ? GTUtility.parseNumberToString(mGateData[2]) : tString;
                 }
                 return "";
             })
@@ -640,10 +638,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(99, 55))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) {
                     String tString = tCircuit.getDataDisplay(mGateData, 3);
-                    return tString == null ? GT_Utility.parseNumberToString(mGateData[3]) : tString;
+                    return tString == null ? GTUtility.parseNumberToString(mGateData[3]) : tString;
                 }
                 return "";
             })
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneLamp.java
index 06dd76c3f4..7b963d3c7d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneLamp.java
@@ -6,11 +6,11 @@ import net.minecraftforge.common.util.ForgeDirection;
 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;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
-public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBase {
+public class MTERedstoneLamp extends MTERedstoneBase {
 
     public byte mRedstoneStrength = 0, mType = 0;
     public static TexturesGtBlock.CustomIcon[] sIconList = new TexturesGtBlock.CustomIcon[2];
@@ -20,17 +20,17 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa
         sIconList[1] = new CustomIcon("TileEntities/gt4/redstone/Lamp/on");
     }
 
-    public GT_MetaTileEntity_RedstoneLamp(int aID) {
+    public MTERedstoneLamp(int aID) {
         super(aID, "redstone.lamp", "Redstone Controlled Lamp", 0, 0, "Redstone Controlled Lamp");
     }
 
-    public GT_MetaTileEntity_RedstoneLamp(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
+    public MTERedstoneLamp(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 0, 0, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneLamp(this.mName, mDescriptionArray, this.mTextures);
+        return new MTERedstoneLamp(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -64,10 +64,10 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(sIconList[0]) };
+        return new ITexture[] { new GTRenderedTexture(sIconList[0]) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(sIconList[1]) };
+        return new ITexture[] { new GTRenderedTexture(sIconList[1]) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthDisplay.java
index b3b9d0fdcb..c2591c6a41 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthDisplay.java
@@ -8,11 +8,11 @@ import gregtech.api.enums.Textures;
 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;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
-public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity_RedstoneBase {
+public class MTERedstoneStrengthDisplay extends MTERedstoneBase {
 
     public byte mRedstoneStrength = 0, mType = 0;
     public static TexturesGtBlock.CustomIcon[] sIconList = new TexturesGtBlock.CustomIcon[144];
@@ -23,18 +23,17 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
         }
     }
 
-    public GT_MetaTileEntity_RedstoneStrengthDisplay(int aID, String aUnlocal, String aLocal, String aDescription) {
+    public MTERedstoneStrengthDisplay(int aID, String aUnlocal, String aLocal, String aDescription) {
         super(aID, aUnlocal, aLocal, 5, 0, aDescription);
     }
 
-    public GT_MetaTileEntity_RedstoneStrengthDisplay(final String aName, String[] aDescription,
-        final ITexture[][][] aTextures) {
+    public MTERedstoneStrengthDisplay(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 5, 0, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneStrengthDisplay(this.mName, mDescriptionArray, this.mTextures);
+        return new MTERedstoneStrengthDisplay(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -96,7 +95,7 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         if (side == facing) {
             return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
-                new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
+                new GTRenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
         }
         return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (side == facing ? 0
             : side == facing.getOpposite() ? 1
@@ -109,31 +108,31 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthScale.java
index 5821dbab1a..e59500dcc0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthScale.java
@@ -7,11 +7,11 @@ import gregtech.api.enums.Textures;
 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;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
-public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_RedstoneStrengthDisplay {
+public class MTERedstoneStrengthScale extends MTERedstoneStrengthDisplay {
 
     public static TexturesGtBlock.CustomIcon[] sIconList = new TexturesGtBlock.CustomIcon[32];
 
@@ -21,18 +21,17 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R
         }
     }
 
-    public GT_MetaTileEntity_RedstoneStrengthScale(int aID) {
+    public MTERedstoneStrengthScale(int aID) {
         super(aID, "redstone.display.scale", "Redstone Scale", "Redstone Strength on a Scale");
     }
 
-    public GT_MetaTileEntity_RedstoneStrengthScale(final String aName, String[] aDescription,
-        final ITexture[][][] aTextures) {
+    public MTERedstoneStrengthScale(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneStrengthScale(this.mName, mDescriptionArray, this.mTextures);
+        return new MTERedstoneStrengthScale(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -45,7 +44,7 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         if (side == facing) {
             return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
-                new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
+                new GTRenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
         }
         return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (side == facing ? 0
             : side == facing.getOpposite() ? 1
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTEEnergyBuffer.java
index 17b2d77756..ed4ff6b4ca 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTEEnergyBuffer.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.storage;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -12,25 +12,25 @@ 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_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMetaTileEntity;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
+public class MTEEnergyBuffer extends GTPPMetaTileEntity {
 
     protected byte aCurrentOutputAmperage = 4;
 
-    public GregtechMetaEnergyBuffer(final int aID, final String aName, final String aNameRegional, final int aTier,
+    public MTEEnergyBuffer(final int aID, final String aName, final String aNameRegional, final int aTier,
         final String aDescription, final int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
     }
 
-    public GregtechMetaEnergyBuffer(final String aName, final int aTier, final String aDescription,
+    public MTEEnergyBuffer(final String aName, final int aTier, final String aDescription,
         final ITexture[][][] aTextures, final int aSlotCount) {
         super(aName, aTier, aSlotCount, aDescription, aTextures);
     }
@@ -38,11 +38,11 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
     @Override
     public String[] getDescription() {
         return new String[] { this.mDescription, "Defaults 4A In/Out", "Change output Amperage with a screwdriver",
-            "Now Portable!", CORE.GT_Tooltip.get() };
+            "Now Portable!", GTPPCore.GT_Tooltip.get() };
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCover) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCover) {
         if (side != this.getBaseMetaTileEntity()
             .getFrontFacing()) {
             return true;
@@ -87,22 +87,22 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
@@ -112,32 +112,27 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
+            new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaEnergyBuffer(
-            this.mName,
-            this.mTier,
-            this.mDescription,
-            this.mTextures,
-            this.mInventory.length);
+        return new MTEEnergyBuffer(this.mName, this.mTier, this.mDescription, this.mTextures, this.mInventory.length);
     }
 
     @Override
@@ -294,8 +289,8 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
         final double roundOff = Math.round(c * 100.00) / 100.00;
         PlayerUtils.messagePlayer(
             playerIn,
-            "Energy: " + GT_Utility.formatNumbers(tempStorage) + " EU at " + V[this.mTier] + "v (" + roundOff + "%)");
-        PlayerUtils.messagePlayer(playerIn, "Amperage: " + GT_Utility.formatNumbers(maxAmperesOut()) + "A");
+            "Energy: " + GTUtility.formatNumbers(tempStorage) + " EU at " + V[this.mTier] + "v (" + roundOff + "%)");
+        PlayerUtils.messagePlayer(playerIn, "Amperage: " + GTUtility.formatNumbers(maxAmperesOut()) + "A");
     }
     // Utils.LOG_WARNING("Begin Show Energy");
     /*
@@ -326,10 +321,10 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 
     @Override
     public String[] getInfoData() {
-        String cur = GT_Utility.formatNumbers(
+        String cur = GTUtility.formatNumbers(
             this.getBaseMetaTileEntity()
                 .getStoredEU());
-        String max = GT_Utility.formatNumbers(
+        String max = GTUtility.formatNumbers(
             this.getBaseMetaTileEntity()
                 .getEUCapacity());
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java
index 2b1591ab80..423a71c3e1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java
@@ -15,24 +15,24 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.lib.GTPPCore;
 
-public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachineBlock implements IAddUIWidgets {
+public class MTETieredChest extends MTETieredMachineBlock implements IAddUIWidgets {
 
     public int mItemCount = 0;
     public ItemStack mItemStack = null;
     private static final double mStorageFactor = (270000.0D / 16);
 
-    public GT_MetaTileEntity_TieredChest(int aID, String aName, String aNameRegional, int aTier) {
+    public MTETieredChest(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -43,13 +43,13 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
             new ITexture[0]);
     }
 
-    public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTETieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get());
+        return ArrayUtils.add(this.mDescriptionArray, GTPPCore.GT_Tooltip.get());
     }
 
     @Override
@@ -73,12 +73,12 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TieredChest(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTETieredChest(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -98,7 +98,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
             }
 
             if (this.mInventory[0] != null && this.mItemCount < this.getMaxItemCount()
-                && GT_Utility.areStacksEqual(this.mInventory[0], this.mItemStack)) {
+                && GTUtility.areStacksEqual(this.mInventory[0], this.mItemStack)) {
                 this.mItemCount += this.mInventory[0].stackSize;
                 if (this.mItemCount > this.getMaxItemCount()) {
                     this.mInventory[0].stackSize = this.mItemCount - this.getMaxItemCount();
@@ -112,7 +112,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
                 this.mInventory[1] = this.mItemStack.copy();
                 this.mInventory[1].stackSize = Math.min(this.mItemStack.getMaxStackSize(), this.mItemCount);
                 this.mItemCount -= this.mInventory[1].stackSize;
-            } else if (this.mItemCount > 0 && GT_Utility.areStacksEqual(this.mInventory[1], this.mItemStack)
+            } else if (this.mItemCount > 0 && GTUtility.areStacksEqual(this.mInventory[1], this.mItemStack)
                 && this.mInventory[1].getMaxStackSize() > this.mInventory[1].stackSize) {
                     int tmp = Math
                         .min(this.mItemCount, this.mInventory[1].getMaxStackSize() - this.mInventory[1].stackSize);
@@ -161,7 +161,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
 
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        return aIndex == 0 && (this.mInventory[0] == null || GT_Utility.areStacksEqual(this.mInventory[0], aStack));
+        return aIndex == 0 && (this.mInventory[0] == null || GTUtility.areStacksEqual(this.mInventory[0], aStack));
     }
 
     @Override
@@ -201,10 +201,10 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
         int aColorIndex, boolean aActive, boolean aRedstone) {
         return aBaseMetaTileEntity.getFrontFacing() == ForgeDirection.DOWN && side == ForgeDirection.WEST
             ? new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
-                new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST) }
+                new GTRenderedTexture(BlockIcons.OVERLAY_QCHEST) }
             : (side == aBaseMetaTileEntity.getFrontFacing()
                 ? new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
-                    new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST) }
+                    new GTRenderedTexture(BlockIcons.OVERLAY_QCHEST) }
                 : new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1] });
     }
 
@@ -218,21 +218,21 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setPos(7, 16)
                 .setSize(71, 45))
             .widget(
                 new SlotWidget(inventoryHandler, 0)
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_IN)
                     .setPos(79, 16))
             .widget(
                 new SlotWidget(inventoryHandler, 1).setAccess(true, false)
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_OUT)
                     .setPos(79, 52))
             .widget(
                 SlotWidget.phantom(inventoryHandler, 2)
                     .disableInteraction()
-                    .setBackground(GT_UITextures.TRANSPARENT)
+                    .setBackground(GTUITextures.TRANSPARENT)
                     .setPos(59, 42))
             .widget(
                 new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get())
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredTank.java
index e277eb4076..fb766b9dd5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredTank.java
@@ -11,34 +11,33 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 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_BasicTank;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 
-public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
+public class MTETieredTank extends MTEBasicTank {
 
-    public GT_MetaTileEntity_TieredTank(final int aID, final String aName, final String aNameRegional,
-        final int aTier) {
+    public MTETieredTank(final int aID, final String aName, final String aNameRegional, final int aTier) {
         super(
             aID,
             aName,
             aNameRegional,
             aTier,
             3,
-            "Stores " + GT_Utility.formatNumbers(((int) (Math.pow(2, aTier) * 32000))) + "L of fluid");
+            "Stores " + GTUtility.formatNumbers(((int) (Math.pow(2, aTier) * 32000))) + "L of fluid");
     }
 
-    public GT_MetaTileEntity_TieredTank(final String aName, final int aTier, final String[] aDescription,
+    public MTETieredTank(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
@@ -50,7 +49,7 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
         if (this.mFluid != null) {
             description.add("Fluid: " + mFluid.getLocalizedName() + " " + mFluid.amount + "L");
         }
-        description.add(CORE.GT_Tooltip.get());
+        description.add(GTPPCore.GT_Tooltip.get());
         return description.toArray(new String[0]);
     }
 
@@ -64,9 +63,9 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         return side == ForgeDirection.UP
             ? new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_FLUIDTANK) }
+                new GTRenderedTexture(Textures.BlockIcons.OVERLAY_TOP_FLUIDTANK) }
             : new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_FLUIDTANK) };
+                new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_FLUIDTANK) };
     }
 
     @Override
@@ -76,18 +75,18 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
                 .loadFluidStackFromNBT(stack.stackTagCompound.getCompoundTag("mFluid"));
             if (tContents != null && tContents.amount > 0) {
                 tooltip.add(
-                    GT_LanguageManager.addStringLocalization(
+                    GTLanguageManager.addStringLocalization(
                         "TileEntity_TANK_INFO",
                         "Contains Fluid: ",
-                        !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW
+                        !GregTechAPI.sPostloadFinished) + EnumChatFormatting.YELLOW
                         + tContents.getLocalizedName()
                         + EnumChatFormatting.GRAY);
                 tooltip.add(
-                    GT_LanguageManager.addStringLocalization(
+                    GTLanguageManager.addStringLocalization(
                         "TileEntity_TANK_AMOUNT",
                         "Fluid Amount: ",
-                        !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN
-                        + GT_Utility.formatNumbers(tContents.amount)
+                        !GregTechAPI.sPostloadFinished) + EnumChatFormatting.GREEN
+                        + GTUtility.formatNumbers(tContents.amount)
                         + " L"
                         + EnumChatFormatting.GRAY);
             }
@@ -138,16 +137,16 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
     public String[] getInfoData() {
 
         if (this.mFluid == null) {
-            return new String[] { GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", "No Fluid",
+            return new String[] { GTValues.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", "No Fluid",
                 0 + "L", this.getCapacity() + "L" };
         }
-        return new String[] { GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:",
+        return new String[] { GTValues.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:",
             this.mFluid.getLocalizedName(), this.mFluid.amount + "L", this.getCapacity() + "L" };
     }
 
     @Override
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TieredTank(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTETieredTank(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -162,7 +161,7 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
 
     @Override
     public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/MTEInfiniteItemHolder.java
index 2dca8d5c30..677fe1a1c9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/MTEInfiniteItemHolder.java
@@ -9,16 +9,15 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest;
+import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTETieredChest;
 
-public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_TieredChest {
+public class MTEInfiniteItemHolder extends MTETieredChest {
 
-    public GT_MetaTileEntity_InfiniteItemHolder(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEInfiniteItemHolder(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_InfiniteItemHolder(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEInfiniteItemHolder(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
@@ -87,6 +86,6 @@ public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_Tier
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_InfiniteItemHolder(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEInfiniteItemHolder(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolAngleGrinder.java
index 6af3a61487..196bc2a5bb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolAngleGrinder.java
@@ -15,17 +15,17 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures.ItemIcons;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_None;
-import gregtech.common.tools.GT_Tool;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourNone;
+import gregtech.common.tools.GTTool;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
 
-public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
+public class ToolAngleGrinder extends GTTool {
 
     public static final List<String> mEffectiveList = Arrays
         .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" });
@@ -139,7 +139,7 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa;
     }
 
     @Override
@@ -147,8 +147,8 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
         super.onToolCrafted(aStack, aPlayer);
         aPlayer.triggerAchievement(AchievementList.buildSword);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "tools");
-            GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
+            GTMod.achievements.issueAchievement(aPlayer, "tools");
+            GTMod.achievements.issueAchievement(aPlayer, "unitool");
         } catch (final Exception e) {}
     }
 
@@ -164,8 +164,8 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
     }
 
     @Override
-    public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_None());
+    public void onStatsAddedToTool(final MetaGeneratedTool aItem, final int aID) {
+        aItem.addItemBehavior(aID, new BehaviourNone());
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolElectricSnips.java
index 25ad03548a..78675f70d5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolElectricSnips.java
@@ -8,15 +8,15 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures.ItemIcons;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.tools.GT_Tool_WireCutter;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.tools.ToolWireCutter;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
 
-public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter {
+public class ToolElectricSnips extends ToolWireCutter {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -70,7 +70,7 @@ public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa;
     }
 
     @Override
@@ -78,8 +78,8 @@ public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter {
         super.onToolCrafted(aStack, aPlayer);
         aPlayer.triggerAchievement(AchievementList.buildSword);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "tools");
-            GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
+            GTMod.achievements.issueAchievement(aPlayer, "tools");
+            GTMod.achievements.issueAchievement(aPlayer, "unitool");
         } catch (final Exception e) {}
     }