471 files changed, 12403 insertions, 12757 deletions

diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GTClient.java
index 66e042a051..e5af28dacd 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GTClient.java
@@ -5,7 +5,7 @@
 
 package gregtech.common;
 
-import static gregtech.api.enums.GT_Values.calculateMaxPlasmaTurbineEfficiency;
+import static gregtech.api.enums.GTValues.calculateMaxPlasmaTurbineEfficiency;
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.GregTech;
 import static org.lwjgl.opengl.GL11.GL_LINE_LOOP;
@@ -59,62 +59,62 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.network.FMLNetworkEvent;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.gui.GT_GUIColorOverride;
+import gregtech.api.gui.GUIColorOverride;
 import gregtech.api.gui.modularui.FallbackableSteamTexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.ITurnable;
-import gregtech.api.items.GT_MetaGenerated_Item;
+import gregtech.api.items.MetaGeneratedItem;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.multitileentity.multiblock.base.MultiBlockPart;
-import gregtech.api.net.GT_Packet_ClientPreference;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.net.GTPacketClientPreference;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.recipe.RecipeCategory;
 import gregtech.api.util.ColorsMetadataSection;
 import gregtech.api.util.ColorsMetadataSectionSerializer;
-import gregtech.api.util.GT_ClientPreference;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_MusicSystem;
-import gregtech.api.util.GT_PlayedSound;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTClientPreference;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTMusicSystem;
+import gregtech.api.util.GTPlayedSound;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder;
 import gregtech.client.SeekingOggCodec;
-import gregtech.common.blocks.GT_Block_FrameBox;
-import gregtech.common.blocks.GT_Item_Machines;
-import gregtech.common.render.GT_CapeRenderer;
-import gregtech.common.render.GT_FlaskRenderer;
-import gregtech.common.render.GT_FluidDisplayStackRenderer;
-import gregtech.common.render.GT_LaserRenderer;
-import gregtech.common.render.GT_MetaGenerated_Tool_Renderer;
-import gregtech.common.render.GT_MultiTile_Renderer;
-import gregtech.common.render.GT_PollutionRenderer;
-import gregtech.common.render.GT_RenderDrone;
-import gregtech.common.render.GT_Renderer_Block;
-import gregtech.common.render.GT_WormholeRenderer;
-import gregtech.common.render.items.GT_MetaGenerated_Item_Renderer;
-import gregtech.common.tileentities.debug.GT_MetaTileEntity_AdvDebugStructureWriter;
+import gregtech.common.blocks.BlockFrameBox;
+import gregtech.common.blocks.ItemMachines;
+import gregtech.common.render.DroneRender;
+import gregtech.common.render.FlaskRenderer;
+import gregtech.common.render.FluidDisplayStackRenderer;
+import gregtech.common.render.GTCapeRenderer;
+import gregtech.common.render.GTRendererBlock;
+import gregtech.common.render.LaserRenderer;
+import gregtech.common.render.MetaGeneratedToolRenderer;
+import gregtech.common.render.MultiTileRenderer;
+import gregtech.common.render.PollutionRenderer;
+import gregtech.common.render.WormholeRenderer;
+import gregtech.common.render.items.MetaGeneratedItemRenderer;
+import gregtech.common.tileentities.debug.MTEAdvDebugStructureWriter;
 import gregtech.loaders.ExtraIcons;
-import gregtech.loaders.misc.GT_Bees;
-import gregtech.loaders.preload.GT_PreLoad;
-import gregtech.nei.NEI_GT_Config;
+import gregtech.loaders.misc.GTBees;
+import gregtech.loaders.preload.GTPreLoad;
+import gregtech.nei.GTNEIConfig;
 import ic2.api.tile.IWrenchable;
 import paulscode.sound.SoundSystemConfig;
 import paulscode.sound.SoundSystemException;
 
 // Referenced classes of package gregtech.common:
-// GT_Proxy
+// GTProxy
 
-public class GT_Client extends GT_Proxy implements Runnable {
+public class GTClient extends GTProxy implements Runnable {
 
     public static final String GTNH_CAPE_LIST_URL = "https://raw.githubusercontent.com/GTNewHorizons/CustomGTCapeHook-Cape-List/master/capes.txt";
     public static final String GT_CAPE_LIST_URL = "http://gregtech.overminddl1.com/com/gregoriust/gregtech/supporterlist.txt";
@@ -165,8 +165,8 @@ public class GT_Client extends GT_Proxy implements Runnable {
     }
 
     private final HashSet<String> mCapeList = new HashSet<>();
-    public static final GT_PollutionRenderer mPollutionRenderer = new GT_PollutionRenderer();
-    private final GT_CapeRenderer mCapeRenderer;
+    public static final PollutionRenderer mPollutionRenderer = new PollutionRenderer();
+    private final GTCapeRenderer mCapeRenderer;
     private final List<Materials> mPosR;
     private final List<Materials> mPosG;
     private final List<Materials> mPosB;
@@ -190,15 +190,15 @@ public class GT_Client extends GT_Proxy implements Runnable {
     private long afterSomeTime;
 
     private boolean mAnimationDirection;
-    private GT_ClientPreference mPreference;
+    private GTClientPreference mPreference;
     private boolean mFirstTick = false;
     public static final int ROTATION_MARKER_RESOLUTION = 120;
     private int mReloadCount;
     private float renderTickTime;
-    public static GT_MetaGenerated_Item_Renderer metaGeneratedItemRenderer;
+    public static MetaGeneratedItemRenderer metaGeneratedItemRenderer;
 
-    public GT_Client() {
-        mCapeRenderer = new GT_CapeRenderer(mCapeList);
+    public GTClient() {
+        mCapeRenderer = new GTCapeRenderer(mCapeList);
         mAnimationTick = 0L;
         mAnimationDirection = false;
         mPosR = Arrays.asList(
@@ -362,7 +362,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
                 }
             } else if (tTile instanceof BaseMetaTileEntity baseMetaTile && baseMetaTile.getAlignment() == null) {
                 if (!aIsSneaking) tConnections |= baseMetaTile.getFrontFacing().flag;
-                else if (baseMetaTile.getMetaTileEntity() instanceof GT_MetaTileEntity_BasicMachine basicMachine) {
+                else if (baseMetaTile.getMetaTileEntity() instanceof MTEBasicMachine basicMachine) {
                     tConnections |= basicMachine.mMainFacing.flag;
                 }
             } else if (tTile instanceof BaseMetaPipeEntity pipeEntity) tConnections = pipeEntity.mConnections;
@@ -592,7 +592,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
             .getResourcePackRepository().rprMetadataSerializer
                 .registerMetadataSectionType(new ColorsMetadataSectionSerializer(), ColorsMetadataSection.class);
 
-        new GT_MetaTileEntity_AdvDebugStructureWriter.ForgeEventHandler();
+        new MTEAdvDebugStructureWriter.ForgeEventHandler();
 
         final String[] arr = { "renadi", "hanakocz", "MysteryDump", "Flaver4", "x_Fame", "Peluche321",
             "Goshen_Ithilien", "manf", "Bimgo", "leagris", "IAmMinecrafter02", "Cerous", "Devilin_Pixy", "Bkarlsson87",
@@ -618,7 +618,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
 
         mPollutionRenderer.preLoad();
 
-        mPreference = new GT_ClientPreference();
+        mPreference = new GTClientPreference();
 
         Materials.initClient();
     }
@@ -626,23 +626,23 @@ public class GT_Client extends GT_Proxy implements Runnable {
     @Override
     public void onLoad() {
         super.onLoad();
-        GT_Renderer_Block.register();
-        new GT_MultiTile_Renderer();
-        new GT_RenderDrone();
-        new GT_LaserRenderer();
-        new GT_WormholeRenderer();
-
-        metaGeneratedItemRenderer = new GT_MetaGenerated_Item_Renderer();
-        for (GT_MetaGenerated_Item item : GT_MetaGenerated_Item.sInstances.values()) {
+        GTRendererBlock.register();
+        new MultiTileRenderer();
+        new DroneRender();
+        new LaserRenderer();
+        new WormholeRenderer();
+
+        metaGeneratedItemRenderer = new MetaGeneratedItemRenderer();
+        for (MetaGeneratedItem item : MetaGeneratedItem.sInstances.values()) {
             metaGeneratedItemRenderer.registerItem(item);
         }
         if (Forestry.isModLoaded()) {
-            metaGeneratedItemRenderer.registerItem(GT_Bees.combs);
+            metaGeneratedItemRenderer.registerItem(GTBees.combs);
         }
-        new GT_MetaGenerated_Tool_Renderer();
-        new GT_FlaskRenderer();
-        new GT_FluidDisplayStackRenderer();
-        MinecraftForge.EVENT_BUS.register(new NEI_GT_Config());
+        new MetaGeneratedToolRenderer();
+        new FlaskRenderer();
+        new FluidDisplayStackRenderer();
+        MinecraftForge.EVENT_BUS.register(new GTNEIConfig());
     }
 
     @Override
@@ -656,10 +656,10 @@ public class GT_Client extends GT_Proxy implements Runnable {
 
                 @Override
                 public void onResourceManagerReload(IResourceManager l) {
-                    GT_GUIColorOverride.onResourceManagerReload();
+                    GUIColorOverride.onResourceManagerReload();
                     FallbackableSteamTexture.reload();
-                    GregTech_API.sCoverBehaviors.values()
-                        .forEach(GT_CoverBehaviorBase::reloadColorOverride);
+                    GregTechAPI.sCoverBehaviors.values()
+                        .forEach(CoverBehaviorBase::reloadColorOverride);
                 }
             });
     }
@@ -691,7 +691,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
 
     @Override
     public void run() {
-        GT_Log.out.println("GT_Mod: Downloading Cape List.");
+        GTLog.out.println("GTMod: Downloading Cape List.");
         try (final Scanner tScanner = new Scanner(new URL(GT_CAPE_LIST_URL).openStream())) {
             while (tScanner.hasNextLine()) {
                 this.mCapeList.add(
@@ -699,9 +699,9 @@ public class GT_Client extends GT_Proxy implements Runnable {
                         .toLowerCase());
             }
         } catch (Throwable e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
-        GT_Log.out.println("GT New Horizons: Downloading Cape List.");
+        GTLog.out.println("GT New Horizons: Downloading Cape List.");
         try (final Scanner tScanner = new Scanner(new URL(GTNH_CAPE_LIST_URL).openStream())) {
             while (tScanner.hasNextLine()) {
                 final String tName = tScanner.nextLine()
@@ -715,7 +715,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
                 }
             }
         } catch (Throwable e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
     }
 
@@ -724,7 +724,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
     public void onClientConnectedToServerEvent(FMLNetworkEvent.ClientConnectedToServerEvent aEvent) {
         mFirstTick = true;
         mReloadCount++;
-        GT_MusicSystem.ClientSystem.reset();
+        GTMusicSystem.ClientSystem.reset();
         // For utility methods elsewhere.
         calculateMaxPlasmaTurbineEfficiency();
     }
@@ -749,37 +749,37 @@ public class GT_Client extends GT_Proxy implements Runnable {
         if ((aEvent.side.isClient()) && (aEvent.phase == TickEvent.Phase.END) && (!aEvent.player.isDead)) {
             if (mFirstTick) {
                 mFirstTick = false;
-                GT_Values.NW.sendToServer(new GT_Packet_ClientPreference(mPreference));
+                GTValues.NW.sendToServer(new GTPacketClientPreference(mPreference));
 
                 if (!Minecraft.getMinecraft()
                     .isSingleplayer()) {
-                    GT_ModHandler.removeAllIC2Recipes();
+                    GTModHandler.removeAllIC2Recipes();
                 }
             }
             afterSomeTime++;
             if (afterSomeTime >= 100L) {
                 afterSomeTime = 0;
             }
-            for (Iterator<Map.Entry<GT_PlayedSound, Integer>> iterator = GT_Utility.sPlayedSoundMap.entrySet()
+            for (Iterator<Map.Entry<GTPlayedSound, Integer>> iterator = GTUtility.sPlayedSoundMap.entrySet()
                 .iterator(); iterator.hasNext();) {
-                Map.Entry<GT_PlayedSound, Integer> tEntry = iterator.next();
+                Map.Entry<GTPlayedSound, Integer> tEntry = iterator.next();
                 if (tEntry.getValue() < 0) {
                     iterator.remove();
                 } else {
                     tEntry.setValue(tEntry.getValue() - 1);
                 }
             }
-            if (!GregTech_API.mServerStarted) GregTech_API.mServerStarted = true;
+            if (!GregTechAPI.mServerStarted) GregTechAPI.mServerStarted = true;
         }
     }
 
     @SubscribeEvent
     public void onConfigChange(ConfigChangedEvent.OnConfigChangedEvent e) {
-        if (GregTech.ID.equals(e.modID) && "client".equals(e.configID)) {
+        if (GregTech.ID.equals(e.modID) && "kekztech/client".equals(e.configID)) {
             // refresh client preference and send to server, since it's the only config we allow changing at runtime.
-            mPreference = new GT_ClientPreference();
-            GT_PreLoad.loadClientConfig();
-            if (e.isWorldRunning) GT_Values.NW.sendToServer(new GT_Packet_ClientPreference(mPreference));
+            mPreference = new GTClientPreference();
+            GTPreLoad.loadClientConfig();
+            if (e.isWorldRunning) GTValues.NW.sendToServer(new GTPacketClientPreference(mPreference));
         }
     }
 
@@ -790,17 +790,17 @@ public class GT_Client extends GT_Proxy implements Runnable {
         final TileEntity aTileEntity = aEvent.player.worldObj
             .getTileEntity(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ);
 
-        if (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWrenchList)) {
+        if (GTUtility.isStackInList(aEvent.currentItem, GregTechAPI.sWrenchList)) {
             if (aTileEntity instanceof ITurnable || ROTATABLE_VANILLA_BLOCKS.contains(aBlock)
                 || aTileEntity instanceof IWrenchable
                 || (aTileEntity instanceof IOrientable orientable && orientable.canBeRotated())
-                || (aBlock instanceof GT_Block_FrameBox)) drawGrid(aEvent, false, true, aEvent.player.isSneaking());
+                || (aBlock instanceof BlockFrameBox)) drawGrid(aEvent, false, true, aEvent.player.isSneaking());
             return;
         }
 
         // If there is no tile entity and the block is a frame box block, still draw the grid if a cover is held
-        if (aTileEntity == null && aBlock instanceof GT_Block_FrameBox) {
-            if (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCovers.keySet())) {
+        if (aTileEntity == null && aBlock instanceof BlockFrameBox) {
+            if (GTUtility.isStackInList(aEvent.currentItem, GregTechAPI.sCovers.keySet())) {
                 drawGrid(aEvent, true, false, aEvent.player.isSneaking());
             }
             return;
@@ -810,15 +810,15 @@ public class GT_Client extends GT_Proxy implements Runnable {
 
         if (aEvent.player.isSneaking() && aTileEntity instanceof IGregTechTileEntity gtEntity
             && gtEntity.getMetaTileEntity() instanceof MetaPipeEntity) {
-            if (aEvent.currentItem != null && aEvent.currentItem.getItem() instanceof GT_Item_Machines
-                && GregTech_API.METATILEENTITIES[aEvent.currentItem.getItemDamage()] instanceof MetaPipeEntity) {
+            if (aEvent.currentItem != null && aEvent.currentItem.getItem() instanceof ItemMachines
+                && GregTechAPI.METATILEENTITIES[aEvent.currentItem.getItemDamage()] instanceof MetaPipeEntity) {
                 drawGrid(aEvent, false, false, false);
             }
         }
 
-        if (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWireCutterList)
-            || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList)
-            || (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSoftHammerList)
+        if (GTUtility.isStackInList(aEvent.currentItem, GregTechAPI.sWireCutterList)
+            || GTUtility.isStackInList(aEvent.currentItem, GregTechAPI.sSolderingToolList)
+            || (GTUtility.isStackInList(aEvent.currentItem, GregTechAPI.sSoftHammerList)
                 && aTileEntity instanceof MultiBlockPart) && aEvent.player.isSneaking()) {
             if (((ICoverable) aTileEntity).getCoverIDAtSide(ForgeDirection.getOrientation(aEvent.target.sideHit)) == 0)
                 drawGrid(aEvent, false, false, aEvent.player.isSneaking());
@@ -826,8 +826,8 @@ public class GT_Client extends GT_Proxy implements Runnable {
         }
 
         if ((aEvent.currentItem == null && aEvent.player.isSneaking())
-            || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCrowbarList)
-            || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sScrewdriverList)) {
+            || GTUtility.isStackInList(aEvent.currentItem, GregTechAPI.sCrowbarList)
+            || GTUtility.isStackInList(aEvent.currentItem, GregTechAPI.sScrewdriverList)) {
             if (((ICoverable) aTileEntity).getCoverIDAtSide(ForgeDirection.getOrientation(aEvent.target.sideHit)) == 0)
                 for (final ForgeDirection tSide : ForgeDirection.VALID_DIRECTIONS) {
                     if (((ICoverable) aTileEntity).getCoverIDAtSide(tSide) > 0) {
@@ -838,12 +838,12 @@ public class GT_Client extends GT_Proxy implements Runnable {
             return;
         }
 
-        if (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCovers.keySet())) {
+        if (GTUtility.isStackInList(aEvent.currentItem, GregTechAPI.sCovers.keySet())) {
             if (((ICoverable) aTileEntity).getCoverIDAtSide(ForgeDirection.getOrientation(aEvent.target.sideHit)) == 0)
                 drawGrid(aEvent, true, false, aEvent.player.isSneaking());
         }
 
-        if (GT_Utility.areStacksEqual(ItemList.Tool_Cover_Copy_Paste.get(1), aEvent.currentItem, true)) {
+        if (GTUtility.areStacksEqual(ItemList.Tool_Cover_Copy_Paste.get(1), aEvent.currentItem, true)) {
             if (((ICoverable) aTileEntity).getCoverIDAtSide(ForgeDirection.getOrientation(aEvent.target.sideHit)) == 0)
                 drawGrid(aEvent, true, false, aEvent.player.isSneaking());
         }
@@ -851,7 +851,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
 
     @SubscribeEvent
     public void receiveRenderEvent(net.minecraftforge.client.event.RenderPlayerEvent.Pre aEvent) {
-        if (GT_Utility.getFullInvisibility(aEvent.entityPlayer)) {
+        if (GTUtility.getFullInvisibility(aEvent.entityPlayer)) {
             aEvent.setCanceled(true);
         }
     }
@@ -866,7 +866,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
     @SubscribeEvent
     public void onClientTickEvent(cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent aEvent) {
         if (aEvent.phase == cpw.mods.fml.common.gameevent.TickEvent.Phase.END) {
-            GT_MusicSystem.ClientSystem.tick();
+            GTMusicSystem.ClientSystem.tick();
 
             if (changeDetected > 0) changeDetected--;
             final int newHideValue = shouldHeldItemHideThings();
@@ -964,13 +964,13 @@ public class GT_Client extends GT_Proxy implements Runnable {
 
     @Override
     public void doSonictronSound(ItemStack aStack, World aWorld, double aX, double aY, double aZ) {
-        if (GT_Utility.isStackInvalid(aStack)) return;
+        if (GTUtility.isStackInvalid(aStack)) return;
         String tString = SoundResource.NOTE_HARP.toString();
         int i = 0;
         int j = mSoundItems.size();
         do {
             if (i >= j) break;
-            if (GT_Utility.areStacksEqual(mSoundItems.get(i), aStack)) {
+            if (GTUtility.areStacksEqual(mSoundItems.get(i), aStack)) {
                 tString = mSoundNames.get(i);
                 break;
             }
@@ -1048,16 +1048,16 @@ public class GT_Client extends GT_Proxy implements Runnable {
                     break;
                 }
             }
-            if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList)
-                || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList)
-                || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sHardHammerList)
-                || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList)
-                || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList)
-                || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)
-                || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList)
-                || GregTech_API.sCovers.containsKey(new GT_ItemStack(tCurrentItem))
-                || (tCurrentItem.getItem() instanceof GT_Item_Machines
-                    && GregTech_API.METATILEENTITIES[tCurrentItem.getItemDamage()] instanceof MetaPipeEntity
+            if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList)
+                || GTUtility.isStackInList(tCurrentItem, GregTechAPI.sScrewdriverList)
+                || GTUtility.isStackInList(tCurrentItem, GregTechAPI.sHardHammerList)
+                || GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSoftHammerList)
+                || GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWireCutterList)
+                || GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList)
+                || GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCrowbarList)
+                || GregTechAPI.sCovers.containsKey(new GTItemStack(tCurrentItem))
+                || (tCurrentItem.getItem() instanceof ItemMachines
+                    && GregTechAPI.METATILEENTITIES[tCurrentItem.getItemDamage()] instanceof MetaPipeEntity
                     && player.isSneaking())) {
                 hide |= 0x2;
             }
diff --git a/src/main/java/gregtech/common/GT_DummyWorld.java b/src/main/java/gregtech/common/GTDummyWorld.java
index d394ad3703..733db0818c 100644
--- a/src/main/java/gregtech/common/GT_DummyWorld.java
+++ b/src/main/java/gregtech/common/GTDummyWorld.java
@@ -18,18 +18,18 @@ import net.minecraft.world.storage.IPlayerFileData;
 import net.minecraft.world.storage.ISaveHandler;
 import net.minecraft.world.storage.WorldInfo;
 
-public class GT_DummyWorld extends World {
+public class GTDummyWorld extends World {
 
-    public GT_IteratorRandom mRandom = new GT_IteratorRandom();
+    public GTIteratorRandom mRandom = new GTIteratorRandom();
     public ItemStack mLastSetBlock = null;
 
-    public GT_DummyWorld(ISaveHandler saveHandler, String name, WorldProvider worldProvider,
-        WorldSettings worldSettings, Profiler profiler) {
+    public GTDummyWorld(ISaveHandler saveHandler, String name, WorldProvider worldProvider, WorldSettings worldSettings,
+        Profiler profiler) {
         super(saveHandler, name, worldSettings, worldProvider, profiler);
         this.rand = this.mRandom;
     }
 
-    public GT_DummyWorld() {
+    public GTDummyWorld() {
         this(new ISaveHandler() {
 
             @Override
diff --git a/src/main/java/gregtech/common/GT_IteratorRandom.java b/src/main/java/gregtech/common/GTIteratorRandom.java
index addce0a456..1b14e5b8ff 100644
--- a/src/main/java/gregtech/common/GT_IteratorRandom.java
+++ b/src/main/java/gregtech/common/GTIteratorRandom.java
@@ -2,7 +2,7 @@ package gregtech.common;
 
 import java.util.Random;
 
-public class GT_IteratorRandom extends Random {
+public class GTIteratorRandom extends Random {
 
     private static final long serialVersionUID = 1L;
     public int mIterationStep = 2147483647;
diff --git a/src/main/java/gregtech/common/GT_Network.java b/src/main/java/gregtech/common/GTNetwork.java
index bf5826e9ae..30aaecc6cb 100644
--- a/src/main/java/gregtech/common/GT_Network.java
+++ b/src/main/java/gregtech/common/GTNetwork.java
@@ -1,6 +1,6 @@
 package gregtech.common;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import java.util.EnumMap;
 import java.util.List;
@@ -18,10 +18,10 @@ import cpw.mods.fml.common.network.FMLOutboundHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 import cpw.mods.fml.relauncher.Side;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.net.GT_Packet;
-import gregtech.api.net.GT_PacketTypes;
-import gregtech.api.net.GT_Packet_New;
+import gregtech.api.enums.GTValues;
+import gregtech.api.net.GTPacket;
+import gregtech.api.net.GTPacketNew;
+import gregtech.api.net.GTPacketTypes;
 import gregtech.api.net.IGT_NetworkHandler;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -32,20 +32,20 @@ import io.netty.handler.codec.MessageToMessageCodec;
 
 @ChannelHandler.Sharable
 @SuppressWarnings("deprecation")
-public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet> implements IGT_NetworkHandler {
+public class GTNetwork extends MessageToMessageCodec<FMLProxyPacket, GTPacket> implements IGT_NetworkHandler {
 
     private final EnumMap<Side, FMLEmbeddedChannel> mChannel;
-    private final GT_Packet[] mSubChannels;
+    private final GTPacket[] mSubChannels;
 
-    public GT_Network() {
-        this("GregTech", GT_PacketTypes.referencePackets());
+    public GTNetwork() {
+        this("GregTech", GTPacketTypes.referencePackets());
     }
 
-    public GT_Network(String channelName, GT_Packet_New... packetTypes) {
+    public GTNetwork(String channelName, GTPacketNew... packetTypes) {
         this.mChannel = NetworkRegistry.INSTANCE.newChannel(channelName, this, new HandlerShared());
         final int lastPId = packetTypes[packetTypes.length - 1].getPacketID();
-        this.mSubChannels = new GT_Packet[lastPId + 1];
-        for (GT_Packet packetType : packetTypes) {
+        this.mSubChannels = new GTPacket[lastPId + 1];
+        for (GTPacket packetType : packetTypes) {
             final int pId = packetType.getPacketID();
             if (this.mSubChannels[pId] == null) this.mSubChannels[pId] = packetType;
             else throw new IllegalArgumentException("Duplicate Packet ID! " + pId);
@@ -53,7 +53,7 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet>
     }
 
     @Override
-    protected void encode(ChannelHandlerContext aContext, GT_Packet aPacket, List<Object> aOutput) {
+    protected void encode(ChannelHandlerContext aContext, GTPacket aPacket, List<Object> aOutput) {
         final ByteBuf tBuf = Unpooled.buffer()
             .writeByte(aPacket.getPacketID());
         aPacket.encode(tBuf);
@@ -70,13 +70,13 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet>
         final ByteArrayDataInput aData = ByteStreams.newDataInput(
             aPacket.payload()
                 .array());
-        final GT_Packet tPacket = this.mSubChannels[aData.readByte()].decode(aData);
+        final GTPacket tPacket = this.mSubChannels[aData.readByte()].decode(aData);
         tPacket.setINetHandler(aPacket.handler());
         aOutput.add(tPacket);
     }
 
     @Override
-    public void sendToPlayer(GT_Packet aPacket, EntityPlayerMP aPlayer) {
+    public void sendToPlayer(GTPacket aPacket, EntityPlayerMP aPlayer) {
         if (aPacket == null) {
             GT_FML_LOGGER.info("packet null");
             return;
@@ -96,7 +96,7 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet>
     }
 
     @Override
-    public void sendToAllAround(GT_Packet aPacket, NetworkRegistry.TargetPoint aPosition) {
+    public void sendToAllAround(GTPacket aPacket, NetworkRegistry.TargetPoint aPosition) {
         this.mChannel.get(Side.SERVER)
             .attr(FMLOutboundHandler.FML_MESSAGETARGET)
             .set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT);
@@ -108,7 +108,7 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet>
     }
 
     @Override
-    public void sendToAll(GT_Packet aPacket) {
+    public void sendToAll(GTPacket aPacket) {
         this.mChannel.get(Side.SERVER)
             .attr(FMLOutboundHandler.FML_MESSAGETARGET)
             .set(FMLOutboundHandler.OutboundTarget.ALL);
@@ -117,7 +117,7 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet>
     }
 
     @Override
-    public void sendToServer(GT_Packet aPacket) {
+    public void sendToServer(GTPacket aPacket) {
         this.mChannel.get(Side.CLIENT)
             .attr(FMLOutboundHandler.FML_MESSAGETARGET)
             .set(FMLOutboundHandler.OutboundTarget.TOSERVER);
@@ -126,7 +126,7 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet>
     }
 
     @Override
-    public void sendPacketToAllPlayersInRange(World aWorld, GT_Packet aPacket, int aX, int aZ) {
+    public void sendPacketToAllPlayersInRange(World aWorld, GTPacket aPacket, int aX, int aZ) {
         if (!aWorld.isRemote) {
             for (Object tObject : aWorld.playerEntities) {
                 if (!(tObject instanceof EntityPlayerMP tPlayer)) {
@@ -143,11 +143,11 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet>
     }
 
     @ChannelHandler.Sharable
-    static final class HandlerShared extends SimpleChannelInboundHandler<GT_Packet> {
+    static final class HandlerShared extends SimpleChannelInboundHandler<GTPacket> {
 
         @Override
-        protected void channelRead0(ChannelHandlerContext ctx, GT_Packet aPacket) {
-            final EntityPlayer aPlayer = GT_Values.GT.getThePlayer();
+        protected void channelRead0(ChannelHandlerContext ctx, GTPacket aPacket) {
+            final EntityPlayer aPlayer = GTValues.GT.getThePlayer();
             aPacket.process(aPlayer == null ? null : aPlayer.worldObj);
         }
     }
diff --git a/src/main/java/gregtech/common/GT_PlayerActivityLogger.java b/src/main/java/gregtech/common/GTPlayerActivityLogger.java
index c60378ca5e..7bd5ba508e 100644
--- a/src/main/java/gregtech/common/GT_PlayerActivityLogger.java
+++ b/src/main/java/gregtech/common/GTPlayerActivityLogger.java
@@ -2,26 +2,26 @@ package gregtech.common;
 
 import java.util.ArrayList;
 
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_Log;
+import gregtech.GTMod;
+import gregtech.api.util.GTLog;
 
-public class GT_PlayerActivityLogger implements Runnable {
+public class GTPlayerActivityLogger implements Runnable {
 
     @Override
     public void run() {
         try {
             ArrayList<String> buffer = new ArrayList<>();
             for (;;) {
-                if (GT_Log.pal == null) {
+                if (GTLog.pal == null) {
                     return;
                 }
                 String tLastOutput = "";
                 // Block on first element for efficiency
-                buffer.add(GT_Mod.gregtechproxy.mBufferedPlayerActivity.take());
-                GT_Mod.gregtechproxy.mBufferedPlayerActivity.drainTo(buffer);
+                buffer.add(GTMod.gregtechproxy.mBufferedPlayerActivity.take());
+                GTMod.gregtechproxy.mBufferedPlayerActivity.drainTo(buffer);
                 for (String output : buffer) {
                     if (!output.equals(tLastOutput)) {
-                        GT_Log.pal.println(output);
+                        GTLog.pal.println(output);
                         tLastOutput = output;
                     }
                 }
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GTProxy.java
index 40fa1d1548..d12c2bbe61 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GTProxy.java
@@ -1,12 +1,12 @@
 package gregtech.common;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 import static gregtech.api.enums.FluidState.GAS;
 import static gregtech.api.enums.FluidState.LIQUID;
 import static gregtech.api.enums.FluidState.MOLTEN;
 import static gregtech.api.enums.FluidState.PLASMA;
-import static gregtech.api.enums.GT_Values.W;
-import static gregtech.api.enums.GT_Values.debugEntityCramming;
+import static gregtech.api.enums.GTValues.W;
+import static gregtech.api.enums.GTValues.debugEntityCramming;
 import static gregtech.api.enums.Mods.AdvancedSolarPanel;
 import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.enums.Mods.Avaritia;
@@ -32,8 +32,8 @@ import static gregtech.api.enums.Mods.TwilightForest;
 import static gregtech.api.enums.Mods.WitchingGadgets;
 import static gregtech.api.recipe.RecipeMaps.crackingRecipes;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_Util.LAST_BROKEN_TILEENTITY;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTUtil.LAST_BROKEN_TILEENTITY;
 import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 
 import java.io.File;
@@ -117,11 +117,11 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.network.FMLNetworkEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.FluidState;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.ManualOreDictTweaks;
 import gregtech.api.enums.Materials;
@@ -129,51 +129,52 @@ import gregtech.api.enums.OreDictNames;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.SubTag;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.enums.TCAspects.TC_AspectStack;
 import gregtech.api.enums.TierEU;
 import gregtech.api.enums.ToolDictNames;
-import gregtech.api.fluid.GT_FluidFactory;
+import gregtech.api.fluid.GTFluidFactory;
 import gregtech.api.interfaces.IBlockOnWalkOver;
 import gregtech.api.interfaces.IProjectileItem;
 import gregtech.api.interfaces.IToolStats;
-import gregtech.api.interfaces.internal.IGT_Mod;
+import gregtech.api.interfaces.internal.IGTMod;
 import gregtech.api.interfaces.internal.IThaumcraftCompat;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.net.GT_Packet_MusicSystemData;
-import gregtech.api.objects.GT_ChunkManager;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_UO_DimensionList;
+import gregtech.api.items.MetaGeneratedItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.net.GTPacketMusicSystemData;
+import gregtech.api.objects.GTChunkManager;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTUODimensionList;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeCategory;
 import gregtech.api.recipe.RecipeCategorySetting;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_BlockMap;
-import gregtech.api.util.GT_CLS_Compat;
-import gregtech.api.util.GT_ChunkAssociatedData;
-import gregtech.api.util.GT_ClientPreference;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_MusicSystem;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeRegistrator;
-import gregtech.api.util.GT_Shaped_Recipe;
-import gregtech.api.util.GT_Shapeless_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTBlockMap;
+import gregtech.api.util.GTCLSCompat;
+import gregtech.api.util.GTChunkAssociatedData;
+import gregtech.api.util.GTClientPreference;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTMusicSystem;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeRegistrator;
+import gregtech.api.util.GTShapedRecipe;
+import gregtech.api.util.GTShapelessRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder;
 import gregtech.common.config.opstuff.ConfigGeneral;
-import gregtech.common.items.GT_MetaGenerated_Item_98;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.ID_MetaTool_01;
+import gregtech.common.items.IDMetaTool01;
+import gregtech.common.items.MetaGeneratedItem98;
+import gregtech.common.items.MetaGeneratedTool01;
 import gregtech.common.misc.GlobalEnergyWorldSavedData;
 import gregtech.common.misc.GlobalMetricsCoverDatabase;
 import gregtech.common.misc.spaceprojects.SpaceProjectWorldSavedData;
-import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_DroneCentre;
+import gregtech.common.tileentities.machines.multi.drone.MTEDroneCentre;
+import gregtech.nei.GTNEIDefaultHandler;
 
-public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
+public abstract class GTProxy implements IGTMod, IFuelHandler {
 
     private static final EnumSet<OreGenEvent.GenerateMinable.EventType> PREVENTED_ORES = EnumSet.of(
         OreGenEvent.GenerateMinable.EventType.COAL,
@@ -539,7 +540,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             "infusedteslatiteBundled"));
     private final DateFormat mDateFormat = DateFormat.getInstance();
     public final BlockingQueue<String> mBufferedPlayerActivity = new LinkedBlockingQueue<>();
-    public final GT_BlockMap<Boolean> mCTMBlockCache = new GT_BlockMap<>();
+    public final GTBlockMap<Boolean> mCTMBlockCache = new GTBlockMap<>();
     public boolean mDisableVanillaOres = true;
     public boolean mAllowSmallBoilerAutomation = false;
     public boolean mCraftingUnification = true;
@@ -594,7 +595,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public double[] mPollutionDieselGeneratorReleasedByTier = new double[] { 0.1, 1.0, 0.9, 0.8 };
     public int mPollutionBaseGasTurbinePerSecond = 200;
     public double[] mPollutionGasTurbineReleasedByTier = new double[] { 0.1, 1.0, 0.9, 0.8, 0.7, 0.6 };
-    public final GT_UO_DimensionList mUndergroundOil = new GT_UO_DimensionList();
+    public final GTUODimensionList mUndergroundOil = new GTUODimensionList();
     public boolean enableUndergroundGravelGen = true;
     public boolean enableUndergroundDirtGen = true;
     public int mTicksUntilNextCraftSound = 0;
@@ -738,7 +739,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     // Locking
     public static ReentrantLock TICK_LOCK = new ReentrantLock();
 
-    private final ConcurrentMap<UUID, GT_ClientPreference> mClientPrefernces = new ConcurrentHashMap<>();
+    private final ConcurrentMap<UUID, GTClientPreference> mClientPrefernces = new ConcurrentHashMap<>();
 
     static {
         oreDictBurnTimes.put("dustTinyWood", 11);
@@ -793,15 +794,15 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         oreDictBurnTimes.put("dustTinyDiamond", 11378);
     }
 
-    public GT_Proxy() {
+    public GTProxy() {
         GameRegistry.registerFuelHandler(this);
         MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.ORE_GEN_BUS.register(this);
         FMLCommonHandler.instance()
             .bus()
             .register(this);
-        GregTech_API.sThaumcraftCompat = (IThaumcraftCompat) GT_Utility
-            .callConstructor("gregtech.common.GT_ThaumcraftCompat", 0, null, GT_Values.D1, new Object[0]);
+        GregTechAPI.sThaumcraftCompat = (IThaumcraftCompat) GTUtility
+            .callConstructor("gregtech.common.GT_ThaumcraftCompat", 0, null, GTValues.D1, new Object[0]);
         for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry
             .getRegisteredFluidContainerData()) {
             onFluidContainerRegistration(new FluidContainerRegistry.FluidContainerRegisterEvent(tData));
@@ -815,15 +816,15 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 }
             }
         } catch (Throwable e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
     }
 
     public void onPreLoad() {
-        GT_Log.out.println("GT_Mod: Preload-Phase started!");
-        GT_Log.ore.println("GT_Mod: Preload-Phase started!");
+        GTLog.out.println("GTMod: Preload-Phase started!");
+        GTLog.ore.println("GTMod: Preload-Phase started!");
 
-        GregTech_API.sPreloadStarted = true;
+        GregTechAPI.sPreloadStarted = true;
         this.mIgnoreTcon = ConfigGeneral.ignoreTinkerConstruct;
         this.replicatorExponent = ConfigGeneral.replicatorExponent;
         for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry
@@ -833,127 +834,126 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 break;
             }
         }
-        GT_Log.out.println("GT_Mod: Getting required Items of other Mods.");
-
-        ItemList.RC_ShuntingWire.set(GT_ModHandler.getModItem(Railcraft.ID, "machine.delta", 1L, 0));
-        ItemList.RC_ShuntingWireFrame.set(GT_ModHandler.getModItem(Railcraft.ID, "frame", 1L, 0));
-        ItemList.RC_Rail_Standard.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 0));
-        ItemList.RC_Rail_Adv.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 1));
-        ItemList.RC_Rail_Wooden.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 2));
-        ItemList.RC_Rail_HS.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 3));
-        ItemList.RC_Rail_Reinforced.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 4));
-        ItemList.RC_Rail_Electric.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 5));
-        ItemList.RC_Tie_Wood.set(GT_ModHandler.getModItem(Railcraft.ID, "part.tie", 1L, 0));
-        ItemList.RC_Tie_Stone.set(GT_ModHandler.getModItem(Railcraft.ID, "part.tie", 1L, 1));
-        ItemList.RC_Bed_Wood.set(GT_ModHandler.getModItem(Railcraft.ID, "part.railbed", 1L, 0));
-        ItemList.RC_Bed_Stone.set(GT_ModHandler.getModItem(Railcraft.ID, "part.railbed", 1L, 1));
-        ItemList.RC_Rebar.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rebar", 1L));
-        ItemList.TC_Thaumometer.set(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemThaumometer", 1L, 0));
-        ItemList.Tool_Sword_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.sword", 1L));
-        ItemList.Tool_Pickaxe_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.pickaxe", 1L));
-        ItemList.Tool_Shovel_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.shovel", 1L));
-        ItemList.Tool_Axe_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.axe", 1L));
-        ItemList.Tool_Hoe_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.hoe", 1L));
-
-        ItemList.TF_LiveRoot.set(GT_ModHandler.getModItem(TwilightForest.ID, "item.liveRoot", 1L, 0));
-        ItemList.TF_Vial_FieryBlood.set(GT_ModHandler.getModItem(TwilightForest.ID, "item.fieryBlood", 1L));
-        ItemList.TF_Vial_FieryTears.set(GT_ModHandler.getModItem(TwilightForest.ID, "item.fieryTears", 1L));
-
-        ItemList.FR_Lemon.set(GT_ModHandler.getModItem(Forestry.ID, "fruits", 1L, 3));
-        ItemList.FR_Mulch.set(GT_ModHandler.getModItem(Forestry.ID, "mulch", 1L));
-        ItemList.FR_Fertilizer.set(GT_ModHandler.getModItem(Forestry.ID, "fertilizerCompound", 1L));
-        ItemList.FR_Compost.set(GT_ModHandler.getModItem(Forestry.ID, "fertilizerBio", 1L));
-        ItemList.FR_Silk.set(GT_ModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 2));
-        ItemList.FR_Wax.set(GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L));
-        ItemList.FR_WaxCapsule.set(GT_ModHandler.getModItem(Forestry.ID, "waxCapsule", 1L));
-        ItemList.FR_RefractoryWax.set(GT_ModHandler.getModItem(Forestry.ID, "refractoryWax", 1L));
-        ItemList.FR_RefractoryCapsule.set(GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1L));
-        ItemList.FR_Bee_Drone.set(GT_ModHandler.getModItem(Forestry.ID, "beeDroneGE", 1L));
-        ItemList.FR_Bee_Princess.set(GT_ModHandler.getModItem(Forestry.ID, "beePrincessGE", 1L));
-        ItemList.FR_Bee_Queen.set(GT_ModHandler.getModItem(Forestry.ID, "beeQueenGE", 1L));
+        GTLog.out.println("GTMod: Getting required Items of other Mods.");
+
+        ItemList.RC_ShuntingWire.set(GTModHandler.getModItem(Railcraft.ID, "machine.delta", 1L, 0));
+        ItemList.RC_ShuntingWireFrame.set(GTModHandler.getModItem(Railcraft.ID, "frame", 1L, 0));
+        ItemList.RC_Rail_Standard.set(GTModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 0));
+        ItemList.RC_Rail_Adv.set(GTModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 1));
+        ItemList.RC_Rail_Wooden.set(GTModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 2));
+        ItemList.RC_Rail_HS.set(GTModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 3));
+        ItemList.RC_Rail_Reinforced.set(GTModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 4));
+        ItemList.RC_Rail_Electric.set(GTModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 5));
+        ItemList.RC_Tie_Wood.set(GTModHandler.getModItem(Railcraft.ID, "part.tie", 1L, 0));
+        ItemList.RC_Tie_Stone.set(GTModHandler.getModItem(Railcraft.ID, "part.tie", 1L, 1));
+        ItemList.RC_Bed_Wood.set(GTModHandler.getModItem(Railcraft.ID, "part.railbed", 1L, 0));
+        ItemList.RC_Bed_Stone.set(GTModHandler.getModItem(Railcraft.ID, "part.railbed", 1L, 1));
+        ItemList.RC_Rebar.set(GTModHandler.getModItem(Railcraft.ID, "part.rebar", 1L));
+        ItemList.TC_Thaumometer.set(GTModHandler.getModItem(Thaumcraft.ID, "ItemThaumometer", 1L, 0));
+        ItemList.Tool_Sword_Steel.set(GTModHandler.getModItem(Railcraft.ID, "tool.steel.sword", 1L));
+        ItemList.Tool_Pickaxe_Steel.set(GTModHandler.getModItem(Railcraft.ID, "tool.steel.pickaxe", 1L));
+        ItemList.Tool_Shovel_Steel.set(GTModHandler.getModItem(Railcraft.ID, "tool.steel.shovel", 1L));
+        ItemList.Tool_Axe_Steel.set(GTModHandler.getModItem(Railcraft.ID, "tool.steel.axe", 1L));
+        ItemList.Tool_Hoe_Steel.set(GTModHandler.getModItem(Railcraft.ID, "tool.steel.hoe", 1L));
+
+        ItemList.TF_LiveRoot.set(GTModHandler.getModItem(TwilightForest.ID, "item.liveRoot", 1L, 0));
+        ItemList.TF_Vial_FieryBlood.set(GTModHandler.getModItem(TwilightForest.ID, "item.fieryBlood", 1L));
+        ItemList.TF_Vial_FieryTears.set(GTModHandler.getModItem(TwilightForest.ID, "item.fieryTears", 1L));
+
+        ItemList.FR_Lemon.set(GTModHandler.getModItem(Forestry.ID, "fruits", 1L, 3));
+        ItemList.FR_Mulch.set(GTModHandler.getModItem(Forestry.ID, "mulch", 1L));
+        ItemList.FR_Fertilizer.set(GTModHandler.getModItem(Forestry.ID, "fertilizerCompound", 1L));
+        ItemList.FR_Compost.set(GTModHandler.getModItem(Forestry.ID, "fertilizerBio", 1L));
+        ItemList.FR_Silk.set(GTModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 2));
+        ItemList.FR_Wax.set(GTModHandler.getModItem(Forestry.ID, "beeswax", 1L));
+        ItemList.FR_WaxCapsule.set(GTModHandler.getModItem(Forestry.ID, "waxCapsule", 1L));
+        ItemList.FR_RefractoryWax.set(GTModHandler.getModItem(Forestry.ID, "refractoryWax", 1L));
+        ItemList.FR_RefractoryCapsule.set(GTModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1L));
+        ItemList.FR_Bee_Drone.set(GTModHandler.getModItem(Forestry.ID, "beeDroneGE", 1L));
+        ItemList.FR_Bee_Princess.set(GTModHandler.getModItem(Forestry.ID, "beePrincessGE", 1L));
+        ItemList.FR_Bee_Queen.set(GTModHandler.getModItem(Forestry.ID, "beeQueenGE", 1L));
         ItemList.FR_Tree_Sapling.set(
-            GT_ModHandler
-                .getModItem(Forestry.ID, "sapling", 1L, GT_ModHandler.getModItem(Forestry.ID, "saplingGE", 1L)));
-        ItemList.FR_Butterfly.set(GT_ModHandler.getModItem(Forestry.ID, "butterflyGE", 1L));
-        ItemList.FR_Larvae.set(GT_ModHandler.getModItem(Forestry.ID, "beeLarvaeGE", 1L));
-        ItemList.FR_Serum.set(GT_ModHandler.getModItem(Forestry.ID, "serumGE", 1L));
-        ItemList.FR_Caterpillar.set(GT_ModHandler.getModItem(Forestry.ID, "caterpillarGE", 1L));
-        ItemList.FR_PollenFertile.set(GT_ModHandler.getModItem(Forestry.ID, "pollenFertile", 1L));
-        ItemList.FR_Stick.set(GT_ModHandler.getModItem(Forestry.ID, "oakStick", 1L));
-        ItemList.FR_Casing_Impregnated.set(GT_ModHandler.getModItem(Forestry.ID, "impregnatedCasing", 1L));
-        ItemList.FR_Casing_Sturdy.set(GT_ModHandler.getModItem(Forestry.ID, "sturdyMachine", 1L));
-        ItemList.FR_Casing_Hardened.set(GT_ModHandler.getModItem(Forestry.ID, "hardenedMachine", 1L));
+            GTModHandler.getModItem(Forestry.ID, "sapling", 1L, GTModHandler.getModItem(Forestry.ID, "saplingGE", 1L)));
+        ItemList.FR_Butterfly.set(GTModHandler.getModItem(Forestry.ID, "butterflyGE", 1L));
+        ItemList.FR_Larvae.set(GTModHandler.getModItem(Forestry.ID, "beeLarvaeGE", 1L));
+        ItemList.FR_Serum.set(GTModHandler.getModItem(Forestry.ID, "serumGE", 1L));
+        ItemList.FR_Caterpillar.set(GTModHandler.getModItem(Forestry.ID, "caterpillarGE", 1L));
+        ItemList.FR_PollenFertile.set(GTModHandler.getModItem(Forestry.ID, "pollenFertile", 1L));
+        ItemList.FR_Stick.set(GTModHandler.getModItem(Forestry.ID, "oakStick", 1L));
+        ItemList.FR_Casing_Impregnated.set(GTModHandler.getModItem(Forestry.ID, "impregnatedCasing", 1L));
+        ItemList.FR_Casing_Sturdy.set(GTModHandler.getModItem(Forestry.ID, "sturdyMachine", 1L));
+        ItemList.FR_Casing_Hardened.set(GTModHandler.getModItem(Forestry.ID, "hardenedMachine", 1L));
 
         ItemList.Bottle_Empty.set(new ItemStack(Items.glass_bottle, 1));
 
-        ItemList.Cell_Universal_Fluid.set(GT_ModHandler.getIC2Item("FluidCell", 1L));
+        ItemList.Cell_Universal_Fluid.set(GTModHandler.getIC2Item("FluidCell", 1L));
         ItemList.Cell_Empty.set(
-            GT_ModHandler.getIC2Item(
+            GTModHandler.getIC2Item(
                 "cell",
                 1L,
-                GT_ModHandler.getIC2Item("cellEmpty", 1L, GT_ModHandler.getIC2Item("emptyCell", 1L))));
-        ItemList.Cell_Water.set(GT_ModHandler.getIC2Item("waterCell", 1L, GT_ModHandler.getIC2Item("cellWater", 1L)));
-        ItemList.Cell_Lava.set(GT_ModHandler.getIC2Item("lavaCell", 1L, GT_ModHandler.getIC2Item("cellLava", 1L)));
+                GTModHandler.getIC2Item("cellEmpty", 1L, GTModHandler.getIC2Item("emptyCell", 1L))));
+        ItemList.Cell_Water.set(GTModHandler.getIC2Item("waterCell", 1L, GTModHandler.getIC2Item("cellWater", 1L)));
+        ItemList.Cell_Lava.set(GTModHandler.getIC2Item("lavaCell", 1L, GTModHandler.getIC2Item("cellLava", 1L)));
         ItemList.Cell_Air.set(
-            GT_ModHandler.getIC2Item(
+            GTModHandler.getIC2Item(
                 "airCell",
                 1L,
-                GT_ModHandler.getIC2Item("cellAir", 1L, GT_ModHandler.getIC2Item("cellOxygen", 1L))));
-
-        ItemList.IC2_Item_Casing_Iron.set(GT_ModHandler.getIC2Item("casingiron", 1L));
-        ItemList.IC2_Item_Casing_Gold.set(GT_ModHandler.getIC2Item("casinggold", 1L));
-        ItemList.IC2_Item_Casing_Bronze.set(GT_ModHandler.getIC2Item("casingbronze", 1L));
-        ItemList.IC2_Item_Casing_Copper.set(GT_ModHandler.getIC2Item("casingcopper", 1L));
-        ItemList.IC2_Item_Casing_Tin.set(GT_ModHandler.getIC2Item("casingtin", 1L));
-        ItemList.IC2_Item_Casing_Lead.set(GT_ModHandler.getIC2Item("casinglead", 1L));
-        ItemList.IC2_Item_Casing_Steel.set(GT_ModHandler.getIC2Item("casingadviron", 1L));
-        ItemList.IC2_Spray_WeedEx.set(GT_ModHandler.getIC2Item("weedEx", 1L));
-        ItemList.IC2_Mixed_Metal_Ingot.set(GT_ModHandler.getIC2Item("mixedMetalIngot", 1L));
-        ItemList.IC2_Fertilizer.set(GT_ModHandler.getIC2Item("fertilizer", 1L));
-        ItemList.IC2_CoffeeBeans.set(GT_ModHandler.getIC2Item("coffeeBeans", 1L));
-        ItemList.IC2_CoffeePowder.set(GT_ModHandler.getIC2Item("coffeePowder", 1L));
-        ItemList.IC2_Hops.set(GT_ModHandler.getIC2Item("hops", 1L));
-        ItemList.IC2_Resin.set(GT_ModHandler.getIC2Item("resin", 1L));
-        ItemList.IC2_Plantball.set(GT_ModHandler.getIC2Item("plantBall", 1L));
+                GTModHandler.getIC2Item("cellAir", 1L, GTModHandler.getIC2Item("cellOxygen", 1L))));
+
+        ItemList.IC2_Item_Casing_Iron.set(GTModHandler.getIC2Item("casingiron", 1L));
+        ItemList.IC2_Item_Casing_Gold.set(GTModHandler.getIC2Item("casinggold", 1L));
+        ItemList.IC2_Item_Casing_Bronze.set(GTModHandler.getIC2Item("casingbronze", 1L));
+        ItemList.IC2_Item_Casing_Copper.set(GTModHandler.getIC2Item("casingcopper", 1L));
+        ItemList.IC2_Item_Casing_Tin.set(GTModHandler.getIC2Item("casingtin", 1L));
+        ItemList.IC2_Item_Casing_Lead.set(GTModHandler.getIC2Item("casinglead", 1L));
+        ItemList.IC2_Item_Casing_Steel.set(GTModHandler.getIC2Item("casingadviron", 1L));
+        ItemList.IC2_Spray_WeedEx.set(GTModHandler.getIC2Item("weedEx", 1L));
+        ItemList.IC2_Mixed_Metal_Ingot.set(GTModHandler.getIC2Item("mixedMetalIngot", 1L));
+        ItemList.IC2_Fertilizer.set(GTModHandler.getIC2Item("fertilizer", 1L));
+        ItemList.IC2_CoffeeBeans.set(GTModHandler.getIC2Item("coffeeBeans", 1L));
+        ItemList.IC2_CoffeePowder.set(GTModHandler.getIC2Item("coffeePowder", 1L));
+        ItemList.IC2_Hops.set(GTModHandler.getIC2Item("hops", 1L));
+        ItemList.IC2_Resin.set(GTModHandler.getIC2Item("resin", 1L));
+        ItemList.IC2_Plantball.set(GTModHandler.getIC2Item("plantBall", 1L));
         ItemList.IC2_PlantballCompressed
-            .set(GT_ModHandler.getIC2Item("compressedPlantBall", 1L, ItemList.IC2_Plantball.get(1L)));
-        ItemList.IC2_Crop_Seeds.set(GT_ModHandler.getIC2Item("cropSeed", 1L));
-        ItemList.IC2_Grin_Powder.set(GT_ModHandler.getIC2Item("grinPowder", 1L));
-        ItemList.IC2_Energium_Dust.set(GT_ModHandler.getIC2Item("energiumDust", 1L));
-        ItemList.IC2_Scrap.set(GT_ModHandler.getIC2Item("scrap", 1L));
-        ItemList.IC2_Scrapbox.set(GT_ModHandler.getIC2Item("scrapBox", 1L));
-        ItemList.IC2_Fuel_Rod_Empty.set(GT_ModHandler.getIC2Item("fuelRod", 1L));
-        ItemList.IC2_Food_Can_Empty.set(GT_ModHandler.getIC2Item("tinCan", 1L));
-        ItemList.IC2_Food_Can_Filled.set(GT_ModHandler.getIC2Item("filledTinCan", 1L, 0));
-        ItemList.IC2_Food_Can_Spoiled.set(GT_ModHandler.getIC2Item("filledTinCan", 1L, 1));
+            .set(GTModHandler.getIC2Item("compressedPlantBall", 1L, ItemList.IC2_Plantball.get(1L)));
+        ItemList.IC2_Crop_Seeds.set(GTModHandler.getIC2Item("cropSeed", 1L));
+        ItemList.IC2_Grin_Powder.set(GTModHandler.getIC2Item("grinPowder", 1L));
+        ItemList.IC2_Energium_Dust.set(GTModHandler.getIC2Item("energiumDust", 1L));
+        ItemList.IC2_Scrap.set(GTModHandler.getIC2Item("scrap", 1L));
+        ItemList.IC2_Scrapbox.set(GTModHandler.getIC2Item("scrapBox", 1L));
+        ItemList.IC2_Fuel_Rod_Empty.set(GTModHandler.getIC2Item("fuelRod", 1L));
+        ItemList.IC2_Food_Can_Empty.set(GTModHandler.getIC2Item("tinCan", 1L));
+        ItemList.IC2_Food_Can_Filled.set(GTModHandler.getIC2Item("filledTinCan", 1L, 0));
+        ItemList.IC2_Food_Can_Spoiled.set(GTModHandler.getIC2Item("filledTinCan", 1L, 1));
         ItemList.IC2_Industrial_Diamond
-            .set(GT_ModHandler.getIC2Item("industrialDiamond", 1L, new ItemStack(Items.diamond, 1)));
-        ItemList.IC2_Compressed_Coal_Ball.set(GT_ModHandler.getIC2Item("compressedCoalBall", 1L));
-        ItemList.IC2_Compressed_Coal_Chunk.set(GT_ModHandler.getIC2Item("coalChunk", 1L));
-        ItemList.IC2_ShaftIron.set(GT_ModHandler.getIC2Item("ironshaft", 1L));
-        ItemList.IC2_ShaftSteel.set(GT_ModHandler.getIC2Item("steelshaft", 1L));
-
-        ItemList.IC2_SuBattery.set(GT_ModHandler.getIC2Item("suBattery", 1L));
-        ItemList.IC2_ReBattery.set(GT_ModHandler.getIC2Item("reBattery", 1L));
-        ItemList.IC2_AdvBattery.set(GT_ModHandler.getIC2Item("advBattery", 1L));
-        ItemList.IC2_EnergyCrystal.set(GT_ModHandler.getIC2Item("energyCrystal", 1L));
-        ItemList.IC2_LapotronCrystal.set(GT_ModHandler.getIC2Item("lapotronCrystal", 1L));
-
-        ItemList.Tool_Sword_Bronze.set(GT_ModHandler.getIC2Item("bronzeSword", 1L));
-        ItemList.Tool_Pickaxe_Bronze.set(GT_ModHandler.getIC2Item("bronzePickaxe", 1L));
-        ItemList.Tool_Shovel_Bronze.set(GT_ModHandler.getIC2Item("bronzeShovel", 1L));
-        ItemList.Tool_Axe_Bronze.set(GT_ModHandler.getIC2Item("bronzeAxe", 1L));
-        ItemList.Tool_Hoe_Bronze.set(GT_ModHandler.getIC2Item("bronzeHoe", 1L));
-        ItemList.IC2_ForgeHammer.set(GT_ModHandler.getIC2Item("ForgeHammer", 1L));
-        ItemList.IC2_WireCutter.set(GT_ModHandler.getIC2Item("cutter", 1L));
-
-        ItemList.Credit_Iron.set(GT_ModHandler.getIC2Item("coin", 1L));
-
-        ItemList.Circuit_Basic.set(GT_ModHandler.getIC2Item("electronicCircuit", 1L));
-        ItemList.Circuit_Advanced.set(GT_ModHandler.getIC2Item("advancedCircuit", 1L));
-
-        ItemList.Upgrade_Overclocker.set(GT_ModHandler.getIC2Item("overclockerUpgrade", 1L));
-        ItemList.Upgrade_Battery.set(GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L));
+            .set(GTModHandler.getIC2Item("industrialDiamond", 1L, new ItemStack(Items.diamond, 1)));
+        ItemList.IC2_Compressed_Coal_Ball.set(GTModHandler.getIC2Item("compressedCoalBall", 1L));
+        ItemList.IC2_Compressed_Coal_Chunk.set(GTModHandler.getIC2Item("coalChunk", 1L));
+        ItemList.IC2_ShaftIron.set(GTModHandler.getIC2Item("ironshaft", 1L));
+        ItemList.IC2_ShaftSteel.set(GTModHandler.getIC2Item("steelshaft", 1L));
+
+        ItemList.IC2_SuBattery.set(GTModHandler.getIC2Item("suBattery", 1L));
+        ItemList.IC2_ReBattery.set(GTModHandler.getIC2Item("reBattery", 1L));
+        ItemList.IC2_AdvBattery.set(GTModHandler.getIC2Item("advBattery", 1L));
+        ItemList.IC2_EnergyCrystal.set(GTModHandler.getIC2Item("energyCrystal", 1L));
+        ItemList.IC2_LapotronCrystal.set(GTModHandler.getIC2Item("lapotronCrystal", 1L));
+
+        ItemList.Tool_Sword_Bronze.set(GTModHandler.getIC2Item("bronzeSword", 1L));
+        ItemList.Tool_Pickaxe_Bronze.set(GTModHandler.getIC2Item("bronzePickaxe", 1L));
+        ItemList.Tool_Shovel_Bronze.set(GTModHandler.getIC2Item("bronzeShovel", 1L));
+        ItemList.Tool_Axe_Bronze.set(GTModHandler.getIC2Item("bronzeAxe", 1L));
+        ItemList.Tool_Hoe_Bronze.set(GTModHandler.getIC2Item("bronzeHoe", 1L));
+        ItemList.IC2_ForgeHammer.set(GTModHandler.getIC2Item("ForgeHammer", 1L));
+        ItemList.IC2_WireCutter.set(GTModHandler.getIC2Item("cutter", 1L));
+
+        ItemList.Credit_Iron.set(GTModHandler.getIC2Item("coin", 1L));
+
+        ItemList.Circuit_Basic.set(GTModHandler.getIC2Item("electronicCircuit", 1L));
+        ItemList.Circuit_Advanced.set(GTModHandler.getIC2Item("advancedCircuit", 1L));
+
+        ItemList.Upgrade_Overclocker.set(GTModHandler.getIC2Item("overclockerUpgrade", 1L));
+        ItemList.Upgrade_Battery.set(GTModHandler.getIC2Item("energyStorageUpgrade", 1L));
 
         ItemList.Dye_Bonemeal.set(new ItemStack(Items.dye, 1, 15));
         ItemList.Dye_SquidInk.set(new ItemStack(Items.dye, 1, 0));
@@ -972,134 +972,129 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         OrePrefixes.cellMolten.mContainerItem = ItemList.Cell_Empty.get(1L);
         OrePrefixes.cell.mContainerItem = ItemList.Cell_Empty.get(1L);
 
-        GT_ModHandler.sNonReplaceableItems.add(new ItemStack(Items.bow, 1, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(new ItemStack(Items.fishing_rod, 1, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(ItemList.IC2_ForgeHammer.getWithDamage(1L, 32767L));
-        GT_ModHandler.sNonReplaceableItems.add(ItemList.IC2_WireCutter.getWithDamage(1L, 32767L));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("painter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("blackPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("redPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("greenPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("brownPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("bluePainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("purplePainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("cyanPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("lightGreyPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("darkGreyPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("pinkPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("limePainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("yellowPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("cloudPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("magentaPainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("orangePainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("whitePainter", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("cfPack", 1L, 32767));
-        // GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("jetpack", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("treetap", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("weedEx", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("staticBoots", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("compositeArmor", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatHelmet", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "part.turbine.disk", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "part.turbine.blade", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "part.turbine.rotor", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "borehead.diamond", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "borehead.steel", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "borehead.iron", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(TwilightForest.ID, "item.plateNaga", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(TwilightForest.ID, "item.legsNaga", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticHelm", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticPlate", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticLegs", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticBoots", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiHelm", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiPlate", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiLegs", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiBoots", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ToolCertusQuartzCuttingKnife", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ToolNetherQuartzCuttingKnife", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristHelmet", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristChest", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristLegs", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristBoots", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "frameUntreated", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "frameImpregnated", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "frameProven", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "waxCast", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(GalacticraftCore.ID, "item.sensorGlasses", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(new ItemStack(Items.bow, 1, 32767));
+        GTModHandler.sNonReplaceableItems.add(new ItemStack(Items.fishing_rod, 1, 32767));
+        GTModHandler.sNonReplaceableItems.add(ItemList.IC2_ForgeHammer.getWithDamage(1L, 32767L));
+        GTModHandler.sNonReplaceableItems.add(ItemList.IC2_WireCutter.getWithDamage(1L, 32767L));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("painter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("blackPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("redPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("greenPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("brownPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("bluePainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("purplePainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("cyanPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("lightGreyPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("darkGreyPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("pinkPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("limePainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("yellowPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("cloudPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("magentaPainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("orangePainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("whitePainter", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("cfPack", 1L, 32767));
+        // GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("jetpack", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("treetap", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("weedEx", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("staticBoots", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("compositeArmor", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("hazmatHelmet", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("hazmatChestplate", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("hazmatLeggings", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("hazmatBoots", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Railcraft.ID, "part.turbine.disk", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Railcraft.ID, "part.turbine.blade", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Railcraft.ID, "part.turbine.rotor", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Railcraft.ID, "borehead.diamond", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Railcraft.ID, "borehead.steel", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Railcraft.ID, "borehead.iron", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(TwilightForest.ID, "item.plateNaga", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(TwilightForest.ID, "item.legsNaga", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(TwilightForest.ID, "item.arcticHelm", 1L, 32767));
+        GTModHandler.sNonReplaceableItems
+            .add(GTModHandler.getModItem(TwilightForest.ID, "item.arcticPlate", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(TwilightForest.ID, "item.arcticLegs", 1L, 32767));
+        GTModHandler.sNonReplaceableItems
+            .add(GTModHandler.getModItem(TwilightForest.ID, "item.arcticBoots", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(TwilightForest.ID, "item.yetiHelm", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(TwilightForest.ID, "item.yetiPlate", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(TwilightForest.ID, "item.yetiLegs", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(TwilightForest.ID, "item.yetiBoots", 1L, 32767));
+        GTModHandler.sNonReplaceableItems
+            .add(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ToolCertusQuartzCuttingKnife", 1L, 32767));
+        GTModHandler.sNonReplaceableItems
+            .add(GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ToolNetherQuartzCuttingKnife", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Forestry.ID, "apiaristHelmet", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Forestry.ID, "apiaristChest", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Forestry.ID, "apiaristLegs", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Forestry.ID, "apiaristBoots", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Forestry.ID, "frameUntreated", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Forestry.ID, "frameProven", 1L, 32767));
+        GTModHandler.sNonReplaceableItems.add(GTModHandler.getModItem(Forestry.ID, "waxCast", 1L, 32767));
+        GTModHandler.sNonReplaceableItems
+            .add(GTModHandler.getModItem(GalacticraftCore.ID, "item.sensorGlasses", 1L, 32767));
 
         RecipeSorter.register(
             "gregtech:shaped",
-            GT_Shaped_Recipe.class,
+            GTShapedRecipe.class,
             RecipeSorter.Category.SHAPED,
             "after:minecraft:shaped before:minecraft:shapeless");
         RecipeSorter.register(
             "gregtech:shapeless",
-            GT_Shapeless_Recipe.class,
+            GTShapelessRecipe.class,
             RecipeSorter.Category.SHAPELESS,
             "after:minecraft:shapeless");
 
         // Register chunk manager with Forge
-        GT_ChunkManager.init();
+        GTChunkManager.init();
     }
 
     public void onLoad() {
-        GT_Log.out.println("GT_Mod: Beginning Load-Phase.");
-        GT_Log.ore.println("GT_Mod: Beginning Load-Phase.");
+        GTLog.out.println("GTMod: Beginning Load-Phase.");
+        GTLog.ore.println("GTMod: Beginning Load-Phase.");
 
         // Clay buckets, which don't get registered until Iguana Tweaks pre-init
         if (IguanaTweaksTinkerConstruct.isModLoaded()) {
-            OrePrefixes.bucketClay.mContainerItem = GT_ModHandler
+            OrePrefixes.bucketClay.mContainerItem = GTModHandler
                 .getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1L, 0);
-            GT_OreDictUnificator.set(
+            GTOreDictUnificator.set(
                 OrePrefixes.bucketClay,
                 Materials.Empty,
-                GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1L, 0));
-            GT_OreDictUnificator.set(
+                GTModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1L, 0));
+            GTOreDictUnificator.set(
                 OrePrefixes.bucketClay,
                 Materials.Water,
-                GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketWater", 1L, 0));
-            GT_OreDictUnificator.set(
+                GTModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketWater", 1L, 0));
+            GTOreDictUnificator.set(
                 OrePrefixes.bucketClay,
                 Materials.Lava,
-                GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketLava", 1L, 0));
-            GT_OreDictUnificator.set(
+                GTModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketLava", 1L, 0));
+            GTOreDictUnificator.set(
                 OrePrefixes.bucketClay,
                 Materials.Milk,
-                GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketMilk", 1L, 0));
+                GTModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketMilk", 1L, 0));
 
             FluidContainerRegistry.registerFluidContainer(
                 new FluidContainerRegistry.FluidContainerData(
                     Materials.Milk.getFluid(1000L),
-                    GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Milk, 1L),
-                    GT_OreDictUnificator.get(OrePrefixes.bucketClay, Materials.Empty, 1L)));
+                    GTOreDictUnificator.get(OrePrefixes.bucketClay, Materials.Milk, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.bucketClay, Materials.Empty, 1L)));
         }
 
-        if (!GT_Mod.gregtechproxy.enableUndergroundGravelGen)
+        if (!GTMod.gregtechproxy.enableUndergroundGravelGen)
             PREVENTED_ORES.add(OreGenEvent.GenerateMinable.EventType.GRAVEL);
-        if (!GT_Mod.gregtechproxy.enableUndergroundDirtGen)
+        if (!GTMod.gregtechproxy.enableUndergroundDirtGen)
             PREVENTED_ORES.add(OreGenEvent.GenerateMinable.EventType.DIRT);
 
         MinecraftForge.EVENT_BUS.register(new SpaceProjectWorldSavedData());
         MinecraftForge.EVENT_BUS.register(new GlobalEnergyWorldSavedData(""));
-        MinecraftForge.EVENT_BUS.register(new GT_Worldgenerator.OregenPatternSavedData(""));
+        MinecraftForge.EVENT_BUS.register(new GTWorldgenerator.OregenPatternSavedData(""));
         MinecraftForge.EVENT_BUS.register(new GlobalMetricsCoverDatabase());
         FMLCommonHandler.instance()
             .bus()
-            .register(new GT_Worldgenerator.OregenPatternSavedData(""));
+            .register(new GTWorldgenerator.OregenPatternSavedData(""));
 
         // IC2 Hazmat
         addFullHazmatToIC2Item("hazmatHelmet");
@@ -1193,10 +1188,10 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_gravityboots", 1L);
 
         // Extra Hazmat
-        GregTech_API.sElectroHazmatList.add(new ItemStack(Items.chainmail_helmet, 1, W));
-        GregTech_API.sElectroHazmatList.add(new ItemStack(Items.chainmail_chestplate, 1, W));
-        GregTech_API.sElectroHazmatList.add(new ItemStack(Items.chainmail_leggings, 1, W));
-        GregTech_API.sElectroHazmatList.add(new ItemStack(Items.chainmail_boots, 1, W));
+        GregTechAPI.sElectroHazmatList.add(new ItemStack(Items.chainmail_helmet, 1, W));
+        GregTechAPI.sElectroHazmatList.add(new ItemStack(Items.chainmail_chestplate, 1, W));
+        GregTechAPI.sElectroHazmatList.add(new ItemStack(Items.chainmail_leggings, 1, W));
+        GregTechAPI.sElectroHazmatList.add(new ItemStack(Items.chainmail_boots, 1, W));
 
         // Infinity Hazmat
         addFullHazmatToGeneralItem(Avaritia.ID, "Infinity_Helm", 1L);
@@ -1214,7 +1209,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         addFullHazmatToGeneralItem(EnderIO.ID, "item.stellar_leggings", 1L);
         addFullHazmatToGeneralItem(EnderIO.ID, "item.stellar_boots", 1L);
 
-        GregTech_API.sLoadStarted = true;
+        GregTechAPI.sLoadStarted = true;
         for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry
             .getRegisteredFluidContainerData()) {
             if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) {
@@ -1222,30 +1217,30 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 break;
             }
         }
-        GT_LanguageManager.writePlaceholderStrings();
+        GTLanguageManager.writePlaceholderStrings();
     }
 
-    public static long tBits = GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED
-        | GT_ModHandler.RecipeBits.ONLY_ADD_IF_RESULT_IS_NOT_NULL
-        | GT_ModHandler.RecipeBits.NOT_REMOVABLE;
+    public static long tBits = GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED
+        | GTModHandler.RecipeBits.ONLY_ADD_IF_RESULT_IS_NOT_NULL
+        | GTModHandler.RecipeBits.NOT_REMOVABLE;
 
     public void onPostLoad() {
-        GT_Log.out.println("GT_Mod: Beginning PostLoad-Phase.");
-        GT_Log.ore.println("GT_Mod: Beginning PostLoad-Phase.");
-        if (GT_Log.pal != null) {
-            final Thread playerActivityLogger = new Thread(new GT_PlayerActivityLogger());
+        GTLog.out.println("GTMod: Beginning PostLoad-Phase.");
+        GTLog.ore.println("GTMod: Beginning PostLoad-Phase.");
+        if (GTLog.pal != null) {
+            final Thread playerActivityLogger = new Thread(new GTPlayerActivityLogger());
             playerActivityLogger.setDaemon(true);
             playerActivityLogger.setName("GT5U Player activity logger");
             playerActivityLogger.start();
         }
-        GregTech_API.sPostloadStarted = true;
+        GregTechAPI.sPostloadStarted = true;
 
         // This needs to happen late enough that all of the fluids we need have been registered.
         // onLoad() seems to be too early, as the New Horizons Core Mod registers some fluids in post-load.
-        GT_MetaGenerated_Item_98.init();
+        MetaGeneratedItem98.init();
 
-        GT_OreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L));
+        GTOreDictUnificator
             .addItemData(new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L));
         for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry
             .getRegisteredFluidContainerData()) {
@@ -1254,73 +1249,73 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 break;
             }
         }
-        GT_Log.out.println("GT_Mod: Adding Configs specific for MetaTileEntities");
+        GTLog.out.println("GTMod: Adding Configs specific for MetaTileEntities");
         try {
-            for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-                if (GregTech_API.METATILEENTITIES[i] != null) {
-                    GregTech_API.METATILEENTITIES[i].onConfigLoad();
+            for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+                if (GregTechAPI.METATILEENTITIES[i] != null) {
+                    GregTechAPI.METATILEENTITIES[i].onConfigLoad();
                 }
             }
         } catch (Throwable e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
-        GT_Log.out.println("GT_Mod: Adding Tool Usage Crafting Recipes for OreDict Items.");
+        GTLog.out.println("GTMod: Adding Tool Usage Crafting Recipes for OreDict Items.");
         for (Materials aMaterial : Materials.values()) {
             if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) {
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
                     tBits,
                     new Object[] { "h", "X", 'X', OrePrefixes.crushedCentrifuged.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
                     tBits,
                     new Object[] { "h", "X", 'X', OrePrefixes.crystalline.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
                     tBits,
                     new Object[] { "h", "X", 'X', OrePrefixes.crystal.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L),
                     tBits,
                     new Object[] { "h", "X", 'X', OrePrefixes.crushedPurified.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L),
                     tBits,
                     new Object[] { "h", "X", 'X', OrePrefixes.cleanGravel.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L),
                     tBits,
                     new Object[] { "h", "X", 'X', OrePrefixes.reduced.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L),
                     tBits,
                     new Object[] { "h", "X", 'X', OrePrefixes.clump.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L),
                     tBits,
                     new Object[] { "h", "X", 'X', OrePrefixes.shard.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L),
                     tBits,
                     new Object[] { "h", "X", 'X', OrePrefixes.crushed.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L),
                     tBits,
                     new Object[] { "h", "X", 'X', OrePrefixes.dirtyGravel.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 4L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 4L),
                     tBits,
                     new Object[] { " X ", 'X', OrePrefixes.dust.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 9L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 9L),
                     tBits,
                     new Object[] { "X  ", 'X', OrePrefixes.dust.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
                     tBits,
                     new Object[] { "XX", "XX", 'X', OrePrefixes.dustSmall.get(aMaterial) });
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
+                GTModHandler.addCraftingRecipe(
+                    GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L),
                     tBits,
                     new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.dustTiny.get(aMaterial) });
             }
@@ -1331,14 +1326,14 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
 
     public void onServerAboutToStart() {
         dimensionWisePollution.clear(); // !!! IMPORTANT for map switching...
-        GT_ChunkAssociatedData.clearAll();
+        GTChunkAssociatedData.clearAll();
     }
 
     public void onServerStarting() {
-        GT_Log.out.println("GT_Mod: ServerStarting-Phase started!");
-        GT_Log.ore.println("GT_Mod: ServerStarting-Phase started!");
+        GTLog.out.println("GTMod: ServerStarting-Phase started!");
+        GTLog.ore.println("GTMod: ServerStarting-Phase started!");
 
-        GT_MusicSystem.ServerSystem.reset();
+        GTMusicSystem.ServerSystem.reset();
 
         this.mUniverse = null;
         this.isFirstServerWorldTick = true;
@@ -1350,22 +1345,22 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             }
         }
         try {
-            for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-                if (GregTech_API.METATILEENTITIES[i] != null) {
-                    GregTech_API.METATILEENTITIES[i].onServerStart();
+            for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+                if (GregTechAPI.METATILEENTITIES[i] != null) {
+                    GregTechAPI.METATILEENTITIES[i].onServerStart();
                 }
             }
         } catch (Throwable e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
     }
 
     public void onServerStarted() {
-        GregTech_API.sWirelessRedstone.clear();
-        GT_MetaTileEntity_DroneCentre.getCentreMap()
+        GregTechAPI.sWirelessRedstone.clear();
+        MTEDroneCentre.getCentreMap()
             .clear();
-        GT_Log.out.println(
-            "GT_Mod: Cleaning up all OreDict Crafting Recipes, which have an empty List in them, since they are never meeting any Condition.");
+        GTLog.out.println(
+            "GTMod: Cleaning up all OreDict Crafting Recipes, which have an empty List in them, since they are never meeting any Condition.");
         List<IRecipe> tList = CraftingManager.getInstance()
             .getRecipeList();
         for (int i = 0; i < tList.size(); i++) {
@@ -1388,18 +1383,18 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     }
 
     public void onServerStopping() {
-        GT_MusicSystem.ServerSystem.reset();
+        GTMusicSystem.ServerSystem.reset();
         File tSaveDirectory = getSaveDirectory();
-        GregTech_API.sWirelessRedstone.clear();
+        GregTechAPI.sWirelessRedstone.clear();
         if (tSaveDirectory != null) {
             try {
-                for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-                    if (GregTech_API.METATILEENTITIES[i] != null) {
-                        GregTech_API.METATILEENTITIES[i].onWorldSave(tSaveDirectory);
+                for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+                    if (GregTechAPI.METATILEENTITIES[i] != null) {
+                        GregTechAPI.METATILEENTITIES[i].onWorldSave(tSaveDirectory);
                     }
                 }
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
         this.mUniverse = null;
@@ -1411,7 +1406,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public void onClientConnectedToServerEvent(FMLNetworkEvent.ClientConnectedToServerEvent aEvent) {}
 
     /**
-     * Tells {@link gregtech.nei.GT_NEI_DefaultHandler} to reload recipes.
+     * Tells {@link GTNEIDefaultHandler} to reload recipes.
      */
     public void reloadNEICache() {}
 
@@ -1424,8 +1419,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
 
     @SubscribeEvent
     public void onArrowNockEvent(ArrowNockEvent aEvent) {
-        if ((!aEvent.isCanceled()) && (GT_Utility.isStackValid(aEvent.result))
-            && (GT_Utility.getProjectile(SubTag.PROJECTILE_ARROW, aEvent.entityPlayer.inventory) != null)) {
+        if ((!aEvent.isCanceled()) && (GTUtility.isStackValid(aEvent.result))
+            && (GTUtility.getProjectile(SubTag.PROJECTILE_ARROW, aEvent.entityPlayer.inventory) != null)) {
             aEvent.entityPlayer.setItemInUse(
                 aEvent.result,
                 aEvent.result.getItem()
@@ -1436,8 +1431,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
 
     @SubscribeEvent
     public void onArrowLooseEvent(ArrowLooseEvent aEvent) {
-        ItemStack aArrow = GT_Utility.getProjectile(SubTag.PROJECTILE_ARROW, aEvent.entityPlayer.inventory);
-        if ((!aEvent.isCanceled()) && (GT_Utility.isStackValid(aEvent.bow))
+        ItemStack aArrow = GTUtility.getProjectile(SubTag.PROJECTILE_ARROW, aEvent.entityPlayer.inventory);
+        if ((!aEvent.isCanceled()) && (GTUtility.isStackValid(aEvent.bow))
             && (aArrow != null)
             && ((aEvent.bow.getItem() instanceof ItemBow))) {
             float tSpeed = aEvent.charge / 20.0F;
@@ -1484,7 +1479,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 aArrow.stackSize -= 1;
             }
             if (aArrow.stackSize == 0) {
-                GT_Utility.removeNullStacksFromInventory(aEvent.entityPlayer.inventory);
+                GTUtility.removeNullStacksFromInventory(aEvent.entityPlayer.inventory);
             }
             if (!aEvent.entityPlayer.worldObj.isRemote) {
                 aEvent.entityPlayer.worldObj.spawnEntityInWorld(tArrowEntity);
@@ -1513,7 +1508,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
 
         if ((aEvent.entity instanceof EntityItem)) {
             ((EntityItem) aEvent.entity)
-                .setEntityItemStack(GT_OreDictUnificator.get(true, ((EntityItem) aEvent.entity).getEntityItem(), true));
+                .setEntityItemStack(GTOreDictUnificator.get(true, ((EntityItem) aEvent.entity).getEntityItem(), true));
         }
     }
 
@@ -1523,7 +1518,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             || !(event.player instanceof EntityPlayerMP mpPlayer)) {
             return;
         }
-        GT_Values.NW.sendToPlayer(new GT_Packet_MusicSystemData(GT_MusicSystem.ServerSystem.serialize()), mpPlayer);
+        GTValues.NW.sendToPlayer(new GTPacketMusicSystemData(GTMusicSystem.ServerSystem.serialize()), mpPlayer);
     }
 
     @SubscribeEvent
@@ -1546,7 +1541,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             return;
         }
         if ((!aEvent.entityPlayer.worldObj.isRemote) && (aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR)
-            && (GT_Log.pal != null)) {
+            && (GTLog.pal != null)) {
             this.mBufferedPlayerActivity.offer(
                 getDataAndTime() + ";"
                     + aEvent.action.name()
@@ -1593,7 +1588,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             .getCurrentEquippedItem();
         if (item == null) return;
 
-        if (!(item.getItem() instanceof GT_MetaGenerated_Tool tool)) return;
+        if (!(item.getItem() instanceof MetaGeneratedTool tool)) return;
 
         IToolStats stats = tool.getToolStats(item);
         if (stats == null) return;
@@ -1606,7 +1601,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public void onBlockHarvestingEvent(BlockEvent.HarvestDropsEvent aEvent) {
         if (aEvent.harvester == null) return;
 
-        if ((!aEvent.world.isRemote) && (GT_Log.pal != null)) {
+        if ((!aEvent.world.isRemote) && (GTLog.pal != null)) {
             this.mBufferedPlayerActivity.offer(
                 getDataAndTime() + ";HARVEST_BLOCK;"
                     + aEvent.harvester.getDisplayName()
@@ -1629,7 +1624,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         ItemStack aStack = aEvent.harvester.getCurrentEquippedItem();
         if (aStack == null) return;
 
-        if ((aStack.getItem() instanceof GT_MetaGenerated_Tool tool)) {
+        if ((aStack.getItem() instanceof MetaGeneratedTool tool)) {
             tool.onHarvestBlockEvent(
                 aEvent.drops,
                 aStack,
@@ -1646,15 +1641,15 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         if (EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, aStack) > 2) {
             try {
                 for (ItemStack tDrop : aEvent.drops) {
-                    ItemStack tSmeltingOutput = GT_ModHandler.getSmeltingOutput(tDrop, false, null);
+                    ItemStack tSmeltingOutput = GTModHandler.getSmeltingOutput(tDrop, false, null);
                     if (tSmeltingOutput != null) {
                         tDrop.stackSize *= tSmeltingOutput.stackSize;
                         tSmeltingOutput.stackSize = tDrop.stackSize;
-                        GT_Utility.setStack(tDrop, tSmeltingOutput);
+                        GTUtility.setStack(tDrop, tSmeltingOutput);
                     }
                 }
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
         }
 
@@ -1666,7 +1661,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             .activeModContainer();
         String aMod = tContainer == null ? "UNKNOWN" : tContainer.getModId();
         String aOriginalMod = aMod;
-        if (GT_OreDictUnificator.isRegisteringOres()) {
+        if (GTOreDictUnificator.isRegisteringOres()) {
             aMod = GregTech.ID;
         } else if (aMod.equals(GregTech.ID)) {
             aMod = "UNKNOWN";
@@ -1680,7 +1675,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             if (aOriginalMod.equals(GregTech.ID)) {
                 aOriginalMod = "UNKNOWN";
             }
-            GT_Log.ore.println(
+            GTLog.ore.println(
                 aOriginalMod
                     + " did something very bad! The registration is too invalid to even be shown properly. This happens only if you register null, invalid Items, empty Strings or even nonexisting Events to the OreDict.");
             throw new IllegalArgumentException(
@@ -1695,98 +1690,98 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 return;
             }
             String tModToName = aMod + " -> " + aEvent.Name;
-            if (this.mOreDictActivated || GregTech_API.sPostloadStarted || GregTech_API.sLoadFinished) {
+            if (this.mOreDictActivated || GregTechAPI.sPostloadStarted || GregTechAPI.sLoadFinished) {
                 tModToName = aOriginalMod + " --Late--> " + aEvent.Name;
             }
             if (((aEvent.Ore.getItem() instanceof ItemBlock))
-                || (GT_Utility.getBlockFromStack(aEvent.Ore) != Blocks.air)) {
-                GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
+                || (GTUtility.getBlockFromStack(aEvent.Ore) != Blocks.air)) {
+                GTOreDictUnificator.addToBlacklist(aEvent.Ore);
             }
             this.mRegisteredOres.add(aEvent.Ore);
             if (this.mIgnoredItems.contains(aEvent.Name)) {
                 if ((aEvent.Name.startsWith("item"))) {
-                    GT_Log.ore.println(tModToName);
+                    GTLog.ore.println(tModToName);
                     if (aEvent.Name.equals("itemCopperWire")) {
-                        GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore);
+                        GTOreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore);
                     }
                     if (aEvent.Name.equals("itemRubber")) {
-                        GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Rubber, aEvent.Ore);
+                        GTOreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Rubber, aEvent.Ore);
                     }
                     return;
                 }
             } else if (this.mIgnoredNames.contains(aEvent.Name)) {
-                GT_Log.ore.println(tModToName + " is getting ignored via hardcode.");
+                GTLog.ore.println(tModToName + " is getting ignored via hardcode.");
                 return;
             } else if (aEvent.Name.equals("stone")) {
-                GT_OreDictUnificator.registerOre("stoneSmooth", aEvent.Ore);
+                GTOreDictUnificator.registerOre("stoneSmooth", aEvent.Ore);
                 return;
             } else if (aEvent.Name.equals("cobblestone")) {
-                GT_OreDictUnificator.registerOre("stoneCobble", aEvent.Ore);
+                GTOreDictUnificator.registerOre("stoneCobble", aEvent.Ore);
                 return;
             } else if ((aEvent.Name.contains("|")) || (aEvent.Name.contains("*"))
                 || (aEvent.Name.contains(":"))
                 || (aEvent.Name.contains("."))
                 || (aEvent.Name.contains("$"))) {
-                    GT_Log.ore
+                    GTLog.ore
                         .println(tModToName + " is using a private Prefix and is therefor getting ignored properly.");
                     return;
                 } else if (aEvent.Name.equals("copperWire")) {
-                    GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore);
+                    GTOreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore);
                 } else if (aEvent.Name.equals("oreHeeEndrium")) {
-                    GT_OreDictUnificator.registerOre(OrePrefixes.ore, Materials.HeeEndium, aEvent.Ore);
+                    GTOreDictUnificator.registerOre(OrePrefixes.ore, Materials.HeeEndium, aEvent.Ore);
                 } else if (aEvent.Name.equals("sheetPlastic")) {
-                    GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore);
+                    GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore);
                 } else if (aEvent.Name.startsWith("shard")) {
                     switch (aEvent.Name) {
                         case "shardAir" -> {
-                            GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedAir, aEvent.Ore);
+                            GTOreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedAir, aEvent.Ore);
                             return;
                         }
                         case "shardWater" -> {
-                            GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedWater, aEvent.Ore);
+                            GTOreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedWater, aEvent.Ore);
                             return;
                         }
                         case "shardFire" -> {
-                            GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedFire, aEvent.Ore);
+                            GTOreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedFire, aEvent.Ore);
                             return;
                         }
                         case "shardEarth" -> {
-                            GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEarth, aEvent.Ore);
+                            GTOreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEarth, aEvent.Ore);
                             return;
                         }
                         case "shardOrder" -> {
-                            GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedOrder, aEvent.Ore);
+                            GTOreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedOrder, aEvent.Ore);
                             return;
                         }
                         case "shardEntropy" -> {
-                            GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEntropy, aEvent.Ore);
+                            GTOreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEntropy, aEvent.Ore);
                             return;
                         }
                     }
                 } else if (aEvent.Name.equals("fieryIngot")) {
-                    GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.FierySteel, aEvent.Ore);
+                    GTOreDictUnificator.registerOre(OrePrefixes.ingot, Materials.FierySteel, aEvent.Ore);
                     return;
                 } else if (aEvent.Name.equals("ironwood")) {
-                    GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.IronWood, aEvent.Ore);
+                    GTOreDictUnificator.registerOre(OrePrefixes.ingot, Materials.IronWood, aEvent.Ore);
                     return;
                 } else if (aEvent.Name.equals("steeleaf")) {
-                    GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Steeleaf, aEvent.Ore);
+                    GTOreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Steeleaf, aEvent.Ore);
                     return;
                 } else if (aEvent.Name.equals("knightmetal")) {
-                    GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Knightmetal, aEvent.Ore);
+                    GTOreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Knightmetal, aEvent.Ore);
                     return;
                 } else if (aEvent.Name.equals("compressedAluminum")) {
-                    GT_OreDictUnificator.registerOre(OrePrefixes.compressed, Materials.Aluminium, aEvent.Ore);
+                    GTOreDictUnificator.registerOre(OrePrefixes.compressed, Materials.Aluminium, aEvent.Ore);
                     return;
                 } else if (aEvent.Name.contains(" ")) {
-                    GT_Log.ore.println(
+                    GTLog.ore.println(
                         tModToName + " is getting re-registered because the OreDict Name containing invalid spaces.");
-                    GT_OreDictUnificator
-                        .registerOre(aEvent.Name.replaceAll(" ", ""), GT_Utility.copyAmount(1, aEvent.Ore));
+                    GTOreDictUnificator
+                        .registerOre(aEvent.Name.replaceAll(" ", ""), GTUtility.copyAmount(1, aEvent.Ore));
                     aEvent.Ore.setStackDisplayName("Invalid OreDictionary Tag");
                     return;
                 } else if (this.mInvalidNames.contains(aEvent.Name)) {
-                    GT_Log.ore.println(tModToName + " is wrongly registered and therefor getting ignored.");
+                    GTLog.ore.println(tModToName + " is wrongly registered and therefor getting ignored.");
 
                     return;
                 }
@@ -1801,26 +1796,26 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             if (aPrefix == null) {
                 if (aEvent.Name.toLowerCase()
                     .equals(aEvent.Name)) {
-                    GT_Log.ore.println(tModToName + " is invalid due to being solely lowercased.");
+                    GTLog.ore.println(tModToName + " is invalid due to being solely lowercased.");
                     return;
                 } else if (aEvent.Name.toUpperCase()
                     .equals(aEvent.Name)) {
-                        GT_Log.ore.println(tModToName + " is invalid due to being solely uppercased.");
+                        GTLog.ore.println(tModToName + " is invalid due to being solely uppercased.");
                         return;
                     } else if (Character.isUpperCase(aEvent.Name.charAt(0))) {
-                        GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased.");
+                        GTLog.ore.println(tModToName + " is invalid due to the first character being uppercased.");
                     }
             } else {
                 if (aPrefix.mDontUnificateActively) {
-                    GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
+                    GTOreDictUnificator.addToBlacklist(aEvent.Ore);
                 }
                 if (aPrefix != aPrefix.mPrefixInto) {
                     String tNewName = aEvent.Name.replaceFirst(aPrefix.toString(), aPrefix.mPrefixInto.toString());
-                    if (!GT_OreDictUnificator.isRegisteringOres()) {
-                        GT_Log.ore.println(
+                    if (!GTOreDictUnificator.isRegisteringOres()) {
+                        GTLog.ore.println(
                             tModToName + " uses a depricated Prefix, and is getting re-registered as " + tNewName);
                     }
-                    GT_OreDictUnificator.registerOre(tNewName, aEvent.Ore);
+                    GTOreDictUnificator.registerOre(tNewName, aEvent.Ore);
                     return;
                 }
                 String tName = aEvent.Name.replaceFirst(aPrefix.toString(), "");
@@ -1832,35 +1827,35 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                         if (aPrefix.mIsMaterialBased) {
                             aMaterial = Materials.get(tName);
                             if (aMaterial != aMaterial.mMaterialInto) {
-                                GT_OreDictUnificator.registerOre(aPrefix, aMaterial.mMaterialInto, aEvent.Ore);
-                                if (!GT_OreDictUnificator.isRegisteringOres()) {
-                                    GT_Log.ore.println(
+                                GTOreDictUnificator.registerOre(aPrefix, aMaterial.mMaterialInto, aEvent.Ore);
+                                if (!GTOreDictUnificator.isRegisteringOres()) {
+                                    GTLog.ore.println(
                                         tModToName + " uses a deprecated Material and is getting re-registered as "
                                             + aPrefix.get(aMaterial.mMaterialInto));
                                 }
                                 return;
                             }
                             if (!aPrefix.isIgnored(aMaterial)) {
-                                aPrefix.add(GT_Utility.copyAmount(1, aEvent.Ore));
+                                aPrefix.add(GTUtility.copyAmount(1, aEvent.Ore));
                             }
                             if (aMaterial != Materials._NULL) {
                                 Materials tReRegisteredMaterial;
                                 for (Iterator<Materials> i$ = aMaterial.mOreReRegistrations.iterator(); i$
-                                    .hasNext(); GT_OreDictUnificator
+                                    .hasNext(); GTOreDictUnificator
                                         .registerOre(aPrefix, tReRegisteredMaterial, aEvent.Ore)) {
                                     tReRegisteredMaterial = i$.next();
                                 }
-                                aMaterial.add(GT_Utility.copyAmount(1, aEvent.Ore));
+                                aMaterial.add(GTUtility.copyAmount(1, aEvent.Ore));
 
-                                if (GregTech_API.sThaumcraftCompat != null && aPrefix.doGenerateItem(aMaterial)
+                                if (GregTechAPI.sThaumcraftCompat != null && aPrefix.doGenerateItem(aMaterial)
                                     && !aPrefix.isIgnored(aMaterial)) {
                                     List<TC_AspectStack> tAspects = new ArrayList<>();
                                     for (TC_AspectStack tAspect : aPrefix.mAspects) tAspect.addToAspectList(tAspects);
                                     if (aPrefix.mMaterialAmount >= 3628800 || aPrefix.mMaterialAmount < 0)
                                         for (TC_AspectStack tAspect : aMaterial.mAspects)
                                             tAspect.addToAspectList(tAspects);
-                                    GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(
-                                        GT_Utility.copyAmount(1, aEvent.Ore),
+                                    GregTechAPI.sThaumcraftCompat.registerThaumcraftAspectsToItem(
+                                        GTUtility.copyAmount(1, aEvent.Ore),
                                         tAspects,
                                         aEvent.Name);
                                 }
@@ -1870,60 +1865,60 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                                         if ((aMaterial == Materials.CertusQuartz)
                                             || (aMaterial == Materials.NetherQuartz)
                                             || (aMaterial == Materials.Fluix)) {
-                                            GT_OreDictUnificator.registerOre(OrePrefixes.gem, aMaterial, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(OrePrefixes.gem, aMaterial, aEvent.Ore);
                                         }
                                     }
                                     case gem -> {
                                         if (aMaterial == Materials.Lapis || aMaterial == Materials.Sodalite) {
-                                            GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore);
                                         } else if (aMaterial == Materials.Lazurite) {
-                                            GT_OreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore);
                                         } else
                                             if (aMaterial == Materials.InfusedAir || aMaterial == Materials.InfusedWater
                                                 || aMaterial == Materials.InfusedFire
                                                 || aMaterial == Materials.InfusedEarth
                                                 || aMaterial == Materials.InfusedOrder
                                                 || aMaterial == Materials.InfusedEntropy) {
-                                                    GT_OreDictUnificator.registerOre(
+                                                    GTOreDictUnificator.registerOre(
                                                         aMaterial.mName.replaceFirst("Infused", "shard"),
                                                         aEvent.Ore);
                                                 } else if (aMaterial == Materials.Chocolate) {
-                                                    GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
+                                                    GTOreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
                                                 } else if (aMaterial == Materials.CertusQuartz
                                                     || aMaterial == Materials.NetherQuartz) {
-                                                        GT_OreDictUnificator
+                                                        GTOreDictUnificator
                                                             .registerOre(OrePrefixes.item.get(aMaterial), aEvent.Ore);
-                                                        GT_OreDictUnificator
+                                                        GTOreDictUnificator
                                                             .registerOre(OrePrefixes.crystal, aMaterial, aEvent.Ore);
-                                                        GT_OreDictUnificator
+                                                        GTOreDictUnificator
                                                             .registerOre(OreDictNames.craftingQuartz, aEvent.Ore);
                                                     } else
                                                     if (aMaterial == Materials.Fluix || aMaterial == Materials.Quartz
                                                         || aMaterial == Materials.Quartzite) {
-                                                            GT_OreDictUnificator.registerOre(
+                                                            GTOreDictUnificator.registerOre(
                                                                 OrePrefixes.crystal,
                                                                 aMaterial,
                                                                 aEvent.Ore);
-                                                            GT_OreDictUnificator
+                                                            GTOreDictUnificator
                                                                 .registerOre(OreDictNames.craftingQuartz, aEvent.Ore);
                                                         }
                                     }
                                     case cableGt01 -> {
                                         if (aMaterial == Materials.Tin) {
-                                            GT_OreDictUnificator.registerOre(OreDictNames.craftingWireTin, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(OreDictNames.craftingWireTin, aEvent.Ore);
                                         } else if (aMaterial == Materials.AnyCopper) {
-                                            GT_OreDictUnificator
+                                            GTOreDictUnificator
                                                 .registerOre(OreDictNames.craftingWireCopper, aEvent.Ore);
                                         } else if (aMaterial == Materials.Gold) {
-                                            GT_OreDictUnificator.registerOre(OreDictNames.craftingWireGold, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(OreDictNames.craftingWireGold, aEvent.Ore);
                                         } else if (aMaterial == Materials.AnyIron) {
-                                            GT_OreDictUnificator.registerOre(OreDictNames.craftingWireIron, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(OreDictNames.craftingWireIron, aEvent.Ore);
                                         }
                                     }
                                     case lens -> {
                                         if ((aMaterial.contains(SubTag.TRANSPARENT))
                                             && (aMaterial.mColor != Dyes._NULL)) {
-                                            GT_OreDictUnificator.registerOre(
+                                            GTOreDictUnificator.registerOre(
                                                 "craftingLens" + aMaterial.mColor.toString()
                                                     .replaceFirst("dye", ""),
                                                 aEvent.Ore);
@@ -1931,86 +1926,86 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                                     }
                                     case plate -> {
                                         if ((aMaterial == Materials.Plastic) || (aMaterial == Materials.Rubber)) {
-                                            GT_OreDictUnificator.registerOre(OrePrefixes.sheet, aMaterial, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(OrePrefixes.sheet, aMaterial, aEvent.Ore);
                                         } else if (aMaterial == Materials.Silicon) {
-                                            GT_OreDictUnificator.registerOre(OrePrefixes.item, aMaterial, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(OrePrefixes.item, aMaterial, aEvent.Ore);
                                         } else if (aMaterial == Materials.Wood) {
-                                            GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
-                                            GT_OreDictUnificator.registerOre(OrePrefixes.plank, aMaterial, aEvent.Ore);
+                                            GTOreDictUnificator.addToBlacklist(aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(OrePrefixes.plank, aMaterial, aEvent.Ore);
                                         }
                                     }
                                     case cell -> {
                                         if (aMaterial == Materials.Empty) {
-                                            GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
+                                            GTOreDictUnificator.addToBlacklist(aEvent.Ore);
                                         }
                                     }
-                                    case gearGt -> GT_OreDictUnificator
+                                    case gearGt -> GTOreDictUnificator
                                         .registerOre(OrePrefixes.gear, aMaterial, aEvent.Ore);
                                     case stick -> {
-                                        if (!GT_RecipeRegistrator.sRodMaterialList.contains(aMaterial)) {
-                                            GT_RecipeRegistrator.sRodMaterialList.add(aMaterial);
+                                        if (!GTRecipeRegistrator.sRodMaterialList.contains(aMaterial)) {
+                                            GTRecipeRegistrator.sRodMaterialList.add(aMaterial);
                                         } else if (aMaterial == Materials.Wood) {
-                                            GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
+                                            GTOreDictUnificator.addToBlacklist(aEvent.Ore);
                                         } else if ((aMaterial == Materials.Tin) || (aMaterial == Materials.Lead)
                                             || (aMaterial == Materials.SolderingAlloy)) {
-                                                GT_OreDictUnificator
+                                                GTOreDictUnificator
                                                     .registerOre(ToolDictNames.craftingToolSolderingMetal, aEvent.Ore);
                                             }
                                     }
                                     case dust -> {
                                         if (aMaterial == Materials.Salt) {
-                                            GT_OreDictUnificator.registerOre("itemSalt", aEvent.Ore);
+                                            GTOreDictUnificator.registerOre("itemSalt", aEvent.Ore);
                                         } else if (aMaterial == Materials.Wood) {
-                                            GT_OreDictUnificator.registerOre("pulpWood", aEvent.Ore);
+                                            GTOreDictUnificator.registerOre("pulpWood", aEvent.Ore);
                                         } else if (aMaterial == Materials.Wheat) {
-                                            GT_OreDictUnificator.registerOre("foodFlour", aEvent.Ore);
+                                            GTOreDictUnificator.registerOre("foodFlour", aEvent.Ore);
                                         } else if (aMaterial == Materials.Lapis) {
-                                            GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore);
                                         } else if (aMaterial == Materials.Lazurite) {
-                                            GT_OreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore);
                                         } else if (aMaterial == Materials.Sodalite) {
-                                            GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore);
                                         } else if (aMaterial == Materials.Cocoa) {
-                                            GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
-                                            GT_OreDictUnificator.registerOre("foodCocoapowder", aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre("foodCocoapowder", aEvent.Ore);
                                         } else if (aMaterial == Materials.Coffee) {
-                                            GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
                                         } else if (aMaterial == Materials.BrownLimonite) {
-                                            GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
                                         } else if (aMaterial == Materials.YellowLimonite) {
-                                            GT_OreDictUnificator.registerOre(Dyes.dyeYellow, aEvent.Ore);
+                                            GTOreDictUnificator.registerOre(Dyes.dyeYellow, aEvent.Ore);
                                         }
                                     }
                                     case ingot -> {
                                         if (aMaterial == Materials.Rubber) {
-                                            GT_OreDictUnificator.registerOre("itemRubber", aEvent.Ore);
+                                            GTOreDictUnificator.registerOre("itemRubber", aEvent.Ore);
                                         } else if (aMaterial == Materials.FierySteel) {
-                                            GT_OreDictUnificator.registerOre("fieryIngot", aEvent.Ore);
+                                            GTOreDictUnificator.registerOre("fieryIngot", aEvent.Ore);
                                         } else if (aMaterial == Materials.IronWood) {
-                                            GT_OreDictUnificator.registerOre("ironwood", aEvent.Ore);
+                                            GTOreDictUnificator.registerOre("ironwood", aEvent.Ore);
                                         } else if (aMaterial == Materials.Steeleaf) {
-                                            GT_OreDictUnificator.registerOre("steeleaf", aEvent.Ore);
+                                            GTOreDictUnificator.registerOre("steeleaf", aEvent.Ore);
                                         } else if (aMaterial == Materials.Knightmetal) {
-                                            GT_OreDictUnificator.registerOre("knightmetal", aEvent.Ore);
+                                            GTOreDictUnificator.registerOre("knightmetal", aEvent.Ore);
                                         } else if ((aMaterial == Materials.Brass) && (aEvent.Ore.getItemDamage() == 2)
                                             && (aEvent.Ore.getUnlocalizedName()
                                                 .equals("item.ingotBrass"))
                                             && (new ItemStack(aEvent.Ore.getItem(), 1, 0).getUnlocalizedName()
                                                 .contains("red"))) {
-                                                    GT_OreDictUnificator.set(
+                                                    GTOreDictUnificator.set(
                                                         OrePrefixes.ingot,
                                                         Materials.RedAlloy,
                                                         new ItemStack(aEvent.Ore.getItem(), 1, 0));
-                                                    GT_OreDictUnificator.set(
+                                                    GTOreDictUnificator.set(
                                                         OrePrefixes.ingot,
                                                         Materials.BlueAlloy,
                                                         new ItemStack(aEvent.Ore.getItem(), 1, 1));
-                                                    GT_OreDictUnificator.set(
+                                                    GTOreDictUnificator.set(
                                                         OrePrefixes.ingot,
                                                         Materials.Brass,
                                                         new ItemStack(aEvent.Ore.getItem(), 1, 2));
 
-                                                    GT_Values.RA.stdBuilder()
+                                                    GTValues.RA.stdBuilder()
                                                         .itemInputs(new ItemStack(aEvent.Ore.getItem(), 1, 3))
                                                         .itemOutputs(new ItemStack(aEvent.Ore.getItem(), 16, 4))
                                                         .duration(20 * SECONDS)
@@ -2028,8 +2023,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                                     if (aEvent.Name.endsWith(
                                         tDye.name()
                                             .replaceFirst("dye", ""))) {
-                                        GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
-                                        GT_Log.ore.println(
+                                        GTOreDictUnificator.addToBlacklist(aEvent.Ore);
+                                        GTLog.ore.println(
                                             tModToName
                                                 + " Oh man, why the fuck would anyone need a OreDictified Color for this, that is even too much for GregTech... do not report this, this is just a random Comment about how ridiculous this is.");
                                         return;
@@ -2039,71 +2034,71 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                                 // !!!Unknown Material detected!!! Please report to GregTech Intergalactical for
                                 // additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just
                                 // an Information, which you should pass to me.");
-                                // GT_Log.ore.println(tModToName + " uses an unknown
+                                // GTLog.ore.println(tModToName + " uses an unknown
                                 // Material. Report this to GregTech.");
                                 return;
                             }
                         } else {
-                            aPrefix.add(GT_Utility.copyAmount(1, aEvent.Ore));
+                            aPrefix.add(GTUtility.copyAmount(1, aEvent.Ore));
                         }
                     }
                 } else if (aPrefix.mIsSelfReferencing) {
-                    aPrefix.add(GT_Utility.copyAmount(1, aEvent.Ore));
+                    aPrefix.add(GTUtility.copyAmount(1, aEvent.Ore));
                 } else {
-                    GT_Log.ore.println(tModToName + " uses a Prefix as full OreDict Name, and is therefor invalid.");
+                    GTLog.ore.println(tModToName + " uses a Prefix as full OreDict Name, and is therefor invalid.");
                     aEvent.Ore.setStackDisplayName("Invalid OreDictionary Tag");
                     return;
                 }
                 switch (aPrefix) {
                     case dye -> {
-                        if (GT_Utility.isStringValid(tName)) {
-                            GT_OreDictUnificator.registerOre(OrePrefixes.dye, aEvent.Ore);
+                        if (GTUtility.isStringValid(tName)) {
+                            GTOreDictUnificator.registerOre(OrePrefixes.dye, aEvent.Ore);
                         }
                     }
-                    case stoneSmooth -> GT_OreDictUnificator.registerOre("stone", aEvent.Ore);
-                    case stoneCobble -> GT_OreDictUnificator.registerOre("cobblestone", aEvent.Ore);
+                    case stoneSmooth -> GTOreDictUnificator.registerOre("stone", aEvent.Ore);
+                    case stoneCobble -> GTOreDictUnificator.registerOre("cobblestone", aEvent.Ore);
                     case plank -> {
                         if (tName.equals("Wood")) {
-                            GT_OreDictUnificator.addItemData(aEvent.Ore, new ItemData(Materials.Wood, 3628800L));
+                            GTOreDictUnificator.addItemData(aEvent.Ore, new ItemData(Materials.Wood, 3628800L));
                         }
                     }
                     case slab -> {
                         if (tName.equals("Wood")) {
-                            GT_OreDictUnificator.addItemData(aEvent.Ore, new ItemData(Materials.Wood, 1814400L));
+                            GTOreDictUnificator.addItemData(aEvent.Ore, new ItemData(Materials.Wood, 1814400L));
                         }
                     }
                     case sheet -> {
                         if (tName.equals("Plastic")) {
-                            GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore);
+                            GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore);
                         } else if (tName.equals("Rubber")) {
-                            GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Rubber, aEvent.Ore);
+                            GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Rubber, aEvent.Ore);
                         }
                     }
                     case crafting -> {
                         switch (tName) {
-                            case "ToolSolderingMetal" -> GregTech_API.registerSolderingMetal(aEvent.Ore);
-                            case "IndustrialDiamond" -> GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
-                            case "WireCopper" -> GT_OreDictUnificator
+                            case "ToolSolderingMetal" -> GregTechAPI.registerSolderingMetal(aEvent.Ore);
+                            case "IndustrialDiamond" -> GTOreDictUnificator.addToBlacklist(aEvent.Ore);
+                            case "WireCopper" -> GTOreDictUnificator
                                 .registerOre(OrePrefixes.wire, Materials.Copper, aEvent.Ore);
                         }
                     }
                     case wood -> {
                         if (tName.equals("Rubber")) {
-                            GT_OreDictUnificator.registerOre("logRubber", aEvent.Ore);
+                            GTOreDictUnificator.registerOre("logRubber", aEvent.Ore);
                         }
                     }
                     case food -> {
                         if (tName.equals("Cocoapowder")) {
-                            GT_OreDictUnificator.registerOre(OrePrefixes.dust, Materials.Cocoa, aEvent.Ore);
+                            GTOreDictUnificator.registerOre(OrePrefixes.dust, Materials.Cocoa, aEvent.Ore);
                         }
                     }
                     default -> {}
                 }
             }
-            GT_Log.ore.println(tModToName);
+            GTLog.ore.println(tModToName);
 
             OreDictEventContainer tOre = new OreDictEventContainer(aEvent, aPrefix, aMaterial, aMod);
-            if ((!this.mOreDictActivated) || (!GregTech_API.sUnificationEntriesRegistered)) {
+            if ((!this.mOreDictActivated) || (!GregTechAPI.sUnificationEntriesRegistered)) {
                 this.mEvents.add(tOre);
             } else {
                 this.mEvents.clear();
@@ -2112,17 +2107,17 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 registerRecipes(tOre);
             }
         } catch (Throwable e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
     }
 
     @SuppressWarnings("deprecated")
-    public static void stepMaterialsVanilla(Collection<GT_Proxy.OreDictEventContainer> mEvents,
+    public static void stepMaterialsVanilla(Collection<GTProxy.OreDictEventContainer> mEvents,
         ProgressManager.ProgressBar progressBar) {
         int size = 5;
         int sizeStep = mEvents.size() / 20 - 1;
-        GT_Proxy.OreDictEventContainer tEvent;
-        for (Iterator<GT_Proxy.OreDictEventContainer> i$ = mEvents.iterator(); i$.hasNext(); GT_Proxy
+        GTProxy.OreDictEventContainer tEvent;
+        for (Iterator<GTProxy.OreDictEventContainer> i$ = mEvents.iterator(); i$.hasNext(); GTProxy
             .registerRecipes(tEvent)) {
             tEvent = i$.next();
             sizeStep--;
@@ -2154,9 +2149,9 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             && (aFluidEvent.data.filledContainer.getItemDamage() == 0)) {
             aFluidEvent.data.fluid.amount = 0;
         }
-        GT_OreDictUnificator.addToBlacklist(aFluidEvent.data.emptyContainer);
-        GT_OreDictUnificator.addToBlacklist(aFluidEvent.data.filledContainer);
-        GT_Utility.addFluidContainerData(aFluidEvent.data);
+        GTOreDictUnificator.addToBlacklist(aFluidEvent.data.emptyContainer);
+        GTOreDictUnificator.addToBlacklist(aFluidEvent.data.filledContainer);
+        GTUtility.addFluidContainerData(aFluidEvent.data);
     }
 
     @SubscribeEvent
@@ -2166,7 +2161,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 TICK_LOCK.lock();
             } else {
                 TICK_LOCK.unlock();
-                GT_MusicSystem.ServerSystem.tick();
+                GTMusicSystem.ServerSystem.tick();
             }
 
             // Making sure it is being freed up in order to prevent exploits or Garbage Collection mishaps.
@@ -2178,9 +2173,9 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public void onWorldTickEvent(TickEvent.WorldTickEvent aEvent) {
         if (aEvent.world.provider.dimensionId == 0) mTicksUntilNextCraftSound--;
         if (isFirstWorldTick) {
-            for (Runnable runnable : GregTech_API.sFirstWorldTick) runnable.run();
+            for (Runnable runnable : GregTechAPI.sFirstWorldTick) runnable.run();
             isFirstWorldTick = false;
-            GT_Values.worldTickHappened = true;
+            GTValues.worldTickHappened = true;
         }
         if (aEvent.side.isServer()) {
             if (this.mUniverse == null) {
@@ -2191,13 +2186,13 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 if (tSaveDiretory != null) {
                     this.isFirstServerWorldTick = false;
                     try {
-                        for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-                            if (GregTech_API.METATILEENTITIES[i] != null) {
-                                GregTech_API.METATILEENTITIES[i].onWorldLoad(tSaveDiretory);
+                        for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+                            if (GregTechAPI.METATILEENTITIES[i] != null) {
+                                GregTechAPI.METATILEENTITIES[i].onWorldLoad(tSaveDiretory);
                             }
                         }
                     } catch (Throwable e) {
-                        e.printStackTrace(GT_Log.err);
+                        e.printStackTrace(GTLog.err);
                     }
                 }
             }
@@ -2206,7 +2201,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 long startTime = System.nanoTime();
                 double oldX = 0, oldY = 0, oldZ = 0;
                 if (debugEntityCramming && (aEvent.world.loadedEntityList.size() != 0)) {
-                    GT_Log.out.println("CRAM: Entity list size " + aEvent.world.loadedEntityList.size());
+                    GTLog.out.println("CRAM: Entity list size " + aEvent.world.loadedEntityList.size());
                 }
                 for (int i = 0; i < aEvent.world.loadedEntityList.size(); i++) {
                     if ((aEvent.world.loadedEntityList.get(i) instanceof Entity)) {
@@ -2235,7 +2230,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                                         // Cheeseball way of not receiving a bunch of spam caused by 1 location
                                         // obviously fails if there are crammed entities in more than one spot.
                                         if (tEntity.posX != oldX && tEntity.posY != oldY && tEntity.posZ != oldZ) {
-                                            GT_Log.out.println(
+                                            GTLog.out.println(
                                                 "CRAM: Excess entities: " + tEntityCount
                                                     + " at X "
                                                     + tEntity.posX
@@ -2256,12 +2251,12 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                     }
                 }
                 if (debugEntityCramming && (aEvent.world.loadedEntityList.size() != 0)) {
-                    GT_Log.out.println(
+                    GTLog.out.println(
                         "CRAM: Time spent checking " + (System.nanoTime() - startTime) / 1000 + " microseconds");
                 }
             }
 
-            GT_Pollution.onWorldTick(aEvent);
+            Pollution.onWorldTick(aEvent);
         }
     }
 
@@ -2274,7 +2269,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         }
     }
 
-    public static void registerRecipes(GT_Proxy.OreDictEventContainer aOre) {
+    public static void registerRecipes(GTProxy.OreDictEventContainer aOre) {
         if ((aOre.mEvent.Ore == null) || (aOre.mEvent.Ore.getItem() == null)
             || (aOre.mPrefix == null)
             || (aOre.mPrefix.isIgnored(aOre.mMaterial))) {
@@ -2288,7 +2283,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             aOre.mMaterial == null ? Materials._NULL : aOre.mMaterial,
             aOre.mEvent.Name,
             aOre.mModID,
-            GT_Utility.copyAmount(1, aOre.mEvent.Ore));
+            GTUtility.copyAmount(1, aOre.mEvent.Ore));
     }
 
     @SubscribeEvent
@@ -2303,9 +2298,9 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             aEvent.player.setGameType(GameType.ADVENTURE);
             aEvent.player.capabilities.allowEdit = false;
             if (this.mAxeWhenAdventure) {
-                GT_Utility.sendChatToPlayer(
+                GTUtility.sendChatToPlayer(
                     aEvent.player,
-                    GT_LanguageManager.addStringLocalization(
+                    GTLanguageManager.addStringLocalization(
                         "Interaction_DESCRIPTION_Index_097",
                         "It's dangerous to go alone! Take this."));
                 aEvent.player.worldObj.spawnEntityInWorld(
@@ -2314,8 +2309,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                         aEvent.player.posX,
                         aEvent.player.posY,
                         aEvent.player.posZ,
-                        GT_MetaGenerated_Tool_01.INSTANCE
-                            .getToolWithStats(ID_MetaTool_01.AXE.ID, 1, Materials.Flint, Materials.Wood, null)));
+                        MetaGeneratedTool01.INSTANCE
+                            .getToolWithStats(IDMetaTool01.AXE.ID, 1, Materials.Flint, Materials.Wood, null)));
             }
         }
         final boolean tHungerEffect = (this.mHungerEffect) && (aEvent.player.ticksExisted % 2400 == 1200);
@@ -2332,14 +2327,13 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             }
 
             if (!aEvent.player.capabilities.isCreativeMode) {
-                GT_Utility
-                    .applyRadioactivity(aEvent.player, GT_Utility.getRadioactivityLevel(tStack), tStack.stackSize);
-                final float tHeat = GT_Utility.getHeatDamageFromItem(tStack);
+                GTUtility.applyRadioactivity(aEvent.player, GTUtility.getRadioactivityLevel(tStack), tStack.stackSize);
+                final float tHeat = GTUtility.getHeatDamageFromItem(tStack);
                 if (tHeat != 0.0F) {
                     if (tHeat > 0.0F) {
-                        GT_Utility.applyHeatDamageFromItem(aEvent.player, tHeat, tStack);
+                        GTUtility.applyHeatDamageFromItem(aEvent.player, tHeat, tStack);
                     } else {
-                        GT_Utility.applyFrostDamage(aEvent.player, -tHeat);
+                        GTUtility.applyFrostDamage(aEvent.player, -tHeat);
                     }
                 }
             }
@@ -2347,7 +2341,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 tCount += tStack.stackSize * 64 / Math.max(1, tStack.getMaxStackSize());
             }
             if (this.mInventoryUnification) {
-                GT_OreDictUnificator.setStack(true, tStack);
+                GTOreDictUnificator.setStack(true, tStack);
             }
 
         }
@@ -2358,14 +2352,13 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             }
 
             if (!aEvent.player.capabilities.isCreativeMode) {
-                GT_Utility
-                    .applyRadioactivity(aEvent.player, GT_Utility.getRadioactivityLevel(tStack), tStack.stackSize);
-                final float tHeat = GT_Utility.getHeatDamageFromItem(tStack);
+                GTUtility.applyRadioactivity(aEvent.player, GTUtility.getRadioactivityLevel(tStack), tStack.stackSize);
+                final float tHeat = GTUtility.getHeatDamageFromItem(tStack);
                 if (tHeat != 0.0F) {
                     if (tHeat > 0.0F) {
-                        GT_Utility.applyHeatDamageFromItem(aEvent.player, tHeat, tStack);
+                        GTUtility.applyHeatDamageFromItem(aEvent.player, tHeat, tStack);
                     } else {
-                        GT_Utility.applyFrostDamage(aEvent.player, -tHeat);
+                        GTUtility.applyFrostDamage(aEvent.player, -tHeat);
                     }
                 }
             }
@@ -2379,11 +2372,11 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         }
     }
 
-    public GT_ClientPreference getClientPreference(UUID aPlayerID) {
+    public GTClientPreference getClientPreference(UUID aPlayerID) {
         return mClientPrefernces.get(aPlayerID);
     }
 
-    public void setClientPreference(UUID aPlayerID, GT_ClientPreference aPreference) {
+    public void setClientPreference(UUID aPlayerID, GTClientPreference aPreference) {
         mClientPrefernces.put(aPlayerID, aPreference);
     }
 
@@ -2399,8 +2392,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             return 0;
         }
         int rFuelValue = 0;
-        if ((aFuel.getItem() instanceof GT_MetaGenerated_Item)) {
-            final Short tFuelValue = ((GT_MetaGenerated_Item) aFuel.getItem()).mBurnValues
+        if ((aFuel.getItem() instanceof MetaGeneratedItem)) {
+            final Short tFuelValue = ((MetaGeneratedItem) aFuel.getItem()).mBurnValues
                 .get((short) aFuel.getItemDamage());
             if (tFuelValue != null) {
                 rFuelValue = Math.max(rFuelValue, tFuelValue);
@@ -2425,12 +2418,12 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         if (rFuelValue > 0) return rFuelValue;
 
         // Otherwise, a few more checks
-        if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.wooden_button, 1))) return 150;
-        else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.ladder, 1))) return 100;
-        else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.sign, 1))) return 600;
-        else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.wooden_door, 1))) return 600;
-        else if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_MSSFUEL.get(1))) return 150000;
-        else if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_SSFUEL.get(1))) return 100000;
+        if (GTUtility.areStacksEqual(aFuel, new ItemStack(Blocks.wooden_button, 1))) return 150;
+        else if (GTUtility.areStacksEqual(aFuel, new ItemStack(Blocks.ladder, 1))) return 100;
+        else if (GTUtility.areStacksEqual(aFuel, new ItemStack(Items.sign, 1))) return 600;
+        else if (GTUtility.areStacksEqual(aFuel, new ItemStack(Items.wooden_door, 1))) return 600;
+        else if (GTUtility.areStacksEqual(aFuel, ItemList.Block_MSSFUEL.get(1))) return 150000;
+        else if (GTUtility.areStacksEqual(aFuel, ItemList.Block_SSFUEL.get(1))) return 100000;
 
         return 0;
     }
@@ -2444,14 +2437,14 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         final String fluidTexture = aMaterial.mIconSet.is_custom ? "fluid." + aMaterial.mName.toLowerCase()
             : "autogenerated";
 
-        return GT_FluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH))
+        return GTFluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH))
             .withLocalizedName(aMaterial.mDefaultLocalName)
             .withTextureName(fluidTexture)
             .withColorRGBA(aMaterial.mRGBa)
             .withStateAndTemperature(LIQUID, aMaterial.getLiquidTemperature())
             .buildAndRegister()
             .configureMaterials(aMaterial)
-            .registerBContainers(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L))
+            .registerBContainers(GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L))
             .asFluid();
     }
 
@@ -2462,14 +2455,14 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         final String fluidTexture = aMaterial.mIconSet.is_custom ? ("gas." + aMaterial.mName.toLowerCase())
             : "autogenerated";
 
-        return GT_FluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH))
+        return GTFluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH))
             .withLocalizedName(aMaterial.mDefaultLocalName)
             .withTextureName(fluidTexture)
             .withColorRGBA(aMaterial.mRGBa)
             .withStateAndTemperature(GAS, aMaterial.getGasTemperature())
             .buildAndRegister()
             .configureMaterials(aMaterial)
-            .registerBContainers(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L))
+            .registerBContainers(GTOreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L))
             .asFluid();
     }
 
@@ -2480,7 +2473,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         final String fluidTexture = aMaterial.mIconSet.is_custom ? ("plasma." + aMaterial.mName.toLowerCase())
             : "plasma.autogenerated";
 
-        return GT_FluidFactory.builder("plasma." + aMaterial.mName.toLowerCase(Locale.ENGLISH))
+        return GTFluidFactory.builder("plasma." + aMaterial.mName.toLowerCase(Locale.ENGLISH))
             .withLocalizedName(aMaterial.mDefaultLocalName + " Plasma")
             .withTextureName(fluidTexture)
             .withColorRGBA(aMaterial.mMoltenRGBa)
@@ -2488,7 +2481,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             .buildAndRegister()
             .configureMaterials(aMaterial)
             .registerContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L),
                 ItemList.Cell_Empty.get(1L),
                 aMaterial.getMolten(1) != null ? 144 : 1000)
             .asFluid();
@@ -2501,7 +2494,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         final String fluidTexture = aMaterial.mIconSet.is_custom ? ("molten." + aMaterial.mName.toLowerCase())
             : "molten.autogenerated";
 
-        return GT_FluidFactory.builder("molten." + aMaterial.mName.toLowerCase(Locale.ENGLISH))
+        return GTFluidFactory.builder("molten." + aMaterial.mName.toLowerCase(Locale.ENGLISH))
             .withLocalizedName("Molten " + aMaterial.mDefaultLocalName)
             .withTextureName(fluidTexture)
             .withColorRGBA(aMaterial.mMoltenRGBa)
@@ -2509,7 +2502,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             .buildAndRegister()
             .configureMaterials(aMaterial)
             .registerContainers(
-                GT_OreDictUnificator.get(OrePrefixes.cellMolten, aMaterial, 1L),
+                GTOreDictUnificator.get(OrePrefixes.cellMolten, aMaterial, 1L),
                 ItemList.Cell_Empty.get(1L),
                 144)
             .asFluid();
@@ -2529,28 +2522,28 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             uncrackedFluid = aMaterial.mGas;
         } else return;
         for (int i = 0; i < 3; i++) {
-            crackedFluids[i] = GT_FluidFactory.builder(namePrefixes[i] + aMaterial.mName.toLowerCase(Locale.ENGLISH))
+            crackedFluids[i] = GTFluidFactory.builder(namePrefixes[i] + aMaterial.mName.toLowerCase(Locale.ENGLISH))
                 .withIconsFrom(uncrackedFluid)
                 .withLocalizedName(orePrefixes[i].mLocalizedMaterialPre + aMaterial.mDefaultLocalName)
                 .withColorRGBA(aMaterial.mRGBa)
                 .withStateAndTemperature(GAS, 775)
                 .buildAndRegister()
                 .registerBContainers(
-                    GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L),
+                    GTOreDictUnificator.get(orePrefixes[i], aMaterial, 1L),
                     ItemList.Cell_Empty.get(1L))
                 .asFluid();
 
             int hydrogenAmount = 2 * i + 2;
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(i + 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(i + 1))
                 .fluidInputs(new FluidStack(uncrackedFluid, 1000), Materials.Hydrogen.getGas(hydrogenAmount * 800))
                 .fluidOutputs(new FluidStack(crackedFluids[i], 1000))
                 .duration((1 + i) * SECONDS)
                 .eut(240)
                 .addTo(crackingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(Materials.Hydrogen.getCells(hydrogenAmount), GT_Utility.getIntegratedCircuit(i + 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(Materials.Hydrogen.getCells(hydrogenAmount), GTUtility.getIntegratedCircuit(i + 1))
                 .itemOutputs(Materials.Empty.getCells(hydrogenAmount))
                 .fluidInputs(new FluidStack(uncrackedFluid, 1000))
                 .fluidOutputs(new FluidStack(crackedFluids[i], 800))
@@ -2558,8 +2551,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 .eut(TierEU.RECIPE_LV)
                 .addTo(RecipeMaps.chemicalReactorRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(aMaterial.getCells(1), GT_Utility.getIntegratedCircuit(i + 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(aMaterial.getCells(1), GTUtility.getIntegratedCircuit(i + 1))
                 .itemOutputs(Materials.Empty.getCells(1))
                 .fluidInputs(Materials.Hydrogen.getGas(hydrogenAmount * 1000))
                 .fluidOutputs(new FluidStack(crackedFluids[i], 800))
@@ -2567,8 +2560,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 .eut(TierEU.RECIPE_LV)
                 .addTo(RecipeMaps.chemicalReactorRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(i + 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(i + 1))
                 .fluidInputs(new FluidStack(uncrackedFluid, 1000), Materials.Hydrogen.getGas(hydrogenAmount * 1000))
                 .fluidOutputs(new FluidStack(crackedFluids[i], 800))
                 .duration((4 + 2 * i) * SECONDS)
@@ -2590,27 +2583,27 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             uncrackedFluid = aMaterial.mGas;
         } else return;
         for (int i = 0; i < 3; i++) {
-            crackedFluids[i] = GT_FluidFactory.builder(namePrefixes[i] + aMaterial.mName.toLowerCase(Locale.ENGLISH))
+            crackedFluids[i] = GTFluidFactory.builder(namePrefixes[i] + aMaterial.mName.toLowerCase(Locale.ENGLISH))
                 .withIconsFrom(uncrackedFluid)
                 .withLocalizedName(orePrefixes[i].mLocalizedMaterialPre + aMaterial.mDefaultLocalName)
                 .withColorRGBA(aMaterial.mRGBa)
                 .withStateAndTemperature(GAS, 775)
                 .buildAndRegister()
                 .registerBContainers(
-                    GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L),
+                    GTOreDictUnificator.get(orePrefixes[i], aMaterial, 1L),
                     ItemList.Cell_Empty.get(1L))
                 .asFluid();
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(i + 1))
-                .fluidInputs(new FluidStack(uncrackedFluid, 1000), GT_ModHandler.getSteam(1000))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(i + 1))
+                .fluidInputs(new FluidStack(uncrackedFluid, 1000), GTModHandler.getSteam(1000))
                 .fluidOutputs(new FluidStack(crackedFluids[i], 1200))
                 .duration((1 + i) * SECONDS)
                 .eut(240)
                 .addTo(crackingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_ModHandler.getIC2Item("steamCell", 1L), GT_Utility.getIntegratedCircuit(i + 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTModHandler.getIC2Item("steamCell", 1L), GTUtility.getIntegratedCircuit(i + 1))
                 .itemOutputs(Materials.Empty.getCells(1))
                 .fluidInputs(new FluidStack(uncrackedFluid, 1000))
                 .fluidOutputs(new FluidStack(crackedFluids[i], 800))
@@ -2618,17 +2611,17 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 .eut(TierEU.RECIPE_LV)
                 .addTo(RecipeMaps.chemicalReactorRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(aMaterial.getCells(1), GT_Utility.getIntegratedCircuit(i + 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(aMaterial.getCells(1), GTUtility.getIntegratedCircuit(i + 1))
                 .itemOutputs(Materials.Empty.getCells(1))
-                .fluidInputs(GT_ModHandler.getSteam(1000))
+                .fluidInputs(GTModHandler.getSteam(1000))
                 .fluidOutputs(new FluidStack(crackedFluids[i], 800))
                 .duration((8 + 4 * i) * SECONDS)
                 .eut(TierEU.RECIPE_LV)
                 .addTo(RecipeMaps.chemicalReactorRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(aMaterial.getCells(1), GT_Utility.getIntegratedCircuit(i + 1))
+            GTValues.RA.stdBuilder()
+                .itemInputs(aMaterial.getCells(1), GTUtility.getIntegratedCircuit(i + 1))
                 .itemOutputs(Materials.Empty.getCells(1))
                 .fluidInputs(getFluidStack("ic2steam", 1000))
                 .fluidOutputs(new FluidStack(crackedFluids[i], 800))
@@ -2636,9 +2629,9 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 .eut(TierEU.RECIPE_LV)
                 .addTo(RecipeMaps.chemicalReactorRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(i + 1))
-                .fluidInputs(new FluidStack(uncrackedFluid, 1000), GT_ModHandler.getSteam(1000))
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.getIntegratedCircuit(i + 1))
+                .fluidInputs(new FluidStack(uncrackedFluid, 1000), GTModHandler.getSteam(1000))
                 .fluidOutputs(new FluidStack(crackedFluids[i], 800))
                 .duration((4 + 2 * i) * SECONDS)
                 .eut(TierEU.RECIPE_HV)
@@ -2648,23 +2641,23 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     }
 
     /**
-     * @see GT_FluidFactory#of(String, String, Materials, FluidState, int)
-     * @see GT_FluidFactory#of(String, String, FluidState, int)
-     * @deprecated use {@link GT_FluidFactory#builder}
+     * @see GTFluidFactory#of(String, String, Materials, FluidState, int)
+     * @see GTFluidFactory#of(String, String, FluidState, int)
+     * @deprecated use {@link GTFluidFactory#builder}
      */
     @Deprecated
     public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, int aState, int aTemperatureK) {
-        return GT_FluidFactory.of(aName, aLocalized, aMaterial, FluidState.VALID_STATES[aState], aTemperatureK);
+        return GTFluidFactory.of(aName, aLocalized, aMaterial, FluidState.VALID_STATES[aState], aTemperatureK);
     }
 
     /**
-     * @deprecated use {@link GT_FluidFactory#builder}
+     * @deprecated use {@link GTFluidFactory#builder}
      */
     @SuppressWarnings({ "MethodWithTooManyParameters" }) // Deprecated method
     @Deprecated
     public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, int aState, int aTemperatureK,
         ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) {
-        return GT_FluidFactory.builder(aName)
+        return GTFluidFactory.builder(aName)
             .withLocalizedName(aLocalized)
             .withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK)
             .buildAndRegister()
@@ -2674,13 +2667,13 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     }
 
     /**
-     * @deprecated use {@link GT_FluidFactory#builder}
+     * @deprecated use {@link GTFluidFactory#builder}
      */
     @Deprecated
     @SuppressWarnings({ "MethodWithTooManyParameters" }) // Deprecated method
     public Fluid addFluid(String aName, String aTexture, String aLocalized, Materials aMaterial, short[] aRGBa,
         int aState, int aTemperatureK, ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) {
-        return GT_FluidFactory.builder(aName)
+        return GTFluidFactory.builder(aName)
             .withLocalizedName(aLocalized)
             .withStillIconResourceLocation(new ResourceLocation(GregTech.ID, "fluids/fluid." + aTexture))
             .withColorRGBA(aRGBa)
@@ -2706,9 +2699,9 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     }
 
     public void registerUnificationEntries() {
-        GT_OreDictUnificator.resetUnificationEntries();
+        GTOreDictUnificator.resetUnificationEntries();
         for (OreDictEventContainer tOre : this.mEvents) {
-            if ((!(tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null)
+            if ((!(tOre.mEvent.Ore.getItem() instanceof MetaGeneratedItem)) && (tOre.mPrefix != null)
                 && (tOre.mPrefix.mIsUnificatable)
                 && (tOre.mMaterial != null)) {
                 boolean checkModID = tOre.mModID != null;
@@ -2716,8 +2709,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 if (checkModID) {
                     if (tOre.mModID.equals(Names.ENDER_I_O)) {
                         if (tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.DarkSteel) {
-                            GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                            GT_OreDictUnificator.set(
+                            GTOreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+                            GTOreDictUnificator.set(
                                 tOre.mPrefix,
                                 tOre.mMaterial,
                                 tOre.mEvent.Ore,
@@ -2727,11 +2720,11 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                         }
                     }
                 }
-                if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {
-                    GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true);
+                if (GTOreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {
+                    GTOreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true);
                 } else {
-                    GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                    GT_OreDictUnificator.set(
+                    GTOreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+                    GTOreDictUnificator.set(
                         tOre.mPrefix,
                         tOre.mMaterial,
                         tOre.mEvent.Ore,
@@ -2742,14 +2735,14 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         }
 
         for (OreDictEventContainer tOre : this.mEvents) {
-            if (((tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null)
+            if (((tOre.mEvent.Ore.getItem() instanceof MetaGeneratedItem)) && (tOre.mPrefix != null)
                 && (tOre.mPrefix.mIsUnificatable)
                 && (tOre.mMaterial != null)) {
-                if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {
-                    GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true);
+                if (GTOreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {
+                    GTOreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true);
                 } else {
-                    GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                    GT_OreDictUnificator.set(
+                    GTOreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+                    GTOreDictUnificator.set(
                         tOre.mPrefix,
                         tOre.mMaterial,
                         tOre.mEvent.Ore,
@@ -2759,8 +2752,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 }
             }
         }
-        GregTech_API.sUnificationEntriesRegistered = true;
-        GT_Recipe.reInit();
+        GregTechAPI.sUnificationEntriesRegistered = true;
+        GTRecipe.reInit();
     }
 
     @SuppressWarnings("deprecation")
@@ -2769,13 +2762,13 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         ProgressManager.ProgressBar progressBar = ProgressManager.push("Register materials", mEvents.size());
 
         if (BetterLoadingScreen.isModLoaded()) {
-            GT_Values.cls_enabled = true;
+            GTValues.cls_enabled = true;
             try {
-                GT_CLS_Compat.stepMaterialsCLS(mEvents, progressBar);
+                GTCLSCompat.stepMaterialsCLS(mEvents, progressBar);
             } catch (IllegalAccessException e) {
                 GT_FML_LOGGER.catching(e);
             }
-        } else GT_Proxy.stepMaterialsVanilla(this.mEvents, progressBar);
+        } else GTProxy.stepMaterialsVanilla(this.mEvents, progressBar);
     }
 
     @Deprecated
@@ -2786,7 +2779,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     // is
     // loaded/saved
 
-    public static final HashMap<Integer, GT_Pollution> dimensionWisePollution = new HashMap<>(16); // stores
+    public static final HashMap<Integer, Pollution> dimensionWisePollution = new HashMap<>(16); // stores
     // GT_Polluttors
     // objects
     public static final byte GTOIL = 3, GTOILFLUID = 2, GTPOLLUTION = 1, GTMETADATA = 0, NOT_LOADED = 0, LOADED = 1; // consts
@@ -2804,16 +2797,16 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
 
     @SubscribeEvent
     public void handleChunkLoadEvent(ChunkDataEvent.Load event) {
-        GT_UndergroundOil.migrate(event);
-        GT_Pollution.migrate(event);
+        UndergroundOil.migrate(event);
+        Pollution.migrate(event);
     }
 
     @SubscribeEvent
     public void onBlockBreakSpeedEvent(PlayerEvent.BreakSpeed aEvent) {
         if (aEvent.entityPlayer != null) {
             ItemStack aStack = aEvent.entityPlayer.getCurrentEquippedItem();
-            if ((aStack != null) && ((aStack.getItem() instanceof GT_MetaGenerated_Tool))) {
-                aEvent.newSpeed = ((GT_MetaGenerated_Tool) aStack.getItem()).onBlockBreakSpeedEvent(
+            if ((aStack != null) && ((aStack.getItem() instanceof MetaGeneratedTool))) {
+                aEvent.newSpeed = ((MetaGeneratedTool) aStack.getItem()).onBlockBreakSpeedEvent(
                     aEvent.newSpeed,
                     aStack,
                     aEvent.entityPlayer,
@@ -2846,43 +2839,43 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     @SubscribeEvent
     public void onBlockEvent(BlockEvent event) {
         if (event.block.getUnlocalizedName()
-            .equals("blockAlloyGlass")) GregTech_API.causeMachineUpdate(event.world, event.x, event.y, event.z);
+            .equals("blockAlloyGlass")) GregTechAPI.causeMachineUpdate(event.world, event.x, event.y, event.z);
     }
 
     public static void addFullHazmatToGeneralItem(String aModID, String aItem, long aAmount, int aMeta) {
-        ItemStack item = GT_ModHandler.getModItem(aModID, aItem, aAmount, aMeta);
+        ItemStack item = GTModHandler.getModItem(aModID, aItem, aAmount, aMeta);
         addItemToHazmatLists(item);
     }
 
     public static void addFullHazmatToGeneralItem(String aModID, String aItem, long aAmount) {
-        ItemStack item = GT_ModHandler.getModItem(aModID, aItem, aAmount, W);
+        ItemStack item = GTModHandler.getModItem(aModID, aItem, aAmount, W);
         addItemToHazmatLists(item);
     }
 
     public static void addFullHazmatToIC2Item(String aItem) {
-        ItemStack item = GT_ModHandler.getIC2Item(aItem, 1L, W);
+        ItemStack item = GTModHandler.getIC2Item(aItem, 1L, W);
         addItemToHazmatLists(item);
     }
 
     private static void addItemToHazmatLists(ItemStack item) {
-        GregTech_API.sGasHazmatList.add(item);
-        GregTech_API.sBioHazmatList.add(item);
-        GregTech_API.sFrostHazmatList.add(item);
-        GregTech_API.sHeatHazmatList.add(item);
-        GregTech_API.sRadioHazmatList.add(item);
-        GregTech_API.sElectroHazmatList.add(item);
+        GregTechAPI.sGasHazmatList.add(item);
+        GregTechAPI.sBioHazmatList.add(item);
+        GregTechAPI.sFrostHazmatList.add(item);
+        GregTechAPI.sHeatHazmatList.add(item);
+        GregTechAPI.sRadioHazmatList.add(item);
+        GregTechAPI.sElectroHazmatList.add(item);
     }
 
     public static boolean providesProtection(ItemStack aStack) {
 
-        if (GT_Utility.hasHazmatEnchant(aStack)) return true;
+        if (GTUtility.hasHazmatEnchant(aStack)) return true;
 
-        boolean isGas = GT_Utility.isStackInList(aStack, GregTech_API.sGasHazmatList);
-        boolean isBio = GT_Utility.isStackInList(aStack, GregTech_API.sBioHazmatList);
-        boolean isFrost = GT_Utility.isStackInList(aStack, GregTech_API.sFrostHazmatList);
-        boolean isHeat = GT_Utility.isStackInList(aStack, GregTech_API.sHeatHazmatList);
-        boolean isRadio = GT_Utility.isStackInList(aStack, GregTech_API.sRadioHazmatList);
-        boolean isElectro = GT_Utility.isStackInList(aStack, GregTech_API.sElectroHazmatList);
+        boolean isGas = GTUtility.isStackInList(aStack, GregTechAPI.sGasHazmatList);
+        boolean isBio = GTUtility.isStackInList(aStack, GregTechAPI.sBioHazmatList);
+        boolean isFrost = GTUtility.isStackInList(aStack, GregTechAPI.sFrostHazmatList);
+        boolean isHeat = GTUtility.isStackInList(aStack, GregTechAPI.sHeatHazmatList);
+        boolean isRadio = GTUtility.isStackInList(aStack, GregTechAPI.sRadioHazmatList);
+        boolean isElectro = GTUtility.isStackInList(aStack, GregTechAPI.sElectroHazmatList);
         return isGas && isBio && isFrost && isHeat && isRadio && isElectro;
     }
 
@@ -2890,7 +2883,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public void onItemTooltip(ItemTooltipEvent event) {
         if (event.itemStack != null) {
             ItemStack aStackTemp = event.itemStack;
-            GT_ItemStack aStack = new GT_ItemStack(aStackTemp);
+            GTItemStack aStack = new GTItemStack(aStackTemp);
             if (providesProtection(aStackTemp)) {
                 event.toolTip.add(EnumChatFormatting.LIGHT_PURPLE + "Provides full hazmat protection.");
             }
diff --git a/src/main/java/gregtech/common/GT_Server.java b/src/main/java/gregtech/common/GTServer.java
index 1a2d8e6b5a..b9758ac657 100644
--- a/src/main/java/gregtech/common/GT_Server.java
+++ b/src/main/java/gregtech/common/GTServer.java
@@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-public class GT_Server extends GT_Proxy {
+public class GTServer extends GTProxy {
 
     @Override
     public boolean isServerSide() {
diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GTThaumcraftCompat.java
index 43c3dce569..7f8c6dd8c7 100644
--- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
+++ b/src/main/java/gregtech/common/GTThaumcraftCompat.java
@@ -11,10 +11,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.ResourceLocation;
 
-import gregtech.api.enums.TC_Aspects;
+import gregtech.api.enums.TCAspects;
 import gregtech.api.interfaces.internal.IThaumcraftCompat;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import thaumcraft.api.ThaumcraftApi;
 import thaumcraft.api.ThaumcraftApiHelper;
 import thaumcraft.api.aspects.Aspect;
@@ -28,101 +28,101 @@ import thaumcraft.api.research.ResearchCategoryList;
 import thaumcraft.api.research.ResearchItem;
 import thaumcraft.api.research.ResearchPage;
 
-public class GT_ThaumcraftCompat implements IThaumcraftCompat {
+public class GTThaumcraftCompat implements IThaumcraftCompat {
 
-    public GT_ThaumcraftCompat() {
-        TC_Aspects.AER.mAspect = Aspect.AIR;
-        TC_Aspects.ALIENIS.mAspect = Aspect.ELDRITCH;
-        TC_Aspects.AQUA.mAspect = Aspect.WATER;
-        TC_Aspects.ARBOR.mAspect = Aspect.TREE;
-        TC_Aspects.AURAM.mAspect = Aspect.AURA;
-        TC_Aspects.BESTIA.mAspect = Aspect.BEAST;
-        TC_Aspects.COGNITIO.mAspect = Aspect.MIND;
-        TC_Aspects.CORPUS.mAspect = Aspect.FLESH;
-        TC_Aspects.EXANIMIS.mAspect = Aspect.UNDEAD;
-        TC_Aspects.FABRICO.mAspect = Aspect.CRAFT;
-        TC_Aspects.FAMES.mAspect = Aspect.HUNGER;
-        TC_Aspects.GELUM.mAspect = Aspect.COLD;
-        TC_Aspects.GRANUM.mAspect = Aspect.PLANT;
-        TC_Aspects.HERBA.mAspect = Aspect.PLANT;
-        TC_Aspects.HUMANUS.mAspect = Aspect.MAN;
-        TC_Aspects.IGNIS.mAspect = Aspect.FIRE;
-        TC_Aspects.INSTRUMENTUM.mAspect = Aspect.TOOL;
-        TC_Aspects.ITER.mAspect = Aspect.TRAVEL;
-        TC_Aspects.LIMUS.mAspect = Aspect.SLIME;
-        TC_Aspects.LUCRUM.mAspect = Aspect.GREED;
-        TC_Aspects.LUX.mAspect = Aspect.LIGHT;
-        TC_Aspects.MACHINA.mAspect = Aspect.MECHANISM;
-        TC_Aspects.MESSIS.mAspect = Aspect.CROP;
-        TC_Aspects.METALLUM.mAspect = Aspect.METAL;
-        TC_Aspects.METO.mAspect = Aspect.HARVEST;
-        TC_Aspects.MORTUUS.mAspect = Aspect.DEATH;
-        TC_Aspects.MOTUS.mAspect = Aspect.MOTION;
-        TC_Aspects.ORDO.mAspect = Aspect.ORDER;
-        TC_Aspects.PANNUS.mAspect = Aspect.CLOTH;
-        TC_Aspects.PERDITIO.mAspect = Aspect.ENTROPY;
-        TC_Aspects.PERFODIO.mAspect = Aspect.MINE;
-        TC_Aspects.PERMUTATIO.mAspect = Aspect.EXCHANGE;
-        TC_Aspects.POTENTIA.mAspect = Aspect.ENERGY;
-        TC_Aspects.PRAECANTATIO.mAspect = Aspect.MAGIC;
-        TC_Aspects.SANO.mAspect = Aspect.HEAL;
-        TC_Aspects.SENSUS.mAspect = Aspect.SENSES;
-        TC_Aspects.SPIRITUS.mAspect = Aspect.SOUL;
-        TC_Aspects.TELUM.mAspect = Aspect.WEAPON;
-        TC_Aspects.TERRA.mAspect = Aspect.EARTH;
-        TC_Aspects.TEMPESTAS.mAspect = Aspect.WEATHER;
-        TC_Aspects.TENEBRAE.mAspect = Aspect.DARKNESS;
-        TC_Aspects.TUTAMEN.mAspect = Aspect.ARMOR;
-        TC_Aspects.VACUOS.mAspect = Aspect.VOID;
-        TC_Aspects.VENENUM.mAspect = Aspect.POISON;
-        TC_Aspects.VICTUS.mAspect = Aspect.LIFE;
-        TC_Aspects.VINCULUM.mAspect = Aspect.TRAP;
-        TC_Aspects.VITIUM.mAspect = Aspect.TAINT;
-        TC_Aspects.VITREUS.mAspect = Aspect.CRYSTAL;
-        TC_Aspects.VOLATUS.mAspect = Aspect.FLIGHT;
+    public GTThaumcraftCompat() {
+        TCAspects.AER.mAspect = Aspect.AIR;
+        TCAspects.ALIENIS.mAspect = Aspect.ELDRITCH;
+        TCAspects.AQUA.mAspect = Aspect.WATER;
+        TCAspects.ARBOR.mAspect = Aspect.TREE;
+        TCAspects.AURAM.mAspect = Aspect.AURA;
+        TCAspects.BESTIA.mAspect = Aspect.BEAST;
+        TCAspects.COGNITIO.mAspect = Aspect.MIND;
+        TCAspects.CORPUS.mAspect = Aspect.FLESH;
+        TCAspects.EXANIMIS.mAspect = Aspect.UNDEAD;
+        TCAspects.FABRICO.mAspect = Aspect.CRAFT;
+        TCAspects.FAMES.mAspect = Aspect.HUNGER;
+        TCAspects.GELUM.mAspect = Aspect.COLD;
+        TCAspects.GRANUM.mAspect = Aspect.PLANT;
+        TCAspects.HERBA.mAspect = Aspect.PLANT;
+        TCAspects.HUMANUS.mAspect = Aspect.MAN;
+        TCAspects.IGNIS.mAspect = Aspect.FIRE;
+        TCAspects.INSTRUMENTUM.mAspect = Aspect.TOOL;
+        TCAspects.ITER.mAspect = Aspect.TRAVEL;
+        TCAspects.LIMUS.mAspect = Aspect.SLIME;
+        TCAspects.LUCRUM.mAspect = Aspect.GREED;
+        TCAspects.LUX.mAspect = Aspect.LIGHT;
+        TCAspects.MACHINA.mAspect = Aspect.MECHANISM;
+        TCAspects.MESSIS.mAspect = Aspect.CROP;
+        TCAspects.METALLUM.mAspect = Aspect.METAL;
+        TCAspects.METO.mAspect = Aspect.HARVEST;
+        TCAspects.MORTUUS.mAspect = Aspect.DEATH;
+        TCAspects.MOTUS.mAspect = Aspect.MOTION;
+        TCAspects.ORDO.mAspect = Aspect.ORDER;
+        TCAspects.PANNUS.mAspect = Aspect.CLOTH;
+        TCAspects.PERDITIO.mAspect = Aspect.ENTROPY;
+        TCAspects.PERFODIO.mAspect = Aspect.MINE;
+        TCAspects.PERMUTATIO.mAspect = Aspect.EXCHANGE;
+        TCAspects.POTENTIA.mAspect = Aspect.ENERGY;
+        TCAspects.PRAECANTATIO.mAspect = Aspect.MAGIC;
+        TCAspects.SANO.mAspect = Aspect.HEAL;
+        TCAspects.SENSUS.mAspect = Aspect.SENSES;
+        TCAspects.SPIRITUS.mAspect = Aspect.SOUL;
+        TCAspects.TELUM.mAspect = Aspect.WEAPON;
+        TCAspects.TERRA.mAspect = Aspect.EARTH;
+        TCAspects.TEMPESTAS.mAspect = Aspect.WEATHER;
+        TCAspects.TENEBRAE.mAspect = Aspect.DARKNESS;
+        TCAspects.TUTAMEN.mAspect = Aspect.ARMOR;
+        TCAspects.VACUOS.mAspect = Aspect.VOID;
+        TCAspects.VENENUM.mAspect = Aspect.POISON;
+        TCAspects.VICTUS.mAspect = Aspect.LIFE;
+        TCAspects.VINCULUM.mAspect = Aspect.TRAP;
+        TCAspects.VITIUM.mAspect = Aspect.TAINT;
+        TCAspects.VITREUS.mAspect = Aspect.CRYSTAL;
+        TCAspects.VOLATUS.mAspect = Aspect.FLIGHT;
 
-        TC_Aspects.STRONTIO.mAspect = new Aspect(
+        TCAspects.STRONTIO.mAspect = new Aspect(
             "strontio",
             0xEEC2B3,
             new Aspect[] { Aspect.MIND, Aspect.ENTROPY },
-            new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.STRONTIO.name() + ".png"),
+            new ResourceLocation("gregtech:textures/aspects/" + TCAspects.STRONTIO.name() + ".png"),
             1);
-        TC_Aspects.NEBRISUM.mAspect = new Aspect(
+        TCAspects.NEBRISUM.mAspect = new Aspect(
             "nebrisum",
             0xEEEE7E,
             new Aspect[] { Aspect.MINE, Aspect.GREED },
-            new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.NEBRISUM.name() + ".png"),
+            new ResourceLocation("gregtech:textures/aspects/" + TCAspects.NEBRISUM.name() + ".png"),
             1);
-        TC_Aspects.ELECTRUM.mAspect = new Aspect(
+        TCAspects.ELECTRUM.mAspect = new Aspect(
             "electrum",
             0xC0EEEE,
             new Aspect[] { Aspect.ENERGY, Aspect.MECHANISM },
-            new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.ELECTRUM.name() + ".png"),
+            new ResourceLocation("gregtech:textures/aspects/" + TCAspects.ELECTRUM.name() + ".png"),
             1);
-        TC_Aspects.MAGNETO.mAspect = new Aspect(
+        TCAspects.MAGNETO.mAspect = new Aspect(
             "magneto",
             0xC0C0C0,
             new Aspect[] { Aspect.METAL, Aspect.TRAVEL },
-            new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.MAGNETO.name() + ".png"),
+            new ResourceLocation("gregtech:textures/aspects/" + TCAspects.MAGNETO.name() + ".png"),
             1);
-        TC_Aspects.RADIO.mAspect = new Aspect(
+        TCAspects.RADIO.mAspect = new Aspect(
             "radio",
             0xC0FFC0,
             new Aspect[] { Aspect.LIGHT, Aspect.ENERGY },
-            new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.RADIO.name() + ".png"),
+            new ResourceLocation("gregtech:textures/aspects/" + TCAspects.RADIO.name() + ".png"),
             1);
 
-        GT_LanguageManager.addStringLocalization("tc.aspect.strontio", "Stupidness, Incompetence");
-        GT_LanguageManager.addStringLocalization("tc.aspect.nebrisum", "Cheatyness, Raiding");
-        GT_LanguageManager.addStringLocalization("tc.aspect.electrum", "Electricity, Lightning");
-        GT_LanguageManager.addStringLocalization("tc.aspect.magneto", "Magnetism, Attraction");
-        GT_LanguageManager.addStringLocalization("tc.aspect.radio", "Radiation");
+        GTLanguageManager.addStringLocalization("tc.aspect.strontio", "Stupidness, Incompetence");
+        GTLanguageManager.addStringLocalization("tc.aspect.nebrisum", "Cheatyness, Raiding");
+        GTLanguageManager.addStringLocalization("tc.aspect.electrum", "Electricity, Lightning");
+        GTLanguageManager.addStringLocalization("tc.aspect.magneto", "Magnetism, Attraction");
+        GTLanguageManager.addStringLocalization("tc.aspect.radio", "Radiation");
     }
 
-    private static AspectList getAspectList(List<TC_Aspects.TC_AspectStack> aAspects) {
+    private static AspectList getAspectList(List<TCAspects.TC_AspectStack> aAspects) {
         AspectList rAspects = new AspectList();
-        TC_Aspects.TC_AspectStack tAspect;
-        for (Iterator<TC_Aspects.TC_AspectStack> i$ = aAspects.iterator(); i$.hasNext(); rAspects
+        TCAspects.TC_AspectStack tAspect;
+        for (Iterator<TCAspects.TC_AspectStack> i$ = aAspects.iterator(); i$.hasNext(); rAspects
             .add((Aspect) tAspect.mAspect.mAspect, (int) tAspect.mAmount)) {
             tAspect = i$.next();
         }
@@ -132,7 +132,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat {
     @Override
     public Object addResearch(String aResearch, String aName, String aText, String[] aParentResearches,
         String aCategory, ItemStack aIcon, int aComplexity, int aType, int aX, int aY,
-        List<TC_Aspects.TC_AspectStack> aAspects, ItemStack[] aResearchTriggers, Object[] aPages) {
+        List<TCAspects.TC_AspectStack> aAspects, ItemStack[] aResearchTriggers, Object[] aPages) {
         ResearchCategoryList tCategory = ResearchCategories.getResearchList(aCategory);
         if (tCategory == null) {
             return null;
@@ -152,8 +152,8 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat {
             aComplexity,
             aIcon);
         ArrayList<ResearchPage> tPages = new ArrayList<>(aPages.length);
-        GT_LanguageManager.addStringLocalization("tc.research_name." + aResearch, aName);
-        GT_LanguageManager.addStringLocalization("tc.research_text." + aResearch, "[GT] " + aText);
+        GTLanguageManager.addStringLocalization("tc.research_name." + aResearch, aName);
+        GTLanguageManager.addStringLocalization("tc.research_text." + aResearch, "[GT] " + aText);
         for (Object tPage : aPages) {
             if ((tPage instanceof String)) {
                 tPages.add(new ResearchPage((String) tPage));
@@ -208,8 +208,8 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat {
 
     @Override
     public Object addCrucibleRecipe(String aResearch, Object aInput, ItemStack aOutput,
-        List<TC_Aspects.TC_AspectStack> aAspects) {
-        if ((GT_Utility.isStringInvalid(aResearch)) || (aInput == null)
+        List<TCAspects.TC_AspectStack> aAspects) {
+        if ((GTUtility.isStringInvalid(aResearch)) || (aInput == null)
             || (aOutput == null)
             || (aAspects == null)
             || (aAspects.isEmpty())) {
@@ -217,15 +217,15 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat {
         }
         return ThaumcraftApi.addCrucibleRecipe(
             aResearch,
-            GT_Utility.copyOrNull(aOutput),
+            GTUtility.copyOrNull(aOutput),
             ((aInput instanceof ItemStack)) || ((aInput instanceof ArrayList)) ? aInput : aInput.toString(),
             getAspectList(aAspects));
     }
 
     @Override
     public Object addInfusionRecipe(String aResearch, ItemStack aMainInput, ItemStack[] aSideInputs, ItemStack aOutput,
-        int aInstability, List<TC_Aspects.TC_AspectStack> aAspects) {
-        if ((GT_Utility.isStringInvalid(aResearch)) || (aMainInput == null)
+        int aInstability, List<TCAspects.TC_AspectStack> aAspects) {
+        if ((GTUtility.isStringInvalid(aResearch)) || (aMainInput == null)
             || (aSideInputs == null)
             || (aOutput == null)
             || (aAspects == null)
@@ -234,7 +234,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat {
         }
         return ThaumcraftApi.addInfusionCraftingRecipe(
             aResearch,
-            GT_Utility.copyOrNull(aOutput),
+            GTUtility.copyOrNull(aOutput),
             aInstability,
             getAspectList(aAspects),
             aMainInput,
@@ -243,8 +243,8 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat {
 
     @Override
     public Object addInfusionEnchantmentRecipe(String aResearch, Enchantment aEnchantment, int aInstability,
-        List<TC_Aspects.TC_AspectStack> aAspects, ItemStack[] aSideInputs) {
-        if ((GT_Utility.isStringInvalid(aResearch)) || (aSideInputs == null)
+        List<TCAspects.TC_AspectStack> aAspects, ItemStack[] aSideInputs) {
+        if ((GTUtility.isStringInvalid(aResearch)) || (aSideInputs == null)
             || (aAspects == null)
             || (aEnchantment == null)
             || (aAspects.isEmpty())) {
@@ -255,7 +255,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat {
     }
 
     @Override
-    public boolean registerThaumcraftAspectsToItem(ItemStack aExampleStack, List<TC_Aspects.TC_AspectStack> aAspects,
+    public boolean registerThaumcraftAspectsToItem(ItemStack aExampleStack, List<TCAspects.TC_AspectStack> aAspects,
         String aOreDict) {
         if (aAspects.isEmpty()) return false;
         ThaumcraftApi.registerObjectTag(aOreDict, getAspectList(aAspects));
@@ -263,7 +263,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat {
     }
 
     @Override
-    public boolean registerThaumcraftAspectsToItem(ItemStack aStack, List<TC_Aspects.TC_AspectStack> aAspects,
+    public boolean registerThaumcraftAspectsToItem(ItemStack aStack, List<TCAspects.TC_AspectStack> aAspects,
         boolean aAdditive) {
         if (aAspects.isEmpty()) return false;
         if (aAdditive) {
diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GTWorldgenerator.java
index 68ce3e4d82..6762fb868c 100644
--- a/src/main/java/gregtech/common/GT_Worldgenerator.java
+++ b/src/main/java/gregtech/common/GTWorldgenerator.java
@@ -1,10 +1,10 @@
 package gregtech.common;
 
-import static gregtech.api.enums.GT_Values.debugOrevein;
-import static gregtech.api.enums.GT_Values.debugWorldGen;
-import static gregtech.api.enums.GT_Values.oreveinAttempts;
-import static gregtech.api.enums.GT_Values.oreveinMaxPlacementAttempts;
-import static gregtech.api.enums.GT_Values.oreveinPercentage;
+import static gregtech.api.enums.GTValues.debugOrevein;
+import static gregtech.api.enums.GTValues.debugWorldGen;
+import static gregtech.api.enums.GTValues.oreveinAttempts;
+import static gregtech.api.enums.GTValues.oreveinMaxPlacementAttempts;
+import static gregtech.api.enums.GTValues.oreveinPercentage;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -26,17 +26,17 @@ import cpw.mods.fml.common.IWorldGenerator;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
-import gregtech.api.net.GT_Packet_SendOregenPattern;
+import gregtech.api.net.GTPacketSendOregenPattern;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_Log;
-import gregtech.api.world.GT_Worldgen;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.api.util.GTLog;
+import gregtech.api.world.GTWorldgen;
+import gregtech.common.blocks.TileEntityOres;
 import gregtech.common.config.worldgen.ConfigEndAsteroids;
 
-public class GT_Worldgenerator implements IWorldGenerator {
+public class GTWorldgenerator implements IWorldGenerator {
 
     private static int mEndAsteroidProbability = 300;
     private static int mSize = 100;
@@ -47,7 +47,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
     public static HashSet<Long> ProcChunks = new HashSet<>();
     // This is probably not going to work. Trying to create a fake orevein to put into hashtable when there will be no
     // ores in a vein.
-    public static GT_Worldgen_GT_Ore_Layer noOresInVein = new GT_Worldgen_GT_Ore_Layer(
+    public static WorldgenGTOreLayer noOresInVein = new WorldgenGTOreLayer(
         new OreMixBuilder().name("NoOresInVein")
             .disabledByDefault()
             .heightRange(0, 255)
@@ -59,19 +59,19 @@ public class GT_Worldgenerator implements IWorldGenerator {
             .inBetween(Materials.Aluminium)
             .sporadic(Materials.Aluminium));
 
-    public static Hashtable<Long, GT_Worldgen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024);
+    public static Hashtable<Long, WorldgenGTOreLayer> validOreveins = new Hashtable<>(1024);
     public boolean mIsGenerating = false;
     public static final Object listLock = new Object();
     public static OregenPattern oregenPattern = OregenPattern.AXISSYMMETRICAL;
 
-    public GT_Worldgenerator() {
+    public GTWorldgenerator() {
         endAsteroids = ConfigEndAsteroids.generateEndAsteroids;
         endMinSize = ConfigEndAsteroids.EndAsteroidMinSize;
         endMaxSize = ConfigEndAsteroids.EndAsteroidMaxSize;
         mEndAsteroidProbability = ConfigEndAsteroids.EndAsteroidProbability;
         GameRegistry.registerWorldGenerator(this, 1073741823);
         if (debugWorldGen) {
-            GT_Log.out.println("GT_Worldgenerator created");
+            GTLog.out.println("GT_Worldgenerator created");
         }
     }
 
@@ -89,7 +89,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
                     aChunkGenerator,
                     aChunkProvider,
                     aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName));
-            if (debugWorldGen) GT_Log.out.println(
+            if (debugWorldGen) GTLog.out.println(
                 "ADD WorldSeed:" + aWorld.getSeed()
                     + " DimId"
                     + aWorld.provider.dimensionId
@@ -108,7 +108,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
                                               // done later.
             for (int i = 0; i < mList_sS; i++) {
                 WorldGenContainer toRun = (WorldGenContainer) mList.get(0);
-                if (debugWorldGen) GT_Log.out.println(
+                if (debugWorldGen) GTLog.out.println(
                     "RUN WorldSeed:" + aWorld.getSeed()
                         + " DimId"
                         + aWorld.provider.dimensionId
@@ -180,7 +180,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
         @SubscribeEvent
         public void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
             if (event.player instanceof EntityPlayerMP player) {
-                GT_Values.NW.sendToPlayer(new GT_Packet_SendOregenPattern(oregenPattern), player);
+                GTValues.NW.sendToPlayer(new GTPacketSendOregenPattern(oregenPattern), player);
             }
         }
 
@@ -247,7 +247,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
             }
         }
 
-        public static ArrayList<GT_Worldgenerator.WorldGenContainer.NearbySeeds> seedList = new ArrayList<>();
+        public static ArrayList<GTWorldgenerator.WorldGenContainer.NearbySeeds> seedList = new ArrayList<>();
 
         // aX and aZ are now the by-chunk X and Z for the chunk of interest
         public WorldGenContainer(Random aRandom, int aX, int aZ, int aDimensionType, World aWorld,
@@ -310,7 +310,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
                 tDimensionName = this.mWorld.provider.getDimensionName();
             }
 
-            if (debugOrevein) GT_Log.out.println(
+            if (debugOrevein) GTLog.out.println(
                 " Finding oreveins for oreveinSeed=" + oreveinSeed
                     + " mX="
                     + this.mX
@@ -325,23 +325,23 @@ public class GT_Worldgenerator implements IWorldGenerator {
 
             // Search for a valid orevein for this dimension
             if (!validOreveins.containsKey(oreveinSeed)) {
-                if ((oreveinPercentageRoll < oreveinPercentage) && (GT_Worldgen_GT_Ore_Layer.sWeight > 0)
-                    && (GT_Worldgen_GT_Ore_Layer.sList.size() > 0)) {
+                if ((oreveinPercentageRoll < oreveinPercentage) && (WorldgenGTOreLayer.sWeight > 0)
+                    && (WorldgenGTOreLayer.sList.size() > 0)) {
                     int placementAttempts = 0;
                     boolean oreveinFound = false;
                     int i;
 
                     // Used for outputting orevein weights and bins
                     /*
-                     * if( test==0 ) { test = 1; GT_Log.out.println( "sWeight = " + GT_Worldgen_GT_Ore_Layer.sWeight );
-                     * for (GT_Worldgen_GT_Ore_Layer tWorldGen : GT_Worldgen_GT_Ore_Layer.sList) { GT_Log.out.println( (
+                     * if( test==0 ) { test = 1; GTLog.out.println( "sWeight = " + GT_Worldgen_GT_Ore_Layer.sWeight );
+                     * for (GT_Worldgen_GT_Ore_Layer tWorldGen : GT_Worldgen_GT_Ore_Layer.sList) { GTLog.out.println( (
                      * tWorldGen).mWorldGenName + " mWeight = " + ( tWorldGen).mWeight + " mSize = " + (tWorldGen).mSize
                      * ); } }
                      */
                     for (i = 0; (i < oreveinAttempts) && (!oreveinFound)
                         && (placementAttempts < oreveinMaxPlacementAttempts); i++) {
-                        int tRandomWeight = oreveinRNG.nextInt(GT_Worldgen_GT_Ore_Layer.sWeight);
-                        for (GT_Worldgen_GT_Ore_Layer tWorldGen : GT_Worldgen_GT_Ore_Layer.sList) {
+                        int tRandomWeight = oreveinRNG.nextInt(WorldgenGTOreLayer.sWeight);
+                        for (WorldgenGTOreLayer tWorldGen : WorldgenGTOreLayer.sList) {
                             tRandomWeight -= (tWorldGen).mWeight;
                             if (tRandomWeight <= 0) {
                                 try {
@@ -362,8 +362,8 @@ public class GT_Worldgenerator implements IWorldGenerator {
                                         this.mChunkGenerator,
                                         this.mChunkProvider);
                                     switch (placementResult) {
-                                        case GT_Worldgen_GT_Ore_Layer.ORE_PLACED -> {
-                                            if (debugOrevein) GT_Log.out.println(
+                                        case WorldgenGTOreLayer.ORE_PLACED -> {
+                                            if (debugOrevein) GTLog.out.println(
                                                 " Added near oreveinSeed=" + oreveinSeed
                                                     + " "
                                                     + (tWorldGen).mWorldGenName
@@ -376,11 +376,11 @@ public class GT_Worldgenerator implements IWorldGenerator {
                                             validOreveins.put(oreveinSeed, tWorldGen);
                                             oreveinFound = true;
                                         }
-                                        case GT_Worldgen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> placementAttempts++;
+                                        case WorldgenGTOreLayer.NO_ORE_IN_BOTTOM_LAYER -> placementAttempts++;
 
                                         // SHould do retry in this case until out of chances
-                                        case GT_Worldgen_GT_Ore_Layer.NO_OVERLAP -> {
-                                            if (debugOrevein) GT_Log.out.println(
+                                        case WorldgenGTOreLayer.NO_OVERLAP -> {
+                                            if (debugOrevein) GTLog.out.println(
                                                 " Added far oreveinSeed=" + oreveinSeed
                                                     + " "
                                                     + (tWorldGen).mWorldGenName
@@ -393,8 +393,8 @@ public class GT_Worldgenerator implements IWorldGenerator {
                                             validOreveins.put(oreveinSeed, tWorldGen);
                                             oreveinFound = true;
                                         }
-                                        case GT_Worldgen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK -> {
-                                            if (debugOrevein) GT_Log.out.println(
+                                        case WorldgenGTOreLayer.NO_OVERLAP_AIR_BLOCK -> {
+                                            if (debugOrevein) GTLog.out.println(
                                                 " No overlap and air block in test spot=" + oreveinSeed
                                                     + " "
                                                     + (tWorldGen).mWorldGenName
@@ -410,7 +410,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
                                     }
                                     break; // Try the next orevein
                                 } catch (Throwable e) {
-                                    if (debugOrevein) GT_Log.out.println(
+                                    if (debugOrevein) GTLog.out.println(
                                         "Exception occurred on oreVein" + tWorldGen
                                             + " oreveinSeed="
                                             + oreveinSeed
@@ -422,14 +422,14 @@ public class GT_Worldgenerator implements IWorldGenerator {
                                             + oreseedX
                                             + " oreseedZ="
                                             + oreseedZ);
-                                    e.printStackTrace(GT_Log.err);
+                                    e.printStackTrace(GTLog.err);
                                 }
                             }
                         }
                     }
                     // Only add an empty orevein if unable to place a vein at the oreseed chunk.
                     if ((!oreveinFound) && (this.mX == oreseedX) && (this.mZ == oreseedZ)) {
-                        if (debugOrevein) GT_Log.out.println(
+                        if (debugOrevein) GTLog.out.println(
                             " Empty oreveinSeed=" + oreveinSeed
                                 + " mX="
                                 + this.mX
@@ -448,7 +448,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
                         validOreveins.put(oreveinSeed, noOresInVein);
                     }
                 } else if (oreveinPercentageRoll >= oreveinPercentage) {
-                    if (debugOrevein) GT_Log.out.println(
+                    if (debugOrevein) GTLog.out.println(
                         " Skipped oreveinSeed=" + oreveinSeed
                             + " mX="
                             + this.mX
@@ -468,9 +468,9 @@ public class GT_Worldgenerator implements IWorldGenerator {
                 }
             } else {
                 // oreseed is located in the previously processed table
-                if (debugOrevein) GT_Log.out
+                if (debugOrevein) GTLog.out
                     .print(" Valid oreveinSeed=" + oreveinSeed + " validOreveins.size()=" + validOreveins.size() + " ");
-                GT_Worldgen_GT_Ore_Layer tWorldGen = validOreveins.get(oreveinSeed);
+                WorldgenGTOreLayer tWorldGen = validOreveins.get(oreveinSeed);
                 oreveinRNG.setSeed(oreveinSeed ^ (tWorldGen.mPrimaryMeta)); // Reset RNG to only be based on oreseed X/Z
                                                                             // and type of vein
                 int placementResult = tWorldGen.executeWorldgenChunkified(
@@ -485,11 +485,11 @@ public class GT_Worldgenerator implements IWorldGenerator {
                     this.mChunkGenerator,
                     this.mChunkProvider);
                 switch (placementResult) {
-                    case GT_Worldgen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> {
-                        if (debugOrevein) GT_Log.out.println(" No ore in bottom layer");
+                    case WorldgenGTOreLayer.NO_ORE_IN_BOTTOM_LAYER -> {
+                        if (debugOrevein) GTLog.out.println(" No ore in bottom layer");
                     }
-                    case GT_Worldgen_GT_Ore_Layer.NO_OVERLAP -> {
-                        if (debugOrevein) GT_Log.out.println(" No overlap");
+                    case WorldgenGTOreLayer.NO_OVERLAP -> {
+                        if (debugOrevein) GTLog.out.println(" No overlap");
                     }
                 }
             }
@@ -504,9 +504,9 @@ public class GT_Worldgenerator implements IWorldGenerator {
 
             // Do GT_Stones and GT_small_ores oregen for this chunk
             try {
-                for (GT_Worldgen tWorldGen : GregTech_API.sWorldgenList) {
+                for (GTWorldgen tWorldGen : GregTechAPI.sWorldgenList) {
                     /*
-                     * if (debugWorldGen) GT_Log.out.println( "tWorldGen.mWorldGenName="+tWorldGen.mWorldGenName );
+                     * if (debugWorldGen) GTLog.out.println( "tWorldGen.mWorldGenName="+tWorldGen.mWorldGenName );
                      */
                     tWorldGen.executeWorldgen(
                         this.mWorld,
@@ -519,7 +519,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
                         this.mChunkProvider);
                 }
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
             long leftOverTime = System.nanoTime();
 
@@ -542,7 +542,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
                 for (int z = nZbox; z < sZbox; z++) {
                     // Determine if this X/Z is an orevein seed
                     if (isOreChunk(x, z)) {
-                        if (debugWorldGen) GT_Log.out.println("Adding seed x=" + x + " z=" + z);
+                        if (debugWorldGen) GTLog.out.println("Adding seed x=" + x + " z=" + z);
                         seedList.add(new NearbySeeds(x, z));
                     }
                 }
@@ -551,7 +551,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
             // Now process each oreseed vs this requested chunk
             for (; seedList.size() != 0; seedList.remove(0)) {
                 if (debugWorldGen)
-                    GT_Log.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ);
+                    GTLog.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ);
                 worldGenFindVein(seedList.get(0).mX, seedList.get(0).mZ);
             }
 
@@ -578,7 +578,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
             long endTime = System.nanoTime();
             long duration = (endTime - startTime);
             if (debugWorldGen) {
-                GT_Log.out.println(
+                GTLog.out.println(
                     " Oregen took " + (oregenTime - leftOverTime)
                         + " Leftover gen took "
                         + (leftOverTime - startTime)
@@ -593,12 +593,12 @@ public class GT_Worldgenerator implements IWorldGenerator {
             short secondaryMeta = 0;
             short betweenMeta = 0;
             short sporadicMeta = 0;
-            if ((GT_Worldgen_GT_Ore_Layer.sWeight > 0) && (GT_Worldgen_GT_Ore_Layer.sList.size() > 0)) {
+            if ((WorldgenGTOreLayer.sWeight > 0) && (WorldgenGTOreLayer.sList.size() > 0)) {
                 boolean temp = true;
                 int tRandomWeight;
                 for (int i = 0; (i < oreveinAttempts) && (temp); i++) {
-                    tRandomWeight = random.nextInt(GT_Worldgen_GT_Ore_Layer.sWeight);
-                    for (GT_Worldgen_GT_Ore_Layer tWorldGen : GT_Worldgen_GT_Ore_Layer.sList) {
+                    tRandomWeight = random.nextInt(WorldgenGTOreLayer.sWeight);
+                    for (WorldgenGTOreLayer tWorldGen : WorldgenGTOreLayer.sList) {
                         tRandomWeight -= tWorldGen.mWeight;
                         if (tRandomWeight <= 0) {
                             try {
@@ -611,7 +611,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
                                     break;
                                 }
                             } catch (Throwable e) {
-                                e.printStackTrace(GT_Log.err);
+                                e.printStackTrace(GTLog.err);
                             }
                         }
                     }
@@ -664,13 +664,13 @@ public class GT_Worldgenerator implements IWorldGenerator {
                                         }
                                         int ranOre = random.nextInt(50);
                                         if (ranOre < 3) {
-                                            GT_TileEntity_Ores.setOreBlock(world, eX, eY, eZ, primaryMeta, false);
+                                            TileEntityOres.setOreBlock(world, eX, eY, eZ, primaryMeta, false);
                                         } else if (ranOre < 6) {
-                                            GT_TileEntity_Ores.setOreBlock(world, eX, eY, eZ, secondaryMeta, false);
+                                            TileEntityOres.setOreBlock(world, eX, eY, eZ, secondaryMeta, false);
                                         } else if (ranOre < 8) {
-                                            GT_TileEntity_Ores.setOreBlock(world, eX, eY, eZ, betweenMeta, false);
+                                            TileEntityOres.setOreBlock(world, eX, eY, eZ, betweenMeta, false);
                                         } else if (ranOre < 10) {
-                                            GT_TileEntity_Ores.setOreBlock(world, eX, eY, eZ, sporadicMeta, false);
+                                            TileEntityOres.setOreBlock(world, eX, eY, eZ, sporadicMeta, false);
                                         } else {
                                             world.setBlock(eX, eY, eZ, Blocks.end_stone, 0, 0);
                                         }
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
deleted file mode 100644
index 8f48ec19bf..0000000000
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package gregtech.common;
-
-import gregtech.api.interfaces.internal.IGT_RecipeAdder;
-import gregtech.api.util.GT_RecipeBuilder;
-
-public class GT_RecipeAdder implements IGT_RecipeAdder {
-
-    @Override
-    public GT_RecipeBuilder stdBuilder() {
-        return GT_RecipeBuilder.builder();
-    }
-}
diff --git a/src/main/java/gregtech/common/OreMixBuilder.java b/src/main/java/gregtech/common/OreMixBuilder.java
index 2a78f516a0..cd8d14c884 100644
--- a/src/main/java/gregtech/common/OreMixBuilder.java
+++ b/src/main/java/gregtech/common/OreMixBuilder.java
@@ -3,7 +3,7 @@ package gregtech.common;
 import java.util.HashMap;
 import java.util.Map;
 
-import bloodasp.galacticgreg.api.enums.DimensionDef;
+import galacticgreg.api.enums.DimensionDef;
 import gregtech.api.enums.Materials;
 
 public class OreMixBuilder {
diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/Pollution.java
index 6a2b1e1082..928b944142 100644
--- a/src/main/java/gregtech/common/GT_Pollution.java
+++ b/src/main/java/gregtech/common/Pollution.java
@@ -1,7 +1,7 @@
 package gregtech.common;
 
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
-import static gregtech.common.GT_Proxy.dimensionWisePollution;
+import static gregtech.common.GTProxy.dimensionWisePollution;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -37,17 +37,17 @@ import net.minecraftforge.event.world.WorldEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.ICleanroom;
 import gregtech.api.interfaces.ICleanroomReceiver;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.net.GT_Packet_Pollution;
-import gregtech.api.util.GT_ChunkAssociatedData;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.GT_PollutionRenderer;
+import gregtech.api.net.GTPacketPollution;
+import gregtech.api.util.GTChunkAssociatedData;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.PollutionRenderer;
 
-public class GT_Pollution {
+public class Pollution {
 
     private static final Storage STORAGE = new Storage();
     /**
@@ -83,7 +83,7 @@ public class GT_Pollution {
 
     private static GT_PollutionEventHandler EVENT_HANDLER;
 
-    public GT_Pollution(World world) {
+    public Pollution(World world) {
         this.world = world;
 
         if (EVENT_HANDLER == null) {
@@ -94,9 +94,9 @@ public class GT_Pollution {
 
     public static void onWorldTick(TickEvent.WorldTickEvent aEvent) { // called from proxy
         // return if pollution disabled
-        if (!GT_Mod.gregtechproxy.mPollution) return;
+        if (!GTMod.gregtechproxy.mPollution) return;
         if (aEvent.phase == TickEvent.Phase.START) return;
-        final GT_Pollution pollutionInstance = dimensionWisePollution.get(aEvent.world.provider.dimensionId);
+        final Pollution pollutionInstance = dimensionWisePollution.get(aEvent.world.provider.dimensionId);
         if (pollutionInstance == null) return;
         pollutionInstance.tickPollutionInWorld((int) (aEvent.world.getTotalWorldTime() % cycleLen));
     }
@@ -134,7 +134,7 @@ public class GT_Pollution {
                     if (neighborPollution * 6 < tPollution * 5) { // MATHEMATICS...
                         int tDiff = tPollution - neighborPollution;
                         tDiff = tDiff / 20;
-                        neighborPollution = GT_Utility.safeInt((long) neighborPollution + tDiff); // tNPol += tDiff;
+                        neighborPollution = GTUtility.safeInt((long) neighborPollution + tDiff); // tNPol += tDiff;
                         tPollution -= tDiff;
                         setChunkPollution(neighborPosition, neighborPollution);
                     }
@@ -142,7 +142,7 @@ public class GT_Pollution {
 
                 // Create Pollution effects
                 // Smog filter TODO
-                if (tPollution > GT_Mod.gregtechproxy.mPollutionSmogLimit) {
+                if (tPollution > GTMod.gregtechproxy.mPollutionSmogLimit) {
                     AxisAlignedBB chunk = AxisAlignedBB.getBoundingBox(
                         actualPos.chunkXPos << 4,
                         0,
@@ -154,7 +154,7 @@ public class GT_Pollution {
                     for (EntityLivingBase tEnt : tEntitys) {
                         if (tEnt instanceof EntityPlayerMP && ((EntityPlayerMP) tEnt).capabilities.isCreativeMode)
                             continue;
-                        if (!(GT_Utility.isWearingFullGasHazmat(tEnt))) {
+                        if (!(GTUtility.isWearingFullGasHazmat(tEnt))) {
                             switch (XSTR_INSTANCE.nextInt(3)) {
                                 default:
                                     tEnt.addPotionEffect(
@@ -179,11 +179,11 @@ public class GT_Pollution {
                     }
 
                     // Poison effects
-                    if (tPollution > GT_Mod.gregtechproxy.mPollutionPoisonLimit) {
+                    if (tPollution > GTMod.gregtechproxy.mPollutionPoisonLimit) {
                         for (EntityLivingBase tEnt : tEntitys) {
                             if (tEnt instanceof EntityPlayerMP && ((EntityPlayerMP) tEnt).capabilities.isCreativeMode)
                                 continue;
-                            if (!GT_Utility.isWearingFullGasHazmat(tEnt)) {
+                            if (!GTUtility.isWearingFullGasHazmat(tEnt)) {
                                 switch (XSTR_INSTANCE.nextInt(4)) {
                                     default:
                                         tEnt.addPotionEffect(new PotionEffect(Potion.hunger.id, tPollution / 500000));
@@ -210,13 +210,13 @@ public class GT_Pollution {
                         }
 
                         // killing plants
-                        if (tPollution > GT_Mod.gregtechproxy.mPollutionVegetationLimit) {
+                        if (tPollution > GTMod.gregtechproxy.mPollutionVegetationLimit) {
                             int f = 20;
                             for (; f < (tPollution / 25000); f++) {
                                 int x = (actualPos.chunkXPos << 4) + XSTR_INSTANCE.nextInt(16);
                                 int y = 60 + (-f + XSTR_INSTANCE.nextInt(f * 2 + 1));
                                 int z = (actualPos.chunkZPos << 4) + XSTR_INSTANCE.nextInt(16);
-                                damageBlock(world, x, y, z, tPollution > GT_Mod.gregtechproxy.mPollutionSourRainLimit);
+                                damageBlock(world, x, y, z, tPollution > GTMod.gregtechproxy.mPollutionSourRainLimit);
                             }
                         }
                     }
@@ -233,7 +233,7 @@ public class GT_Pollution {
                     64,
                     (actualPos.chunkZPos << 4),
                     256);
-                GT_Values.NW.sendToAllAround(new GT_Packet_Pollution(actualPos, tPollution), point);
+                GTValues.NW.sendToAllAround(new GTPacketPollution(actualPos, tPollution), point);
             }
         }
     }
@@ -300,8 +300,8 @@ public class GT_Pollution {
         }
     }
 
-    private static GT_Pollution getPollutionManager(World world) {
-        return dimensionWisePollution.computeIfAbsent(world.provider.dimensionId, i -> new GT_Pollution(world));
+    private static Pollution getPollutionManager(World world) {
+        return dimensionWisePollution.computeIfAbsent(world.provider.dimensionId, i -> new Pollution(world));
     }
 
     /** @see #addPollution(TileEntity, int) */
@@ -315,7 +315,7 @@ public class GT_Pollution {
      * @see #addPollution(World, int, int, int)
      */
     public static void addPollution(TileEntity te, int aPollution) {
-        if (!GT_Mod.gregtechproxy.mPollution || aPollution == 0 || te.getWorldObj().isRemote) return;
+        if (!GTMod.gregtechproxy.mPollution || aPollution == 0 || te.getWorldObj().isRemote) return;
 
         if (aPollution > 0 && te instanceof ICleanroomReceiver receiver) {
             ICleanroom cleanroom = receiver.getCleanroom();
@@ -342,7 +342,7 @@ public class GT_Pollution {
      * @param aPollution desired delta. Positive means the pollution in chunk would go higher.
      */
     public static void addPollution(World w, int chunkX, int chunkZ, int aPollution) {
-        if (!GT_Mod.gregtechproxy.mPollution || aPollution == 0 || w.isRemote) return;
+        if (!GTMod.gregtechproxy.mPollution || aPollution == 0 || w.isRemote) return;
         mutatePollution(w, chunkX, chunkZ, d -> d.changeAmount(aPollution), null);
     }
 
@@ -379,10 +379,10 @@ public class GT_Pollution {
      *         info about this chunk
      */
     public static int getPollution(World w, int chunkX, int chunkZ) {
-        if (!GT_Mod.gregtechproxy.mPollution) return 0;
+        if (!GTMod.gregtechproxy.mPollution) return 0;
         if (w.isRemote)
             // it really should be querying the client side stuff instead
-            return GT_PollutionRenderer.getKnownPollution(chunkX << 4, chunkZ << 4);
+            return PollutionRenderer.getKnownPollution(chunkX << 4, chunkZ << 4);
         return STORAGE.get(w, chunkX, chunkZ)
             .getAmount();
     }
@@ -393,7 +393,7 @@ public class GT_Pollution {
     }
 
     public static boolean hasPollution(Chunk ch) {
-        if (!GT_Mod.gregtechproxy.mPollution) return false;
+        if (!GTMod.gregtechproxy.mPollution) return false;
         return STORAGE.isCreated(ch.worldObj, ch.getChunkCoordIntPair()) && STORAGE.get(ch)
             .getAmount() > 0;
     }
@@ -417,13 +417,13 @@ public class GT_Pollution {
 
         @SubscribeEvent
         public void chunkWatch(ChunkWatchEvent.Watch event) {
-            if (!GT_Mod.gregtechproxy.mPollution) return;
+            if (!GTMod.gregtechproxy.mPollution) return;
             World world = event.player.worldObj;
             if (STORAGE.isCreated(world, event.chunk)) {
                 int pollution = STORAGE.get(world, event.chunk)
                     .getAmount();
                 if (pollution > POLLUTIONPACKET_MINVALUE)
-                    GT_Values.NW.sendToPlayer(new GT_Packet_Pollution(event.chunk, pollution), event.player);
+                    GTValues.NW.sendToPlayer(new GTPacketPollution(event.chunk, pollution), event.player);
             }
         }
 
@@ -435,7 +435,7 @@ public class GT_Pollution {
     }
 
     @ParametersAreNonnullByDefault
-    private static final class Storage extends GT_ChunkAssociatedData<ChunkData> {
+    private static final class Storage extends GTChunkAssociatedData<ChunkData> {
 
         private Storage() {
             super("Pollution", ChunkData.class, 64, (byte) 0, false);
@@ -472,7 +472,7 @@ public class GT_Pollution {
         }
     }
 
-    private static final class ChunkData implements GT_ChunkAssociatedData.IData {
+    private static final class ChunkData implements GTChunkAssociatedData.IData {
 
         public int amount;
 
@@ -496,7 +496,7 @@ public class GT_Pollution {
         }
 
         public void changeAmount(int delta) {
-            this.amount = Math.max(GT_Utility.safeInt(amount + (long) delta, 0), 0);
+            this.amount = Math.max(GTUtility.safeInt(amount + (long) delta, 0), 0);
         }
 
         @Override
diff --git a/src/main/java/gregtech/common/RecipeAdder.java b/src/main/java/gregtech/common/RecipeAdder.java
new file mode 100644
index 0000000000..dd36fd4727
--- /dev/null
+++ b/src/main/java/gregtech/common/RecipeAdder.java
@@ -0,0 +1,12 @@
+package gregtech.common;
+
+import gregtech.api.interfaces.internal.IGTRecipeAdder;
+import gregtech.api.util.GTRecipeBuilder;
+
+public class RecipeAdder implements IGTRecipeAdder {
+
+    @Override
+    public GTRecipeBuilder stdBuilder() {
+        return GTRecipeBuilder.builder();
+    }
+}
diff --git a/src/main/java/gregtech/common/SmallOreBuilder.java b/src/main/java/gregtech/common/SmallOreBuilder.java
index e9a68e7caf..727ea98fc6 100644
--- a/src/main/java/gregtech/common/SmallOreBuilder.java
+++ b/src/main/java/gregtech/common/SmallOreBuilder.java
@@ -3,7 +3,7 @@ package gregtech.common;
 import java.util.HashMap;
 import java.util.Map;
 
-import bloodasp.galacticgreg.api.enums.DimensionDef;
+import galacticgreg.api.enums.DimensionDef;
 import gregtech.api.enums.Materials;
 
 public class SmallOreBuilder {
diff --git a/src/main/java/gregtech/common/GT_UndergroundOil.java b/src/main/java/gregtech/common/UndergroundOil.java
index 17a5662c09..e5da237288 100644
--- a/src/main/java/gregtech/common/GT_UndergroundOil.java
+++ b/src/main/java/gregtech/common/UndergroundOil.java
@@ -19,17 +19,17 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_UO_Dimension;
-import gregtech.api.objects.GT_UO_Fluid;
+import gregtech.api.objects.GTUODimension;
+import gregtech.api.objects.GTUOFluid;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_ChunkAssociatedData;
+import gregtech.api.util.GTChunkAssociatedData;
 
 /**
  * Created by Tec on 29.04.2017.
  */
-public class GT_UndergroundOil {
+public class UndergroundOil {
 
     public static final short DIVIDER = 5000;
     private static final GT_UndergroundOilStore STORAGE = new GT_UndergroundOilStore();
@@ -124,13 +124,13 @@ public class GT_UndergroundOil {
      *
      * @return UO fluid kind and amount, or null if nothing here.
      */
-    public static Pair<GT_UO_Fluid, Integer> getPristineAmount(World world, int chunkX, int chunkZ) {
+    public static Pair<GTUOFluid, Integer> getPristineAmount(World world, int chunkX, int chunkZ) {
         int dimensionId = world.provider.dimensionId;
-        GT_UO_Dimension dimension = GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(dimensionId);
+        GTUODimension dimension = GTMod.gregtechproxy.mUndergroundOil.GetDimension(dimensionId);
         if (dimension == null) return null;
         // prepare RNG
         final XSTR tVeinRNG = new XSTR(world.getSeed() + dimensionId * 2L + (chunkX >> 3) + 8267L * (chunkZ >> 3));
-        GT_UO_Fluid uoFluid = dimension.getRandomFluid(tVeinRNG);
+        GTUOFluid uoFluid = dimension.getRandomFluid(tVeinRNG);
         // nothing here :(
         if (uoFluid == null || uoFluid.getFluid() == null) return null;
         // offset each chunk's fluid amount by +-25%
@@ -188,12 +188,12 @@ public class GT_UndergroundOil {
      * @author glease
      */
     @ParametersAreNonnullByDefault
-    private static class GT_UndergroundOilStore extends GT_ChunkAssociatedData<ChunkData> {
+    private static class GT_UndergroundOilStore extends GTChunkAssociatedData<ChunkData> {
 
-        private static final WeakHashMap<GT_UO_Fluid, Integer> hashes = new WeakHashMap<>();
+        private static final WeakHashMap<GTUOFluid, Integer> hashes = new WeakHashMap<>();
 
         private GT_UndergroundOilStore() {
-            super("UO", GT_UndergroundOil.ChunkData.class, 64, (byte) 0, false);
+            super("UO", UndergroundOil.ChunkData.class, 64, (byte) 0, false);
         }
 
         @Override
@@ -211,11 +211,11 @@ public class GT_UndergroundOil {
         }
 
         @Override
-        protected GT_UndergroundOil.ChunkData readElement(DataInput input, int version, World world, int chunkX,
+        protected UndergroundOil.ChunkData readElement(DataInput input, int version, World world, int chunkX,
             int chunkZ) throws IOException {
             /* see class javadoc for explanation */
             if (version != 0) throw new IOException("Region file corrupted");
-            GT_UndergroundOil.ChunkData pristine = createElement(world, chunkX, chunkZ);
+            UndergroundOil.ChunkData pristine = createElement(world, chunkX, chunkZ);
             int hash = input.readInt();
             String veinKey = hash != 0 ? input.readUTF() : null;
             int amount = hash != 0 ? input.readInt() : -1;
@@ -224,27 +224,27 @@ public class GT_UndergroundOil {
                 return pristine;
             }
             if (hash == 0) return NIL_FLUID_STACK;
-            return new GT_UndergroundOil.ChunkData(
+            return new UndergroundOil.ChunkData(
                 amount,
-                GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(world.provider.dimensionId)
+                GTMod.gregtechproxy.mUndergroundOil.GetDimension(world.provider.dimensionId)
                     .getUOFluid(veinKey),
                 veinKey);
         }
 
         @Override
-        protected GT_UndergroundOil.ChunkData createElement(World world, int chunkX, int chunkZ) {
-            Pair<GT_UO_Fluid, Integer> pristine = getPristineAmount(world, chunkX, chunkZ);
+        protected UndergroundOil.ChunkData createElement(World world, int chunkX, int chunkZ) {
+            Pair<GTUOFluid, Integer> pristine = getPristineAmount(world, chunkX, chunkZ);
             if (pristine == null) return NIL_FLUID_STACK;
             int dimensionId = world.provider.dimensionId;
-            GT_UO_Dimension dimension = GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(dimensionId);
-            return new GT_UndergroundOil.ChunkData(
+            GTUODimension dimension = GTMod.gregtechproxy.mUndergroundOil.GetDimension(dimensionId);
+            return new UndergroundOil.ChunkData(
                 pristine.getRight(),
                 pristine.getLeft(),
                 dimension.getUOFluidKey(pristine.getLeft()),
                 false);
         }
 
-        private static int hash(@Nullable GT_UO_Fluid fluid) {
+        private static int hash(@Nullable GTUOFluid fluid) {
             if (fluid == null) return 0;
             int result = fluid.Registry.hashCode();
             result = 31 * result + fluid.MaxAmount;
@@ -258,23 +258,23 @@ public class GT_UndergroundOil {
     /**
      * Represent the amount of fluid in a given chunk.
      */
-    private static final class ChunkData implements GT_ChunkAssociatedData.IData {
+    private static final class ChunkData implements GTChunkAssociatedData.IData {
 
         private final Fluid fluid;
 
         @Nullable
-        private final GT_UO_Fluid vein;
+        private final GTUOFluid vein;
 
         private final String veinKey;
         private final int veinHash;
         private int amount;
         private boolean dirty;
 
-        private ChunkData(int amount, GT_UO_Fluid veinKey, String veinID) {
+        private ChunkData(int amount, GTUOFluid veinKey, String veinID) {
             this(amount, veinKey, veinID, true);
         }
 
-        private ChunkData(int amount, @Nullable GT_UO_Fluid vein, @Nullable String veinKey, boolean dirty) {
+        private ChunkData(int amount, @Nullable GTUOFluid vein, @Nullable String veinKey, boolean dirty) {
             this.amount = amount;
             this.vein = vein;
             this.dirty = dirty;
@@ -315,7 +315,7 @@ public class GT_UndergroundOil {
         }
 
         @Nullable
-        public GT_UO_Fluid getVein() {
+        public GTUOFluid getVein() {
             return vein;
         }
 
diff --git a/src/main/java/gregtech/common/WirelessComputationPacket.java b/src/main/java/gregtech/common/WirelessComputationPacket.java
index cafe4d93dc..1b485a63c9 100644
--- a/src/main/java/gregtech/common/WirelessComputationPacket.java
+++ b/src/main/java/gregtech/common/WirelessComputationPacket.java
@@ -4,11 +4,11 @@ import static gregtech.common.misc.GlobalVariableStorage.GlobalWirelessComputati
 
 import java.util.UUID;
 
-import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket;
 import com.gtnewhorizon.structurelib.util.Vec3Impl;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.common.misc.spaceprojects.SpaceProjectManager;
+import tectech.mechanics.dataTransport.QuantumDataPacket;
 
 public class WirelessComputationPacket {
 
diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java b/src/main/java/gregtech/common/WorldgenGTOreLayer.java
index 718b682916..a8f57ef1de 100644
--- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
+++ b/src/main/java/gregtech/common/WorldgenGTOreLayer.java
@@ -1,8 +1,8 @@
 package gregtech.common;
 
-import static gregtech.api.enums.GT_Values.debugOrevein;
-import static gregtech.api.enums.GT_Values.oreveinPlacerOres;
-import static gregtech.api.enums.GT_Values.oreveinPlacerOresMultiplier;
+import static gregtech.api.enums.GTValues.debugOrevein;
+import static gregtech.api.enums.GTValues.oreveinPlacerOres;
+import static gregtech.api.enums.GTValues.oreveinPlacerOresMultiplier;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,15 +17,15 @@ import net.minecraft.world.WorldProviderHell;
 import net.minecraft.world.WorldProviderSurface;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import bloodasp.galacticgreg.api.enums.DimensionDef;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Log;
-import gregtech.api.world.GT_Worldgen;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import galacticgreg.api.enums.DimensionDef;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLog;
+import gregtech.api.world.GTWorldgen;
+import gregtech.common.blocks.TileEntityOres;
 
-public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
+public class WorldgenGTOreLayer extends GTWorldgen {
 
-    public static ArrayList<GT_Worldgen_GT_Ore_Layer> sList = new ArrayList<>();
+    public static ArrayList<WorldgenGTOreLayer> sList = new ArrayList<>();
     public static int sWeight = 0;
     public final short mMinY;
     public final short mMaxY;
@@ -52,7 +52,7 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
 
     public Class[] mAllowedProviders;
 
-    public GT_Worldgen_GT_Ore_Layer(OreMixBuilder mix) {
+    public WorldgenGTOreLayer(OreMixBuilder mix) {
         super(mix.oreMixName, sList, mix.enabledByDefault);
         this.mOverworld = mix.dimsEnabled.getOrDefault(OreMixBuilder.OW, false);
         this.mNether = mix.dimsEnabled.getOrDefault(OreMixBuilder.NETHER, false);
@@ -63,7 +63,7 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
         this.mMinY = ((short) mix.minY);
         short mMaxY = ((short) mix.maxY);
         if (mMaxY < (this.mMinY + 9)) {
-            GT_Log.out.println("Oremix " + this.mWorldGenName + " has invalid Min/Max heights!");
+            GTLog.out.println("Oremix " + this.mWorldGenName + " has invalid Min/Max heights!");
             mMaxY = (short) (this.mMinY + 9);
         }
         this.mMaxY = mMaxY;
@@ -99,14 +99,14 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
     public int executeWorldgenChunkified(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
         int aChunkZ, int aSeedX, int aSeedZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
         if (mWorldGenName.equals("NoOresInVein")) {
-            if (debugOrevein) GT_Log.out.println(" NoOresInVein");
+            if (debugOrevein) GTLog.out.println(" NoOresInVein");
             // Return a special empty orevein
             return ORE_PLACED;
         }
 
         if (!isGenerationAllowed(aWorld, mAllowedProviders)) {
             // The following code can be used for debugging, but it spams in logs
-            // if (debugOrevein) { GT_Log.out.println( "Wrong dimension" ); }
+            // if (debugOrevein) { GTLog.out.println( "Wrong dimension" ); }
             return WRONG_DIMENSION;
         }
 
@@ -134,8 +134,8 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
             if (tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, Blocks.stone)
                 || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, Blocks.netherrack)
                 || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, Blocks.end_stone)
-                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, GregTech_API.sBlockGranites)
-                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, GregTech_API.sBlockStones)) {
+                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, GregTechAPI.sBlockGranites)
+                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, GregTechAPI.sBlockStones)) {
                 // Didn't reach, but could have placed. Save orevein for future use.
                 return NO_OVERLAP;
             } else {
@@ -153,8 +153,8 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
             if (tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, Blocks.stone)
                 || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, Blocks.netherrack)
                 || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, Blocks.end_stone)
-                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, GregTech_API.sBlockGranites)
-                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, GregTech_API.sBlockStones)) {
+                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, GregTechAPI.sBlockGranites)
+                || tBlock.isReplaceableOreGen(aWorld, aChunkX + 7, tMinY, aChunkZ + 9, GregTechAPI.sBlockStones)) {
                 // Didn't reach, but could have placed. Save orevein for future use.
                 return NO_OVERLAP;
             } else {
@@ -164,7 +164,7 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
         }
 
         if (debugOrevein) {
-            GT_Log.out.print(
+            GTLog.out.print(
                 "Trying Orevein:" + this.mWorldGenName
                     + " Dimension="
                     + tDimensionName
@@ -198,21 +198,20 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
                 int placeZ = Math
                     .max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
                 if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSecondaryMeta > 0)) {
-                    if (GT_TileEntity_Ores
-                        .setOreBlock(aWorld, tX, level, tZ, this.mSecondaryMeta, false, isUnderdark)) {
+                    if (TileEntityOres.setOreBlock(aWorld, tX, level, tZ, this.mSecondaryMeta, false, isUnderdark)) {
                         placeCount[1]++;
                     }
                 } else
                     if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                         && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate
-                            if (GT_TileEntity_Ores
+                            if (TileEntityOres
                                 .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))
                                 placeCount[3]++;
                         }
             }
         }
         if ((placeCount[1] + placeCount[3]) == 0) {
-            if (debugOrevein) GT_Log.out.println(" No ore in bottom layer");
+            if (debugOrevein) GTLog.out.println(" No ore in bottom layer");
             return NO_ORE_IN_BOTTOM_LAYER; // Exit early, didn't place anything in the bottom layer
         }
         // Layers 0 & 1 Secondary and Sporadic
@@ -226,14 +225,14 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
                         Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
                     if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                         && (this.mSecondaryMeta > 0)) {
-                        if (GT_TileEntity_Ores
+                        if (TileEntityOres
                             .setOreBlock(aWorld, tX, level, tZ, this.mSecondaryMeta, false, isUnderdark)) {
                             placeCount[1]++;
                         }
                     } else if ((aRandom.nextInt(7) == 0)
                         && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                         && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate
-                            if (GT_TileEntity_Ores
+                            if (TileEntityOres
                                 .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))
                                 placeCount[3]++;
                         }
@@ -249,19 +248,19 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
                     .max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
                 if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                     && (this.mBetweenMeta > 0)) { // Between are reduce by 1/2 to compensate
-                    if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {
+                    if (TileEntityOres.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {
                         placeCount[2]++;
                     }
                 } else if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                     && (this.mSecondaryMeta > 0)) {
-                        if (GT_TileEntity_Ores
+                        if (TileEntityOres
                             .setOreBlock(aWorld, tX, level, tZ, this.mSecondaryMeta, false, isUnderdark)) {
                             placeCount[1]++;
                         }
                     } else
                     if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                         && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate
-                            if (GT_TileEntity_Ores
+                            if (TileEntityOres
                                 .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))
                                 placeCount[3]++;
                         }
@@ -277,13 +276,13 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
                     .max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
                 if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                     && (this.mBetweenMeta > 0)) { // Between are reduce by 1/2 to compensate
-                    if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {
+                    if (TileEntityOres.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {
                         placeCount[2]++;
                     }
                 } else
                     if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                         && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate
-                            if (GT_TileEntity_Ores
+                            if (TileEntityOres
                                 .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))
                                 placeCount[3]++;
                         }
@@ -299,19 +298,18 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
                     .max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
                 if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                     && (this.mBetweenMeta > 0)) { // Between are reduce by 1/2 to compensate
-                    if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {
+                    if (TileEntityOres.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {
                         placeCount[2]++;
                     }
                 } else
                     if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mPrimaryMeta > 0)) {
-                        if (GT_TileEntity_Ores
-                            .setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {
+                        if (TileEntityOres.setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {
                             placeCount[1]++;
                         }
                     } else if ((aRandom.nextInt(7) == 0)
                         && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                         && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate
-                            if (GT_TileEntity_Ores
+                            if (TileEntityOres
                                 .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))
                                 placeCount[3]++;
                         }
@@ -327,19 +325,18 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
                     .max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
                 if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                     && (this.mBetweenMeta > 0)) { // Between are reduce by 1/2 to compensate
-                    if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {
+                    if (TileEntityOres.setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, isUnderdark)) {
                         placeCount[2]++;
                     }
                 } else
                     if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mPrimaryMeta > 0)) {
-                        if (GT_TileEntity_Ores
-                            .setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {
+                        if (TileEntityOres.setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {
                             placeCount[1]++;
                         }
                     } else if ((aRandom.nextInt(7) == 0)
                         && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                         && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate
-                            if (GT_TileEntity_Ores
+                            if (TileEntityOres
                                 .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))
                                 placeCount[3]++;
                         }
@@ -354,13 +351,13 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
                 int placeZ = Math
                     .max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
                 if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mPrimaryMeta > 0)) {
-                    if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {
+                    if (TileEntityOres.setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {
                         placeCount[1]++;
                     }
                 } else
                     if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                         && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate
-                            if (GT_TileEntity_Ores
+                            if (TileEntityOres
                                 .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))
                                 placeCount[3]++;
                         }
@@ -375,13 +372,13 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
                 int placeZ = Math
                     .max(1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
                 if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mPrimaryMeta > 0)) {
-                    if (GT_TileEntity_Ores.setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {
+                    if (TileEntityOres.setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) {
                         placeCount[1]++;
                     }
                 } else
                     if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
                         && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate
-                            if (GT_TileEntity_Ores
+                            if (TileEntityOres
                                 .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark))
                                 placeCount[3]++;
                         }
@@ -396,26 +393,26 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen {
                 int tZ = aRandom.nextInt(16) + aChunkZ + 2;
                 int tY = aRandom.nextInt(160) + 10; // Y height can vary from 10 to 170 for small ores.
                 if (this.mPrimaryMeta > 0)
-                    GT_TileEntity_Ores.setOreBlock(aWorld, tX, tY, tZ, this.mPrimaryMeta, true, isUnderdark);
+                    TileEntityOres.setOreBlock(aWorld, tX, tY, tZ, this.mPrimaryMeta, true, isUnderdark);
                 tX = aRandom.nextInt(16) + aChunkX + 2;
                 tZ = aRandom.nextInt(16) + aChunkZ + 2;
                 tY = aRandom.nextInt(160) + 10; // Y height can vary from 10 to 170 for small ores.
                 if (this.mSecondaryMeta > 0)
-                    GT_TileEntity_Ores.setOreBlock(aWorld, tX, tY, tZ, this.mSecondaryMeta, true, isUnderdark);
+                    TileEntityOres.setOreBlock(aWorld, tX, tY, tZ, this.mSecondaryMeta, true, isUnderdark);
                 tX = aRandom.nextInt(16) + aChunkX + 2;
                 tZ = aRandom.nextInt(16) + aChunkZ + 2;
                 tY = aRandom.nextInt(160) + 10; // Y height can vary from 10 to 170 for small ores.
                 if (this.mBetweenMeta > 0)
-                    GT_TileEntity_Ores.setOreBlock(aWorld, tX, tY, tZ, this.mBetweenMeta, true, isUnderdark);
+                    TileEntityOres.setOreBlock(aWorld, tX, tY, tZ, this.mBetweenMeta, true, isUnderdark);
                 tX = aRandom.nextInt(16) + aChunkX + 2;
                 tZ = aRandom.nextInt(16) + aChunkZ + 2;
                 tY = aRandom.nextInt(190) + 10; // Y height can vary from 10 to 200 for small ores.
                 if (this.mSporadicMeta > 0)
-                    GT_TileEntity_Ores.setOreBlock(aWorld, tX, tY, tZ, this.mSporadicMeta, true, isUnderdark);
+                    TileEntityOres.setOreBlock(aWorld, tX, tY, tZ, this.mSporadicMeta, true, isUnderdark);
             }
         }
         if (debugOrevein) {
-            GT_Log.out.println(
+            GTLog.out.println(
                 " wXVein" + wXVein
                     + " eXVein"
                     + eXVein
diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java b/src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java
index ef01c2ea0f..86d9c84e5f 100644
--- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java
+++ b/src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java
@@ -1,6 +1,6 @@
 package gregtech.common;
 
-import static gregtech.api.enums.GT_Values.debugSmallOres;
+import static gregtech.api.enums.GTValues.debugSmallOres;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,12 +12,12 @@ import net.minecraft.world.WorldProviderHell;
 import net.minecraft.world.WorldProviderSurface;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Log;
-import gregtech.api.world.GT_Worldgen;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLog;
+import gregtech.api.world.GTWorldgen;
+import gregtech.common.blocks.TileEntityOres;
 
-public class GT_Worldgen_GT_Ore_SmallPieces extends GT_Worldgen {
+public class WorldgenGTOreSmallPieces extends GTWorldgen {
 
     public final short mMinY;
     public final short mMaxY;
@@ -28,12 +28,12 @@ public class GT_Worldgen_GT_Ore_SmallPieces extends GT_Worldgen {
     public final boolean mEnd;
     public final boolean twilightForest;
     public final String mBiome;
-    public static ArrayList<GT_Worldgen_GT_Ore_SmallPieces> sList = new ArrayList<>();
+    public static ArrayList<WorldgenGTOreSmallPieces> sList = new ArrayList<>();
 
     public Class[] mAllowedProviders;
 
-    public GT_Worldgen_GT_Ore_SmallPieces(SmallOreBuilder ore) {
-        super(ore.smallOreName, GregTech_API.sWorldgenList, ore.enabledByDefault);
+    public WorldgenGTOreSmallPieces(SmallOreBuilder ore) {
+        super(ore.smallOreName, GregTechAPI.sWorldgenList, ore.enabledByDefault);
         this.mOverworld = ore.dimsEnabled.getOrDefault(SmallOreBuilder.OW, false);
         this.mNether = ore.dimsEnabled.getOrDefault(SmallOreBuilder.NETHER, false);
         this.mEnd = ore.dimsEnabled.getOrDefault(SmallOreBuilder.THE_END, false);
@@ -79,7 +79,7 @@ public class GT_Worldgen_GT_Ore_SmallPieces extends GT_Worldgen {
         if (this.mMeta > 0) {
             int j = Math.max(1, this.mAmount / 2 + aRandom.nextInt(this.mAmount) / 2);
             for (int i = 0; i < j; i++) {
-                GT_TileEntity_Ores.setOreBlock(
+                TileEntityOres.setOreBlock(
                     aWorld,
                     aChunkX + 8 + aRandom.nextInt(16),
                     this.mMinY + aRandom.nextInt(Math.max(1, this.mMaxY - this.mMinY)),
@@ -91,7 +91,7 @@ public class GT_Worldgen_GT_Ore_SmallPieces extends GT_Worldgen {
             }
         }
         if (debugSmallOres) {
-            GT_Log.out.println(
+            GTLog.out.println(
                 "Small Ore:" + this.mWorldGenName
                     + " @ dim="
                     + aDimensionType
diff --git a/src/main/java/gregtech/common/GT_Worldgen_Stone.java b/src/main/java/gregtech/common/WorldgenStone.java
index 97621865bc..d995375437 100644
--- a/src/main/java/gregtech/common/GT_Worldgen_Stone.java
+++ b/src/main/java/gregtech/common/WorldgenStone.java
@@ -1,6 +1,6 @@
 package gregtech.common;
 
-import static gregtech.api.enums.GT_Values.debugStones;
+import static gregtech.api.enums.GTValues.debugStones;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -13,14 +13,14 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_Log;
-import gregtech.api.world.GT_Worldgen;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.api.util.GTLog;
+import gregtech.api.world.GTWorldgen;
+import gregtech.common.blocks.BlockOresAbstract;
+import gregtech.common.blocks.TileEntityOres;
 
-public class GT_Worldgen_Stone extends GT_Worldgen {
+public class WorldgenStone extends GTWorldgen {
 
     static final double[] sizeConversion = { 1, 1, 1.333333, 1.333333, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }; // Bias
                                                                                                                          // the
@@ -64,8 +64,8 @@ public class GT_Worldgen_Stone extends GT_Worldgen {
         }
     }
 
-    public GT_Worldgen_Stone(StoneBuilder stone) {
-        super(stone.stoneName, GregTech_API.sWorldgenList, stone.enabledByDefault);
+    public WorldgenStone(StoneBuilder stone) {
+        super(stone.stoneName, GregTechAPI.sWorldgenList, stone.enabledByDefault);
         mDimensionType = stone.dimension;
         mBlock = stone.block;
         mBlockMeta = Math.min(Math.max(stone.blockMeta, 0), 15);
@@ -105,17 +105,17 @@ public class GT_Worldgen_Stone extends GT_Worldgen {
                     stoneRNG.setSeed(
                         aWorld.getSeed() ^ hash + Math.abs(mBlockMeta)
                             + Math.abs(mSize)
-                            + ((GregTech_API.sBlockGranites == mBlock) ? (32768) : (0))); // Don't judge me.
-                                                                                          // Want different
-                                                                                          // values for
-                                                                                          // different block
-                                                                                          // types
+                            + ((GregTechAPI.sBlockGranites == mBlock) ? (32768) : (0))); // Don't judge me.
+                                                                                         // Want different
+                                                                                         // values for
+                                                                                         // different block
+                                                                                         // types
                     if ((this.mProbability <= 1) || (stoneRNG.nextInt(this.mProbability) == 0)) {
                         // Add stone at this chunk
                         validStoneSeeds.put(hash, new StoneSeeds(true));
                         // Add to generation list
                         stones.add(new ValidSeeds(x, z));
-                        if (debugStones) GT_Log.out.println(
+                        if (debugStones) GTLog.out.println(
                             "New stoneseed=" + mWorldGenName + " x=" + x + " z=" + z + " realSize=" + realSize);
                     } else {
                         validStoneSeeds.put(hash, new StoneSeeds(false));
@@ -141,7 +141,7 @@ public class GT_Worldgen_Stone extends GT_Worldgen {
                     ^ (((aWorld.provider.dimensionId & 0xffL) << 56) | (((long) x & 0x000000000fffffffL) << 28)
                         | ((long) z & 0x000000000fffffffL)) + Math.abs(mBlockMeta)
                         + Math.abs(mSize)
-                        + ((GregTech_API.sBlockGranites == mBlock) ? (32768) : (0))); // Don't judge me
+                        + ((GregTechAPI.sBlockGranites == mBlock) ? (32768) : (0))); // Don't judge me
             for (int i = 0; i < this.mAmount; i++) { // Not sure why you would want more than one in a chunk! Left alone
                                                      // though.
                 // Locate the stoneseed XYZ. Original code would request an isAir at the seed location, causing a chunk
@@ -176,7 +176,7 @@ public class GT_Worldgen_Stone extends GT_Worldgen {
                 // If the (tY-ySize) of the stoneseed is air in the current chunk, mark the seed empty and move on.
                 if (aWorld.getBlock(aChunkX + 8, tMinY, aChunkZ + 8)
                     .isAir(aWorld, aChunkX + 8, tMinY, aChunkZ + 8)) {
-                    if (debugStones) GT_Log.out.println(
+                    if (debugStones) GTLog.out.println(
                         mWorldGenName + " tX="
                             + tX
                             + " tY="
@@ -210,7 +210,7 @@ public class GT_Worldgen_Stone extends GT_Worldgen {
                 int sZ = Math.max(tMinZ, aChunkZ + 8);
                 int nZ = Math.min(tMaxZ, aChunkZ + 8 + 16);
 
-                if (debugStones) GT_Log.out.println(
+                if (debugStones) GTLog.out.println(
                     mWorldGenName + " tX="
                         + tX
                         + " tY="
@@ -262,13 +262,13 @@ public class GT_Worldgen_Stone extends GT_Worldgen {
                             if (leftHandSize <= rightHandSide) {
                                 // Yay! We can actually place a block now. (this part copied from original code)
                                 Block tTargetedBlock = aWorld.getBlock(iX, iY, iZ);
-                                if (tTargetedBlock instanceof GT_Block_Ores_Abstract) {
+                                if (tTargetedBlock instanceof BlockOresAbstract) {
                                     TileEntity tTileEntity = aWorld.getTileEntity(iX, iY, iZ);
-                                    if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                                        if (tTargetedBlock != GregTech_API.sBlockOres1) {
-                                            ((GT_TileEntity_Ores) tTileEntity).convertOreBlock(aWorld, iX, iY, iZ);
+                                    if ((tTileEntity instanceof TileEntityOres)) {
+                                        if (tTargetedBlock != GregTechAPI.sBlockOres1) {
+                                            ((TileEntityOres) tTileEntity).convertOreBlock(aWorld, iX, iY, iZ);
                                         }
-                                        ((GT_TileEntity_Ores) tTileEntity)
+                                        ((TileEntityOres) tTileEntity)
                                             .overrideOreBlockMaterial(this.mBlock, (byte) this.mBlockMeta);
                                     }
                                 } else if (((this.mAllowToGenerateinVoid) && (aWorld.getBlock(iX, iY, iZ)
@@ -281,9 +281,9 @@ public class GT_Worldgen_Stone extends GT_Worldgen {
                                         || (tTargetedBlock.isReplaceableOreGen(aWorld, iX, iY, iZ, Blocks.end_stone))
                                         || (tTargetedBlock.isReplaceableOreGen(aWorld, iX, iY, iZ, Blocks.netherrack))
                                         || (tTargetedBlock
-                                            .isReplaceableOreGen(aWorld, iX, iY, iZ, GregTech_API.sBlockGranites))
+                                            .isReplaceableOreGen(aWorld, iX, iY, iZ, GregTechAPI.sBlockGranites))
                                         || (tTargetedBlock
-                                            .isReplaceableOreGen(aWorld, iX, iY, iZ, GregTech_API.sBlockStones))))) {
+                                            .isReplaceableOreGen(aWorld, iX, iY, iZ, GregTechAPI.sBlockStones))))) {
                                                 aWorld.setBlock(iX, iY, iZ, this.mBlock, this.mBlockMeta, 0);
                                             }
                             }
diff --git a/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java b/src/main/java/gregtech/common/bees/GTAlleleBeeSpecies.java
index b264737677..59bc4737e2 100644
--- a/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java
+++ b/src/main/java/gregtech/common/bees/GTAlleleBeeSpecies.java
@@ -11,9 +11,9 @@ import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IClassification;
 import forestry.apiculture.genetics.alleles.AlleleBeeSpecies;
 
-public class GT_AlleleBeeSpecies extends AlleleBeeSpecies {
+public class GTAlleleBeeSpecies extends AlleleBeeSpecies {
 
-    public GT_AlleleBeeSpecies(String uid, boolean dominant, String unlocalizedName, String authority,
+    public GTAlleleBeeSpecies(String uid, boolean dominant, String unlocalizedName, String authority,
         String unlocalizedDescription, IClassification branch, String binomial, Color primaryColor,
         Color secondaryColor) {
         super(
diff --git a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java b/src/main/java/gregtech/common/bees/GTAlleleHelper.java
index 496aff29ca..88c46fed3d 100644
--- a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
+++ b/src/main/java/gregtech/common/bees/GTAlleleHelper.java
@@ -27,9 +27,9 @@ import forestry.core.genetics.alleles.EnumAllele;
 import forestry.core.genetics.alleles.IAlleleValue;
 import forestry.core.utils.vect.IVect;
 import forestry.plugins.PluginManager;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 
-public class GT_AlleleHelper extends AlleleHelper {
+public class GTAlleleHelper extends AlleleHelper {
 
     private static final String modId = Constants.ID;
 
@@ -135,7 +135,7 @@ public class GT_AlleleHelper extends AlleleHelper {
 
     @SuppressWarnings("unchecked")
     public static void initialisation() {
-        GT_AlleleHelper helper = new GT_AlleleHelper();
+        GTAlleleHelper helper = new GTAlleleHelper();
 
         try {
             helper.alleleMaps = (Map<Class<?>, Map<?, ? extends IAllele>>) FieldUtils
@@ -152,13 +152,13 @@ public class GT_AlleleHelper extends AlleleHelper {
     public <T extends Enum<T> & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, IAllele allele) {
 
         if (allele == null) {
-            GT_Mod.GT_FML_LOGGER.info("Allele is null!");
+            GTMod.GT_FML_LOGGER.info("Allele is null!");
             return;
         }
 
         if (!chromosomeType.getAlleleClass()
             .isInstance(allele)) {
-            GT_Mod.GT_FML_LOGGER.info("chromosomeType is not an instance of allele!" + allele.getName());
+            GTMod.GT_FML_LOGGER.info("chromosomeType is not an instance of allele!" + allele.getName());
             return;
         }
 
diff --git a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java b/src/main/java/gregtech/common/bees/GTBeeMutation.java
index e8b2d5b8c6..871b25f41f 100644
--- a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
+++ b/src/main/java/gregtech/common/bees/GTBeeMutation.java
@@ -20,11 +20,11 @@ import forestry.api.genetics.IMutationCondition;
 import forestry.apiculture.genetics.BeeMutation;
 import forestry.core.genetics.mutations.Mutation;
 
-public class GT_Bee_Mutation extends BeeMutation {
+public class GTBeeMutation extends BeeMutation {
 
     private final float split;
 
-    public GT_Bee_Mutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance, float split) {
+    public GTBeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance, float split) {
         super(bee0, bee1, result, chance);
         this.split = split;
         BeeManager.beeRoot.registerMutation(this);
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/BlockCasings1.java
index 897011eba9..5410847176 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings1.java
@@ -6,13 +6,13 @@ import net.minecraft.world.IBlockAccess;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings1 extends GT_Block_Casings_Abstract {
+public class BlockCasings1 extends BlockCasingsAbstract {
 
     /**
      * Texture Index Information Textures.BlockIcons.casingTexturePages[0][0-63] - Gregtech
@@ -22,26 +22,25 @@ public class GT_Block_Casings1 extends GT_Block_Casings_Abstract {
      * Free Textures.BlockIcons.casingTexturePages[6][0-127] - Free Textures.BlockIcons.casingTexturePages[7][0-127] -
      * TecTech Textures.BlockIcons.casingTexturePages[8][0-127] - TecTech
      */
-    public GT_Block_Casings1() {
-        super(GT_Item_Casings1.class, "gt.blockcasings", GT_Material_Casings.INSTANCE, 16);
+    public BlockCasings1() {
+        super(ItemCasings1.class, "gt.blockcasings", MaterialCasings.INSTANCE, 16);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "ULV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "LV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "HV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "EV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "IV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "LuV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "ZPM Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UHV Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Bronze Plated Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing");
-        GT_LanguageManager
-            .addStringLocalization(getUnlocalizedName() + ".12.name", "Dimensionally Transcendent Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Dimensional Injection Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Dimensional Bridge");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "ULV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "LV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "HV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "EV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "IV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "LuV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "ZPM Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UHV Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Bronze Plated Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Dimensionally Transcendent Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Dimensional Injection Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Dimensional Bridge");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block");
         ItemList.Casing_ULV.set(new ItemStack(this, 1, 0));
         ItemList.Casing_LV.set(new ItemStack(this, 1, 1));
         ItemList.Casing_MV.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings10.java b/src/main/java/gregtech/common/blocks/BlockCasings10.java
index 1a0902da97..11c3f81f01 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings10.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings10.java
@@ -7,30 +7,30 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings10 extends GT_Block_Casings_Abstract {
+public class BlockCasings10 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings10() {
-        super(GT_Item_Casings10.class, "gt.blockcasings10", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "MagTech Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Laser Containment Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Quark Exclusion Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Pressure Containment Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Electric Compressor Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Compression Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Neutronium Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Active Neutronium Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Neutronium Stabilization Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Coolant Duct");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Heating Duct");
-        GT_LanguageManager
+    public BlockCasings10() {
+        super(ItemCasings10.class, "gt.blockcasings10", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "MagTech Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Laser Containment Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Quark Exclusion Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Pressure Containment Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Electric Compressor Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Compression Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Neutronium Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Active Neutronium Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Neutronium Stabilization Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Coolant Duct");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Heating Duct");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".11.name", "Extreme Density Space-Bending Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".12.name", "Background Radiation Absorbent Casing");
 
         ItemList.Casing_Electromagnetic_Separator.set(new ItemStack(this, 1, 0));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings11.java b/src/main/java/gregtech/common/blocks/BlockCasings11.java
index b4ec07ab70..a654aae3d7 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings11.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings11.java
@@ -7,24 +7,24 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings11 extends GT_Block_Casings_Abstract {
+public class BlockCasings11 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings11() {
-        super(GT_Item_Casings11.class, "gt.blockcasings11", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tin Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Brass Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Electrum Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Platinum Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Osmium Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Quantium Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fluxed Electrum Item Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Black Plutonium Item Pipe Casing");
+    public BlockCasings11() {
+        super(ItemCasings11.class, "gt.blockcasings11", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tin Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Brass Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Electrum Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Platinum Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Osmium Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Quantium Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fluxed Electrum Item Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Black Plutonium Item Pipe Casing");
 
         ItemList.Casing_Item_Pipe_Tin.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Item_Pipe_Brass.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java b/src/main/java/gregtech/common/blocks/BlockCasings2.java
index f1fbc30236..441bbd9b82 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings2.java
@@ -12,16 +12,16 @@ import gregtech.api.enums.Dyes;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings2 extends GT_Block_Casings_Abstract {
+public class BlockCasings2 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings2() {
-        super(GT_Item_Casings2.class, "gt.blockcasings2", GT_Material_Casings.INSTANCE, 96);
+    public BlockCasings2() {
+        super(ItemCasings2.class, "gt.blockcasings2", MaterialCasings.INSTANCE, 96);
         // Special handler for Pyrolyse Oven Casing on hatches...
         Textures.BlockIcons.casingTexturePages[0][22] = TextureFactory.of(
             Block.getBlockFromItem(
@@ -31,22 +31,22 @@ public class GT_Block_Casings2 extends GT_Block_Casings_Abstract {
             ForgeDirection.UNKNOWN,
             Dyes.MACHINE_METAL.mRGBa);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Solid Steel Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Frost Proof Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Bronze Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Steel Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Titanium Gear Box Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Assembling Line Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Processor Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Data Drive Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Containment Field Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Assembler Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Pump Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Motor Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Bronze Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Steel Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Titanium Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Solid Steel Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Frost Proof Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Bronze Gear Box Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Steel Gear Box Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Titanium Gear Box Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Assembling Line Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Processor Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Data Drive Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Containment Field Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Assembler Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Pump Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Motor Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Bronze Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Steel Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Titanium Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Pipe Casing");
         ItemList.Casing_SolidSteel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_FrostProof.set(new ItemStack(this, 1, 1));
         ItemList.Casing_Gearbox_Bronze.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java b/src/main/java/gregtech/common/blocks/BlockCasings3.java
index ada77814c8..fdd48b62ed 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings3.java
@@ -5,32 +5,32 @@ import net.minecraft.util.IIcon;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings3 extends GT_Block_Casings_Abstract {
+public class BlockCasings3 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings3() {
-        super(GT_Item_Casings3.class, "gt.blockcasings3", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Yellow Stripes Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Yellow Stripes Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Radioactive Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Bio Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Explosion Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fire Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Acid Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Frost Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Noise Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Grate Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Filter Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Radiation Proof Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Bronze Firebox Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Steel Firebox Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Firebox Casing");
+    public BlockCasings3() {
+        super(ItemCasings3.class, "gt.blockcasings3", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Yellow Stripes Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Yellow Stripes Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Radioactive Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Bio Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Explosion Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fire Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Acid Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Frost Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Noise Hazard Sign Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Grate Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Filter Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Radiation Proof Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Bronze Firebox Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Steel Firebox Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Firebox Casing");
         ItemList.Casing_Stripes_A.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Stripes_B.set(new ItemStack(this, 1, 1));
         ItemList.Casing_RadioactiveHazard.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/BlockCasings4.java
index 77f36a4523..0cba916548 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings4.java
@@ -7,19 +7,19 @@ import net.minecraft.world.IBlockAccess;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_RenderingWorld;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTRenderingWorld;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbine;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
+public class BlockCasings4 extends BlockCasingsAbstract {
 
     /**
      * This mapping is used to look up which texture should be used to render the connected texture for fusion casings.
@@ -44,24 +44,24 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
 
     public static boolean mConnectedMachineTextures = true;
 
-    public GT_Block_Casings4() {
-        super(GT_Item_Casings4.class, "gt.blockcasings4", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager
+    public BlockCasings4() {
+        super(ItemCasings4.class, "gt.blockcasings4", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".0.name", "Robust Tungstensteel Machine Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".1.name", "Clean Stainless Steel Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Stable Titanium Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Titanium Firebox Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fusion Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Fusion Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Fusion Machine Casing MK II");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Turbine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Stainless Steel Turbine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Engine Intake Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Mining Osmiridium Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Firebricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Stable Titanium Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Titanium Firebox Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fusion Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Fusion Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Fusion Machine Casing MK II");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Turbine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Stainless Steel Turbine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Engine Intake Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Mining Osmiridium Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Firebricks");
 
         ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1));
@@ -78,8 +78,8 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
         ItemList.Casing_MiningOsmiridium.set(new ItemStack(this, 1, 14));
         ItemList.Casing_Firebricks.set(new ItemStack(this, 1, 15));
 
-        GT_Mod.gregtechproxy.mCTMBlockCache.put(this, (byte) 6, true);
-        GT_Mod.gregtechproxy.mCTMBlockCache.put(this, (byte) 8, true);
+        GTMod.gregtechproxy.mCTMBlockCache.put(this, (byte) 6, true);
+        GTMod.gregtechproxy.mCTMBlockCache.put(this, (byte) 8, true);
     }
 
     @Override
@@ -136,7 +136,7 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
     private static int isTurbineControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int ordinalSide) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0;
-        if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine turbine && tTile.getFrontFacing()
+        if (tTile.getMetaTileEntity() instanceof MTELargeTurbine turbine && tTile.getFrontFacing()
             .ordinal() == ordinalSide) {
             if (turbine.isNewStyleRendering()) return 0;
             if (tTile.isActive()) return 1;
@@ -148,7 +148,7 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int ordinalSide) {
-        aWorld = GT_RenderingWorld.getInstance(aWorld);
+        aWorld = GTRenderingWorld.getInstance(aWorld);
         int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
         if (tMeta != 6 && tMeta != 8 && tMeta != 9 && tMeta != 10 && tMeta != 11 && tMeta != 12
             || !mConnectedMachineTextures) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/BlockCasings5.java
index 0cb1934dec..15b3eedcba 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings5.java
@@ -27,30 +27,30 @@ import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IHeatingCoil;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings5 extends GT_Block_Casings_Abstract implements IHeatingCoil {
-
-    public GT_Block_Casings5() {
-        super(GT_Item_Casings5.class, "gt.blockcasings5", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Cupronickel Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Kanthal Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Nichrome Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "TPV-Alloy Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "HSS-G Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Naquadah Alloy Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Electrum Flux Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Awakened Draconium Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "HSS-S Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Trinium Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Infinity Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hypogen Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Eternal Coil Block");
+public class BlockCasings5 extends BlockCasingsAbstract implements IHeatingCoil {
+
+    public BlockCasings5() {
+        super(ItemCasings5.class, "gt.blockcasings5", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Cupronickel Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Kanthal Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Nichrome Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "TPV-Alloy Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "HSS-G Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Naquadah Alloy Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Electrum Flux Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Awakened Draconium Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "HSS-S Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Trinium Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Infinity Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hypogen Coil Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Eternal Coil Block");
 
         ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java b/src/main/java/gregtech/common/blocks/BlockCasings6.java
index 9bdbf256cc..e638f36547 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings6.java
@@ -8,32 +8,32 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings6 extends GT_Block_Casings_Abstract {
+public class BlockCasings6 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings6() {
-        super(GT_Item_Casings6.class, "gt.blockcasings6", GT_Material_Casings.INSTANCE, 16);
+    public BlockCasings6() {
+        super(ItemCasings6.class, "gt.blockcasings6", MaterialCasings.INSTANCE, 16);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hermetic Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hermetic Casing I");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Hermetic Casing II");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Hermetic Casing III");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Hermetic Casing IV");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Hermetic Casing V");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Hermetic Casing VI");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hermetic Casing VII");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hermetic Casing VIII");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hermetic Casing IX");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Hermetic Casing X");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Hermetic Casing XI");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hermetic Casing XII");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Hermetic Casing XIII");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Hermetic Casing XIV");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hermetic Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hermetic Casing I");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Hermetic Casing II");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Hermetic Casing III");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Hermetic Casing IV");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Hermetic Casing V");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Hermetic Casing VI");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hermetic Casing VII");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hermetic Casing VIII");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hermetic Casing IX");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Hermetic Casing X");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Hermetic Casing XI");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hermetic Casing XII");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Hermetic Casing XIII");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Hermetic Casing XIV");
 
         ItemList.Casing_Tank_0.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Tank_1.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java b/src/main/java/gregtech/common/blocks/BlockCasings8.java
index 0baeea1411..2e8781bca1 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings8.java
@@ -10,49 +10,49 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_RenderingWorld;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTRenderingWorld;
+import gregtech.common.tileentities.machines.multi.MTELargeTurbine;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings8 extends GT_Block_Casings_Abstract {
+public class BlockCasings8 extends BlockCasingsAbstract {
 
     public static boolean mConnectedMachineTextures = true;
 
     // WATCH OUT FOR TEXTURE ID's
-    public GT_Block_Casings8() {
-        super(GT_Item_Casings8.class, "gt.blockcasings8", GT_Material_Casings.INSTANCE, 15);
+    public BlockCasings8() {
+        super(ItemCasings8.class, "gt.blockcasings8", MaterialCasings.INSTANCE, 15);
         /*
          * DO NOT USE INDEX 15 ! USED HERE: https://github.com/GTNewHorizons/KubaTech/pull/101
          */
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemically Inert Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "PTFE Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mining Neutronium Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Mining Black Plutonium Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Extreme Engine Intake Casing");
-        GT_LanguageManager.addStringLocalization(
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemically Inert Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "PTFE Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mining Neutronium Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Mining Black Plutonium Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Extreme Engine Intake Casing");
+        GTLanguageManager.addStringLocalization(
             getUnlocalizedName() + ".5.name",
             "Europium Reinforced Radiation Proof Machine Casing");
-        GT_LanguageManager.addStringLocalization(
+        GTLanguageManager.addStringLocalization(
             getUnlocalizedName() + ".6.name",
             "Advanced Rhodium Plated Palladium Machine Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".7.name", "Advanced Iridium Plated Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Magical Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "HSS-S Turbine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Radiant Naquadah Alloy Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Magical Machine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "HSS-S Turbine Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Radiant Naquadah Alloy Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".11.name", "Basic Photolithographic Framework Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".12.name", "Reinforced Photolithographic Framework Casing");
-        GT_LanguageManager.addStringLocalization(
+        GTLanguageManager.addStringLocalization(
             getUnlocalizedName() + ".13.name",
             "Radiation Proof Photolithographic Framework Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Infinity Cooled Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Infinity Cooled Casing");
 
         ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 1));
@@ -115,7 +115,7 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract {
     private static int isTurbineControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int ordinalSide) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0;
-        if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine turbine && tTile.getFrontFacing()
+        if (tTile.getMetaTileEntity() instanceof MTELargeTurbine turbine && tTile.getFrontFacing()
             .ordinal() == ordinalSide) {
             if (turbine.isNewStyleRendering()) return 0;
             if (tTile.isActive()) return 1;
@@ -127,7 +127,7 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int ordinalSide) {
-        aWorld = GT_RenderingWorld.getInstance(aWorld);
+        aWorld = GTRenderingWorld.getInstance(aWorld);
         final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
 
         if (tMeta != 9 || !mConnectedMachineTextures) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java b/src/main/java/gregtech/common/blocks/BlockCasings9.java
index 6f33cda013..a58ac1f25c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings9.java
@@ -7,43 +7,43 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Block_Casings9 extends GT_Block_Casings_Abstract {
+public class BlockCasings9 extends BlockCasingsAbstract {
 
-    public GT_Block_Casings9() {
-        super(GT_Item_Casings9.class, "gt.blockcasings9", GT_Material_Casings.INSTANCE, 16);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "PBI Pipe Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Advanced Filter Casing");
-        GT_LanguageManager
+    public BlockCasings9() {
+        super(ItemCasings9.class, "gt.blockcasings9", MaterialCasings.INSTANCE, 16);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "PBI Pipe Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Advanced Filter Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".1.tooltip", "Less than five 0.1μm particles per m^3");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Primitive Wooden Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Primitive Wooden Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".3.name", "Superplasticizer-Treated High Strength Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Sterile Water Plant Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Sterile Water Plant Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".5.name", "Reinforced Sterile Water Plant Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Slick Sterile Flocculation Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Slick Sterile Flocculation Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".7.name", "Stabilized Naquadah Water Plant Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".8.name", "Inert Neutralization Water Plant Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Reactive Gas Containment Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Inert Filtration Casing");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Reactive Gas Containment Casing");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Inert Filtration Casing");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".11.name", "Heat-Resistant Trinium Plated Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".12.name", "Naquadria-Reinforced Water Plant Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".13.name", "High Energy Ultraviolet Emitter Casing");
         // placeholder name
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".14.name", "Particle Beam Guidance Pipe Casing");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".15.name", "Femtometer-Calibrated Particle Beam Casing");
 
         ItemList.Casing_Pipe_Polybenzimidazole.set(new ItemStack(this, 1, 0));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/BlockCasingsAbstract.java
index cfa51f8e99..5481f1f058 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasingsAbstract.java
@@ -18,28 +18,27 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Textures;
-import gregtech.api.items.GT_Generic_Block;
+import gregtech.api.items.GTGenericBlock;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The base class for casings. Casings are the blocks that are mainly used to build multiblocks.
  */
-public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block
+public abstract class BlockCasingsAbstract extends GTGenericBlock
     implements gregtech.api.interfaces.IHasIndexedTexture {
 
-    public GT_Block_Casings_Abstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
+    public BlockCasingsAbstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
         super(aItemClass, aName, aMaterial);
         setStepSound(soundTypeMetal);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GregTech_API.registerMachineBlock(this, -1);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
+        GregTechAPI.registerMachineBlock(this, -1);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
     }
 
-    public GT_Block_Casings_Abstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial,
-        int aMaxMeta) {
+    public BlockCasingsAbstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial, int aMaxMeta) {
         this(aItemClass, aName, aMaterial);
         for (int i = 0; i < aMaxMeta; i++) {
             Textures.BlockIcons.setCasingTextureForId(getTextureIndex(i), TextureFactory.of(this, i));
@@ -73,8 +72,8 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block
 
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, 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);
         }
     }
 
@@ -100,8 +99,8 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, 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/gregtech/common/blocks/BlockConcretes.java b/src/main/java/gregtech/common/blocks/BlockConcretes.java
new file mode 100644
index 0000000000..1bf8dcf2fe
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/BlockConcretes.java
@@ -0,0 +1,83 @@
+package gregtech.common.blocks;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.interfaces.IBlockOnWalkOver;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+
+public class BlockConcretes extends BlockStonesAbstract implements IBlockOnWalkOver {
+
+    public BlockConcretes() {
+        super(ItemConcretes.class, "gt.blockconcretes");
+        setResistance(20.0F);
+        // this.slipperiness = 0.9F;
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Dark Concrete");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Dark Concrete Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Dark Concrete Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Dark Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Dark Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Dark Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Dark Concrete");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Dark Concrete");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Light Concrete");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Light Concrete Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Light Concrete Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Light Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Light Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Light Concrete Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Light Concrete");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Light Concrete");
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 0));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 1));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 2));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 3));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 4));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 5));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 6));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 7));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 8));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 9));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 10));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 11));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 12));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 13));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 14));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 15));
+    }
+
+    @Override
+    public int getHarvestLevel(int aMeta) {
+        return 1;
+    }
+
+    @Override
+    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
+        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ);
+    }
+
+    @Override
+    public IIcon getIcon(int ordinalSide, int aMeta) {
+        if ((aMeta >= 0) && (aMeta < 16)) {
+            return gregtech.api.enums.Textures.BlockIcons.CONCRETES[aMeta].getIcon();
+        }
+        return gregtech.api.enums.Textures.BlockIcons.CONCRETES[0].getIcon();
+    }
+
+    @Override
+    public void onWalkOver(EntityLivingBase aEntity, World aWorld, int aX, int aY, int aZ) {
+        if ((aEntity.motionX != 0 || aEntity.motionZ != 0) && !aEntity.isInWater()
+            && !aEntity.isWet()
+            && !aEntity.isSneaking()) {
+            double tSpeed = (aWorld.getBlock(aX, aY - 1, aZ).slipperiness >= 0.8 ? 1.5 : 1.2);
+            aEntity.motionX *= tSpeed;
+            aEntity.motionZ *= tSpeed;
+        }
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java b/src/main/java/gregtech/common/blocks/BlockCyclotronCoils.java
index 3c4250540c..437e48a37a 100644
--- a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java
+++ b/src/main/java/gregtech/common/blocks/BlockCyclotronCoils.java
@@ -6,24 +6,24 @@ import net.minecraft.world.IBlockAccess;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Cyclotron_Coils extends GT_Block_Casings_Abstract {
+public class BlockCyclotronCoils extends BlockCasingsAbstract {
 
-    public GT_Cyclotron_Coils() {
-        super(GT_Cyclotron_Item_Casings.class, "gt.blockcasings.cyclotron_coils", GT_Material_Casings.INSTANCE, 16);
+    public BlockCyclotronCoils() {
+        super(ItemCyclotronCasings.class, "gt.blockcasings.cyclotron_coils", MaterialCasings.INSTANCE, 16);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "MV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "HV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "EV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "IV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "LuV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "ZPM Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "UV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "UHV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UEV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UIV Solenoid Superconductor Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "UMV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "MV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "HV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "EV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "IV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "LuV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "ZPM Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "UV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "UHV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UEV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UIV Solenoid Superconductor Coil");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "UMV Solenoid Superconductor Coil");
 
         ItemList.Superconducting_Magnet_Solenoid_MV.set(new ItemStack(this, 1, 0));
         ItemList.Superconducting_Magnet_Solenoid_HV.set(new ItemStack(this, 1, 1));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Drone.java b/src/main/java/gregtech/common/blocks/BlockDrone.java
index 81d1acc228..2d1bedff9a 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Drone.java
+++ b/src/main/java/gregtech/common/blocks/BlockDrone.java
@@ -12,16 +12,16 @@ import net.minecraft.world.World;
 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.common.tileentities.render.TileDrone;
+import gregtech.api.GregTechAPI;
+import gregtech.common.tileentities.render.TileEntityDrone;
 
-public class GT_Block_Drone extends Block {
+public class BlockDrone extends Block {
 
-    public GT_Block_Drone() {
+    public BlockDrone() {
         super(Material.iron);
         this.setResistance(20f);
         this.setHardness(-1.0f);
-        this.setCreativeTab(GregTech_API.TAB_GREGTECH);
+        this.setCreativeTab(GregTechAPI.TAB_GREGTECH);
         this.setBlockName("gt.dronerender");
         this.setLightLevel(100.0f);
         GameRegistry.registerBlock(this, getUnlocalizedName());
@@ -55,7 +55,7 @@ public class GT_Block_Drone extends Block {
 
     @Override
     public TileEntity createTileEntity(World world, int metadata) {
-        return new TileDrone();
+        return new TileEntityDrone();
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java b/src/main/java/gregtech/common/blocks/BlockFrameBox.java
index 76e3180d58..59ca98ef8e 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java
+++ b/src/main/java/gregtech/common/blocks/BlockFrameBox.java
@@ -1,6 +1,6 @@
 package gregtech.common.blocks;
 
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.GTValues.W;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 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.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -34,13 +34,13 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
 import gregtech.api.metatileentity.CoverableTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame;
+import gregtech.api.metatileentity.implementations.MTEFrame;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.GT_Renderer_Block;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.GTRendererBlock;
 
-public class GT_Block_FrameBox extends BlockContainer {
+public class BlockFrameBox extends BlockContainer {
 
     protected final String mUnlocalizedName;
 
@@ -51,21 +51,21 @@ public class GT_Block_FrameBox extends BlockContainer {
     // properly call getDrops() on it
     private static final ThreadLocal<IGregTechTileEntity> mTemporaryTileEntity = new ThreadLocal<>();
 
-    public GT_Block_FrameBox() {
-        super(new GT_Material_Machines());
+    public BlockFrameBox() {
+        super(new MaterialMachines());
         this.mUnlocalizedName = "gt.blockframes";
         setBlockName(this.mUnlocalizedName);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + W + ".name", "Any Sub Block of this one");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + "." + W + ".name", "Any Sub Block of this one");
 
-        GameRegistry.registerBlock(this, GT_Item_Frames.class, getUnlocalizedName());
+        GameRegistry.registerBlock(this, ItemFrames.class, getUnlocalizedName());
 
-        for (int meta = 1; meta < GregTech_API.sGeneratedMaterials.length; meta++) {
-            Materials material = GregTech_API.sGeneratedMaterials[meta];
+        for (int meta = 1; meta < GregTechAPI.sGeneratedMaterials.length; meta++) {
+            Materials material = GregTechAPI.sGeneratedMaterials[meta];
             if (material != null && (material.mTypes & 0x02) != 0) {
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     getUnlocalizedName() + "." + meta + DOT_NAME,
-                    GT_LanguageManager.i18nPlaceholder ? getLocalizedNameFormat(material) : getLocalizedName(material));
-                GT_LanguageManager
+                    GTLanguageManager.i18nPlaceholder ? getLocalizedNameFormat(material) : getLocalizedName(material));
+                GTLanguageManager
                     .addStringLocalization(getUnlocalizedName() + "." + meta + DOT_TOOLTIP, material.getToolTip());
             }
         }
@@ -93,14 +93,14 @@ public class GT_Block_FrameBox extends BlockContainer {
     }
 
     private boolean isCover(ItemStack item) {
-        return GT_Utility.isStackInList(item, GregTech_API.sCovers.keySet());
+        return GTUtility.isStackInList(item, GregTechAPI.sCovers.keySet());
     }
 
     private void createFrame(World worldIn, int x, int y, int z, BaseMetaPipeEntity baseMte) {
         // Obtain metadata to grab proper material identifier
         int meta = worldIn.getBlockMetadata(x, y, z);
         Materials material = getMaterial(meta);
-        GT_MetaPipeEntity_Frame frame = new GT_MetaPipeEntity_Frame("GT_Frame_" + material, material);
+        MTEFrame frame = new MTEFrame("GT_Frame_" + material, material);
         baseMte.setMetaTileEntity(frame);
         frame.setBaseMetaTileEntity(baseMte);
     }
@@ -115,7 +115,7 @@ public class GT_Block_FrameBox extends BlockContainer {
 
     // Get the material that this frame box is made of
     public static Materials getMaterial(int meta) {
-        return GregTech_API.sGeneratedMaterials[meta];
+        return GregTechAPI.sGeneratedMaterials[meta];
     }
 
     @Override
@@ -148,10 +148,10 @@ public class GT_Block_FrameBox extends BlockContainer {
 
     @Override
     public int getRenderType() {
-        if (GT_Renderer_Block.INSTANCE == null) {
+        if (GTRendererBlock.INSTANCE == null) {
             return super.getRenderType();
         }
-        return GT_Renderer_Block.mRenderID;
+        return GTRendererBlock.mRenderID;
     }
 
     @Override
@@ -167,8 +167,8 @@ public class GT_Block_FrameBox extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item aItem, CreativeTabs aTab, List<ItemStack> aList) {
-        for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) {
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[i];
+        for (int i = 0; i < GregTechAPI.sGeneratedMaterials.length; i++) {
+            Materials tMaterial = GregTechAPI.sGeneratedMaterials[i];
             // If material is not null and has a frame box item associated with it
             if ((tMaterial != null) && ((tMaterial.mTypes & 0x02) != 0)) {
                 aList.add(new ItemStack(aItem, 1, i));
@@ -215,14 +215,14 @@ public class GT_Block_FrameBox extends BlockContainer {
             mTemporaryTileEntity.set(gtTE);
         }
         // Cause structure update
-        GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata);
     }
 
     @Override
     public void onBlockAdded(World worldIn, int x, int y, int z) {
         // Cause structure update
-        GregTech_API.causeMachineUpdate(worldIn, x, y, z);
+        GregTechAPI.causeMachineUpdate(worldIn, x, y, z);
         super.onBlockAdded(worldIn, x, y, z);
     }
 
@@ -426,7 +426,7 @@ public class GT_Block_FrameBox extends BlockContainer {
 
     @Override
     public IIcon getIcon(int side, int meta) {
-        Materials material = GregTech_API.sGeneratedMaterials[meta];
+        Materials material = GregTechAPI.sGeneratedMaterials[meta];
         if (material == null) return null;
         return material.mIconSet.mTextures[OrePrefixes.frameGt.mTextureIndex].getIcon();
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Glass1.java b/src/main/java/gregtech/common/blocks/BlockGlass1.java
index 2aa5613d11..a8a287248b 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Glass1.java
+++ b/src/main/java/gregtech/common/blocks/BlockGlass1.java
@@ -11,7 +11,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The glass is split into separate files because they are registered as regular blocks, and a regular block can have
@@ -19,19 +19,19 @@ import gregtech.api.util.GT_LanguageManager;
  *
  * This class hosts various special types of tiered glass with not many tiers.
  */
-public class GT_Block_Glass1 extends GT_Block_Casings_Abstract {
+public class BlockGlass1 extends BlockCasingsAbstract {
 
-    public GT_Block_Glass1() {
-        super(GT_Item_Glass1.class, "gt.blockglass1", Material.glass, 4);
+    public BlockGlass1() {
+        super(ItemGlass1.class, "gt.blockglass1", Material.glass, 4);
         this.opaque = false;
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemical Grade Glass");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemical Grade Glass");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".1.name", "Electron-Permeable Neutronium Coated Glass");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Omni-Purpose Infinity Fused Glass");
-        GT_LanguageManager
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Omni-Purpose Infinity Fused Glass");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".3.name", "Non-Photonic Matter Exclusion Glass");
-        GT_LanguageManager
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".4.name", "Hawking Radiation Realignment Focus");
 
         ItemList.GlassPHResistant.set(new ItemStack(this, 1, 0));
diff --git a/src/main/java/gregtech/common/blocks/BlockGranites.java b/src/main/java/gregtech/common/blocks/BlockGranites.java
new file mode 100644
index 0000000000..43a3f7a7e2
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/BlockGranites.java
@@ -0,0 +1,77 @@
+package gregtech.common.blocks;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+
+public class BlockGranites extends BlockStonesAbstract {
+
+    public BlockGranites() {
+        super(ItemGranites.class, "gt.blockgranites");
+        setResistance(60.0F);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Black Granite");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Black Granite Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Black Granite Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Black Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Black Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Black Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Black Granite");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Black Granite");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Red Granite");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Red Granite Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Red Granite Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Red Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Red Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Red Granite Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Red Granite");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Red Granite");
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 0));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 1));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 2));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 3));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 4));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 5));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 6));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 7));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 8));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 9));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 10));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 11));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 12));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 13));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 14));
+        GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 15));
+    }
+
+    @Override
+    public int getHarvestLevel(int aMeta) {
+        return 3;
+    }
+
+    @Override
+    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
+        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ) * 3.0F;
+    }
+
+    @Override
+    public IIcon getIcon(int ordinalSide, int aMeta) {
+        if ((aMeta >= 0) && (aMeta < 16)) {
+            return gregtech.api.enums.Textures.BlockIcons.GRANITES[aMeta].getIcon();
+        }
+        return gregtech.api.enums.Textures.BlockIcons.GRANITES[0].getIcon();
+    }
+
+    @Override
+    public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) {
+        return !(entity instanceof EntityWither);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Laser.java b/src/main/java/gregtech/common/blocks/BlockLaser.java
index 038b114284..8a67ed6bc9 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Laser.java
+++ b/src/main/java/gregtech/common/blocks/BlockLaser.java
@@ -12,37 +12,37 @@ import net.minecraft.world.World;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.tileentities.render.TileLaser;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.tileentities.render.TileEntityLaser;
 
-public class GT_Block_Laser extends Block implements ITileEntityProvider {
+public class BlockLaser extends Block implements ITileEntityProvider {
 
     public static IIcon[] textures;
 
-    public GT_Block_Laser() {
+    public BlockLaser() {
         super(Material.iron);
         setBlockName("LaserPlate");
-        this.setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".name", "Laser Resistant Plate");
-        GregTech_API.registerMachineBlock(this, -1);
-        GameRegistry.registerBlock(this, GT_Item_Block_Laser.class, getUnlocalizedName());
+        this.setCreativeTab(GregTechAPI.TAB_GREGTECH);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".name", "Laser Resistant Plate");
+        GregTechAPI.registerMachineBlock(this, -1);
+        GameRegistry.registerBlock(this, ItemBlockLaser.class, getUnlocalizedName());
         ItemList.Laser_Plate.set(new ItemStack(this, 1));
     }
 
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, 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);
         }
     }
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, 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);
         }
     }
 
@@ -99,6 +99,6 @@ public class GT_Block_Laser extends Block implements ITileEntityProvider {
 
     @Override
     public TileEntity createNewTileEntity(World world, int meta) {
-        return new TileLaser();
+        return new TileEntityLaser();
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/BlockMachines.java
index 2f80929d94..1db6f51730 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/BlockMachines.java
@@ -1,6 +1,6 @@
 package gregtech.common.blocks;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 
 import java.util.ArrayList;
@@ -34,39 +34,39 @@ import com.cricketcraft.chisel.api.IFacade;
 import cpw.mods.fml.common.Optional;
 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.Textures;
 import gregtech.api.interfaces.IDebugableBlock;
 import gregtech.api.interfaces.tileentity.IColoredTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IDebugableTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_Generic_Block;
+import gregtech.api.items.GTGenericBlock;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
 import gregtech.api.metatileentity.CoverableTileEntity;
-import gregtech.api.util.GT_BaseCrop;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTBaseCrop;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.render.GT_Renderer_Block;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest;
-import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneBase;
+import gregtech.common.render.GTRendererBlock;
+import gregtech.common.tileentities.storage.MTEQuantumChest;
+import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneBase;
 
 @Optional.Interface(iface = "com.cricketcraft.chisel.api.IFacade", modid = "ChiselAPI")
-public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlock, ITileEntityProvider, IFacade {
+public class BlockMachines extends GTGenericBlock implements IDebugableBlock, ITileEntityProvider, IFacade {
 
     private static final ThreadLocal<IGregTechTileEntity> mTemporaryTileEntity = new ThreadLocal<>();
     private boolean renderAsNormalBlock;
 
-    public GT_Block_Machines() {
-        super(GT_Item_Machines.class, "gt.blockmachines", new GT_Material_Machines());
-        GregTech_API.registerMachineBlock(this, -1);
+    public BlockMachines() {
+        super(ItemMachines.class, "gt.blockmachines", new MaterialMachines());
+        GregTechAPI.registerMachineBlock(this, -1);
         setHardness(1.0F);
         setResistance(10.0F);
         setStepSound(soundTypeMetal);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
         this.isBlockContainer = true;
         this.renderAsNormalBlock = true;
         this.useNeighborBrightness = true;
@@ -109,8 +109,8 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
         super.onBlockAdded(aWorld, aX, aY, 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);
         }
     }
 
@@ -131,25 +131,25 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
 
     @Override
     public int getFireSpreadSpeed(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection face) {
-        return GregTech_API.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0) ? 100 : 0;
+        return GregTechAPI.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0) ? 100 : 0;
     }
 
     @Override
     public int getRenderType() {
-        if (GT_Renderer_Block.INSTANCE == null) {
+        if (GTRendererBlock.INSTANCE == null) {
             return super.getRenderType();
         }
-        return GT_Renderer_Block.INSTANCE.mRenderID;
+        return GTRendererBlock.INSTANCE.mRenderID;
     }
 
     @Override
     public boolean isFireSource(World aWorld, int aX, int aY, int aZ, ForgeDirection side) {
-        return GregTech_API.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
+        return GregTechAPI.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
     }
 
     @Override
     public boolean isFlammable(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection face) {
-        return GregTech_API.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
+        return GregTechAPI.sMachineFlammable && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
     }
 
     @Override
@@ -170,7 +170,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
         };
         final TileEntity machineEntity = aWorld.getTileEntity(aX, aY, aZ);
         return machineEntity instanceof BaseMetaTileEntity bmte && (bmte.getCoverInfoAtSide(forgeSide)
-            .getCoverID() != 0 || bmte.getMetaTileEntity() instanceof GT_MetaTileEntity_RedstoneBase);
+            .getCoverID() != 0 || bmte.getMetaTileEntity() instanceof MTERedstoneBase);
     }
 
     @Override
@@ -198,7 +198,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
         return renderAsNormalBlock;
     }
 
-    public GT_Block_Machines setRenderAsNormalBlock(boolean aBool) {
+    public BlockMachines setRenderAsNormalBlock(boolean aBool) {
         renderAsNormalBlock = aBool;
         return this;
     }
@@ -308,39 +308,39 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     @SideOnly(Side.CLIENT)
     @Override
     public void registerBlockIcons(IIconRegister aIconRegister) {
-        if (!GregTech_API.sPostloadFinished) return;
-        GT_Log.out.println("GT_Mod: Setting up Icon Register for Blocks");
-        GregTech_API.setBlockIconRegister(aIconRegister);
+        if (!GregTechAPI.sPostloadFinished) return;
+        GTLog.out.println("GTMod: Setting up Icon Register for Blocks");
+        GregTechAPI.setBlockIconRegister(aIconRegister);
 
-        GT_Log.out.println("GT_Mod: Registering MetaTileEntity specific Textures");
+        GTLog.out.println("GTMod: Registering MetaTileEntity specific Textures");
         try {
-            for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-                if (GregTech_API.METATILEENTITIES[i] != null) {
-                    GregTech_API.METATILEENTITIES[i].registerIcons(aIconRegister);
+            for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+                if (GregTechAPI.METATILEENTITIES[i] != null) {
+                    GregTechAPI.METATILEENTITIES[i].registerIcons(aIconRegister);
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
-        GT_Log.out.println("GT_Mod: Registering Crop specific Textures");
+        GTLog.out.println("GTMod: Registering Crop specific Textures");
         try {
-            for (GT_BaseCrop tCrop : GT_BaseCrop.sCropList) {
+            for (GTBaseCrop tCrop : GTBaseCrop.sCropList) {
                 tCrop.registerSprites(aIconRegister);
             }
         } catch (Exception e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
-        GT_Log.out.println("GT_Mod: Starting Block Icon Load Phase");
-        GT_FML_LOGGER.info("GT_Mod: Starting Block Icon Load Phase");
+        GTLog.out.println("GTMod: Starting Block Icon Load Phase");
+        GT_FML_LOGGER.info("GTMod: Starting Block Icon Load Phase");
         try {
-            for (Runnable tRunnable : GregTech_API.sGTBlockIconload) {
+            for (Runnable tRunnable : GregTechAPI.sGTBlockIconload) {
                 tRunnable.run();
             }
         } catch (Exception e) {
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
-        GT_Log.out.println("GT_Mod: Finished Block Icon Load Phase");
-        GT_FML_LOGGER.info("GT_Mod: Finished Block Icon Load Phase");
+        GTLog.out.println("GTMod: Finished Block Icon Load Phase");
+        GT_FML_LOGGER.info("GTMod: Finished Block Icon Load Phase");
     }
 
     @Override
@@ -360,11 +360,11 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
         }
         if (aPlayer.isSneaking()) {
             final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
-            if (tCurrentItem != null && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList)
-                && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList)
-                && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList)
-                && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)
-                && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sJackhammerList)) return false;
+            if (tCurrentItem != null && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sScrewdriverList)
+                && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList)
+                && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWireCutterList)
+                && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList)
+                && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sJackhammerList)) return false;
         }
         if (tTileEntity instanceof IGregTechTileEntity gtTE) {
             if (gtTE.getTimer() < 1L) {
@@ -400,7 +400,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     public void onBlockExploded(World aWorld, int aX, int aY, int aZ, Explosion aExplosion) {
         final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity instanceof BaseMetaTileEntity baseTE) {
-            GT_Log.exp.printf(
+            GTLog.exp.printf(
                 "Explosion at : %d | %d | %d DIMID: %s due to near explosion!%n",
                 aX,
                 aY,
@@ -413,12 +413,12 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) {
-        GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity instanceof IGregTechTileEntity gtTE) {
             gtTE.onBlockDestroyed();
             mTemporaryTileEntity.set(gtTE);
-            if (!(gtTE.getMetaTileEntity() instanceof GT_MetaTileEntity_QuantumChest)) {
+            if (!(gtTE.getMetaTileEntity() instanceof MTEQuantumChest)) {
                 for (int i = 0; i < gtTE.getSizeInventory(); i++) {
                     final ItemStack tItem = gtTE.getStackInSlot(i);
                     if ((tItem != null) && (tItem.stackSize > 0) && (gtTE.isValidSlot(i)) && gtTE.shouldDropItemAt(i)) {
@@ -520,8 +520,8 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
         if (!aWorld.isRemote) {
             final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
             if (tTileEntity != null && (chance < 1.0F)) {
-                if (tTileEntity instanceof BaseMetaTileEntity bmte && (GregTech_API.sMachineNonWrenchExplosions)) {
-                    GT_Log.exp.printf(
+                if (tTileEntity instanceof BaseMetaTileEntity bmte && (GregTechAPI.sMachineNonWrenchExplosions)) {
+                    GTLog.exp.printf(
                         "Explosion at : %d | %d | %d DIMID: %s NonWrench picking/Rain!%n",
                         aX,
                         aY,
@@ -600,7 +600,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
 
     @Override
     public TileEntity createTileEntity(World aWorld, int aMeta) {
-        return GregTech_API.createTileEntity(aMeta);
+        return GregTechAPI.createTileEntity(aMeta);
     }
 
     @Override
@@ -616,8 +616,8 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     @SideOnly(Side.CLIENT)
     @Override
     public void getSubBlocks(Item item, CreativeTabs aCreativeTab, List<ItemStack> outputSubBlocks) {
-        for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
-            if (GregTech_API.METATILEENTITIES[i] != null) {
+        for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) {
+            if (GregTechAPI.METATILEENTITIES[i] != null) {
                 outputSubBlocks.add(new ItemStack(item, 1, i));
             }
         }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java b/src/main/java/gregtech/common/blocks/BlockMetal.java
index 753c590e51..642de8b39c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
+++ b/src/main/java/gregtech/common/blocks/BlockMetal.java
@@ -8,14 +8,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
 
-public class GT_Block_Metal extends GT_Block_Storage {
+public class BlockMetal extends BlockStorage {
 
     public Materials[] mMats;
     public OrePrefixes mPrefix;
@@ -23,8 +23,8 @@ public class GT_Block_Metal extends GT_Block_Storage {
     public boolean mHideBlocks;
     public static boolean mNEIisLoaded = NotEnoughItems.isModLoaded();
 
-    public GT_Block_Metal(String aName, Materials[] aMats, OrePrefixes aPrefix, IIconContainer[] aBlockIcons) {
-        super(GT_Item_Storage.class, aName, Material.iron);
+    public BlockMetal(String aName, Materials[] aMats, OrePrefixes aPrefix, IIconContainer[] aBlockIcons) {
+        super(ItemStorage.class, aName, Material.iron);
         mMats = aMats;
         mPrefix = aPrefix;
         mBlockIcons = aBlockIcons;
@@ -32,10 +32,10 @@ public class GT_Block_Metal extends GT_Block_Storage {
 
         for (int i = 0; i < aMats.length; i++) {
             if (aMats[i].mMetaItemSubID > 0 && aMats[i].mHasParentMod) {
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     getUnlocalizedName() + "." + i + ".name",
-                    "Block of " + (GT_LanguageManager.i18nPlaceholder ? "%material" : aMats[i].mDefaultLocalName));
-                GT_OreDictUnificator.registerOre(aPrefix, aMats[i], new ItemStack(this, 1, i));
+                    "Block of " + (GTLanguageManager.i18nPlaceholder ? "%material" : aMats[i].mDefaultLocalName));
+                GTOreDictUnificator.registerOre(aPrefix, aMats[i], new ItemStack(this, 1, i));
             }
         }
         if (aMats.length < 16 && mNEIisLoaded) {
@@ -53,15 +53,15 @@ public class GT_Block_Metal extends GT_Block_Storage {
 
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, 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);
         }
     }
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, 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/gregtech/common/blocks/GT_Block_Ores.java b/src/main/java/gregtech/common/blocks/BlockOres.java
index 015baa2319..f2ae18f195 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
+++ b/src/main/java/gregtech/common/blocks/BlockOres.java
@@ -20,18 +20,18 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.render.TextureFactory;
 
-public class GT_Block_Ores extends GT_Block_Ores_Abstract {
+public class BlockOres extends BlockOresAbstract {
 
     private static final String UNLOCALIZED_NAME = "gt.blockores";
 
-    public GT_Block_Ores() {
+    public BlockOres() {
         super(UNLOCALIZED_NAME, 7, false, Material.rock);
     }
 
@@ -89,7 +89,7 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
 
     @Override
     public Block getDroppedBlock() {
-        return GregTech_API.sBlockOres1;
+        return GregTechAPI.sBlockOres1;
     }
 
     @Override
@@ -100,9 +100,9 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
 
     @Override
     public boolean[] getEnabledMetas() {
-        return new boolean[] { true, true, true, GT_Mod.gregtechproxy.enableBlackGraniteOres,
-            GT_Mod.gregtechproxy.enableRedGraniteOres, GT_Mod.gregtechproxy.enableMarbleOres,
-            GT_Mod.gregtechproxy.enableBasaltOres, true };
+        return new boolean[] { true, true, true, GTMod.gregtechproxy.enableBlackGraniteOres,
+            GTMod.gregtechproxy.enableRedGraniteOres, GTMod.gregtechproxy.enableMarbleOres,
+            GTMod.gregtechproxy.enableBasaltOres, true };
     }
 
     @Override
@@ -134,21 +134,21 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
     public void harvestBlock(World worldIn, EntityPlayer player, int x, int y, int z, int meta) {
 
         if (EnchantmentHelper.getSilkTouchModifier(player)) {
-            GT_TileEntity_Ores.shouldSilkTouch = true;
+            TileEntityOres.shouldSilkTouch = true;
             super.harvestBlock(worldIn, player, x, y, z, meta);
 
-            if (GT_TileEntity_Ores.shouldSilkTouch) {
-                GT_TileEntity_Ores.shouldSilkTouch = false;
+            if (TileEntityOres.shouldSilkTouch) {
+                TileEntityOres.shouldSilkTouch = false;
             }
             return;
         }
 
         if (!(player instanceof FakePlayer)) {
-            GT_TileEntity_Ores.shouldFortune = true;
+            TileEntityOres.shouldFortune = true;
         }
         super.harvestBlock(worldIn, player, x, y, z, meta);
-        if (GT_TileEntity_Ores.shouldFortune) {
-            GT_TileEntity_Ores.shouldFortune = false;
+        if (TileEntityOres.shouldFortune) {
+            TileEntityOres.shouldFortune = false;
         }
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/BlockOresAbstract.java
index 8e68c5c39a..f147c1c41d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/BlockOresAbstract.java
@@ -28,63 +28,63 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.items.GT_Generic_Block;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.GT_Renderer_Block;
+import gregtech.api.items.GTGenericBlock;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.GTRendererBlock;
 
-public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements ITileEntityProvider {
+public abstract class BlockOresAbstract extends GTGenericBlock implements ITileEntityProvider {
 
     private static final String DOT_NAME = ".name";
     private static final String DOT_TOOLTIP = ".tooltip";
-    public static ThreadLocal<GT_TileEntity_Ores> mTemporaryTileEntity = new ThreadLocal<>();
+    public static ThreadLocal<TileEntityOres> mTemporaryTileEntity = new ThreadLocal<>();
     public static boolean FUCKING_LOCK = false;
     public static boolean tHideOres;
     public static Set<Materials> aBlockedOres = new HashSet<>();
 
-    protected GT_Block_Ores_Abstract(String aUnlocalizedName, int aOreMetaCount, boolean aHideFirstMeta,
+    protected BlockOresAbstract(String aUnlocalizedName, int aOreMetaCount, boolean aHideFirstMeta,
         Material aMaterial) {
-        super(GT_Item_Ores.class, aUnlocalizedName, aMaterial);
+        super(ItemOres.class, aUnlocalizedName, aMaterial);
         this.isBlockContainer = true;
         setStepSound(soundTypeStone);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_ORES);
-        tHideOres = NotEnoughItems.isModLoaded() && GT_Mod.gregtechproxy.mHideUnusedOres;
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_ORES);
+        tHideOres = NotEnoughItems.isModLoaded() && GTMod.gregtechproxy.mHideUnusedOres;
         if (aOreMetaCount > 8 || aOreMetaCount < 0) aOreMetaCount = 8;
 
         for (int i = 0; i < 16; i++) {
-            GT_ModHandler.addValuableOre(this, i, 1);
+            GTModHandler.addValuableOre(this, i, 1);
         }
-        for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {
-            if (GregTech_API.sGeneratedMaterials[i] != null) {
+        for (int i = 1; i < GregTechAPI.sGeneratedMaterials.length; i++) {
+            if (GregTechAPI.sGeneratedMaterials[i] != null) {
                 for (int j = 0; j < aOreMetaCount; j++) {
                     if (!this.getEnabledMetas()[j]) continue;
-                    GT_LanguageManager.addStringLocalization(
+                    GTLanguageManager.addStringLocalization(
                         getUnlocalizedName() + "." + (i + (j * 1000)) + DOT_NAME,
-                        GT_LanguageManager.i18nPlaceholder ? getLocalizedNameFormat(GregTech_API.sGeneratedMaterials[i])
-                            : getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                    GT_LanguageManager.addStringLocalization(
+                        GTLanguageManager.i18nPlaceholder ? getLocalizedNameFormat(GregTechAPI.sGeneratedMaterials[i])
+                            : getLocalizedName(GregTechAPI.sGeneratedMaterials[i]));
+                    GTLanguageManager.addStringLocalization(
                         getUnlocalizedName() + "." + (i + (j * 1000)) + DOT_TOOLTIP,
-                        GregTech_API.sGeneratedMaterials[i].getToolTip());
-                    GT_LanguageManager.addStringLocalization(
+                        GregTechAPI.sGeneratedMaterials[i].getToolTip());
+                    GTLanguageManager.addStringLocalization(
                         getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + DOT_NAME,
-                        "Small " + (GT_LanguageManager.i18nPlaceholder
-                            ? getLocalizedNameFormat(GregTech_API.sGeneratedMaterials[i])
-                            : getLocalizedName(GregTech_API.sGeneratedMaterials[i])));
-                    GT_LanguageManager.addStringLocalization(
+                        "Small " + (GTLanguageManager.i18nPlaceholder
+                            ? getLocalizedNameFormat(GregTechAPI.sGeneratedMaterials[i])
+                            : getLocalizedName(GregTechAPI.sGeneratedMaterials[i])));
+                    GTLanguageManager.addStringLocalization(
                         getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + DOT_TOOLTIP,
-                        GregTech_API.sGeneratedMaterials[i].getToolTip());
-                    if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0
-                        && !aBlockedOres.contains(GregTech_API.sGeneratedMaterials[i])) {
-                        GT_OreDictUnificator.registerOre(
+                        GregTechAPI.sGeneratedMaterials[i].getToolTip());
+                    if ((GregTechAPI.sGeneratedMaterials[i].mTypes & 0x8) != 0
+                        && !aBlockedOres.contains(GregTechAPI.sGeneratedMaterials[i])) {
+                        GTOreDictUnificator.registerOre(
                             this.getProcessingPrefix()[j] != null
-                                ? this.getProcessingPrefix()[j].get(GregTech_API.sGeneratedMaterials[i])
+                                ? this.getProcessingPrefix()[j].get(GregTechAPI.sGeneratedMaterials[i])
                                 : "",
                             new ItemStack(this, 1, i + (j * 1000)));
                         if (tHideOres) {
@@ -108,8 +108,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         if (!FUCKING_LOCK) {
             FUCKING_LOCK = true;
             TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-            if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                ((GT_TileEntity_Ores) tTileEntity).onUpdated();
+            if ((tTileEntity instanceof TileEntityOres)) {
+                ((TileEntityOres) tTileEntity).onUpdated();
             }
         }
         FUCKING_LOCK = false;
@@ -120,8 +120,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         if (!FUCKING_LOCK) {
             FUCKING_LOCK = true;
             TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-            if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                ((GT_TileEntity_Ores) tTileEntity).onUpdated();
+            if ((tTileEntity instanceof TileEntityOres)) {
+                ((TileEntityOres) tTileEntity).onUpdated();
             }
         }
         FUCKING_LOCK = false;
@@ -147,12 +147,12 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         }
 
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (!(tTileEntity instanceof GT_TileEntity_Ores)) {
+        if (!(tTileEntity instanceof TileEntityOres)) {
             return false;
         }
 
-        boolean tNatural = (((GT_TileEntity_Ores) tTileEntity).mNatural = !((GT_TileEntity_Ores) tTileEntity).mNatural);
-        GT_Utility.sendChatToPlayer(aPlayer, "Ore \"mNatural\" flag set to: " + tNatural);
+        boolean tNatural = (((TileEntityOres) tTileEntity).mNatural = !((TileEntityOres) tTileEntity).mNatural);
+        GTUtility.sendChatToPlayer(aPlayer, "Ore \"mNatural\" flag set to: " + tNatural);
         return true;
     }
 
@@ -205,10 +205,10 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
 
     @Override
     public int getRenderType() {
-        if (GT_Renderer_Block.INSTANCE == null) {
+        if (GTRendererBlock.INSTANCE == null) {
             return super.getRenderType();
         }
-        return GT_Renderer_Block.INSTANCE.mRenderID;
+        return GTRendererBlock.INSTANCE.mRenderID;
     }
 
     @Override
@@ -250,7 +250,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     @Override
     @SideOnly(Side.CLIENT)
     public boolean addHitEffects(World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) {
-        GT_Renderer_Block
+        GTRendererBlock
             .addHitEffects(effectRenderer, this, worldObj, target.blockX, target.blockY, target.blockZ, target.sideHit);
         return true;
     }
@@ -258,15 +258,15 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     @Override
     @SideOnly(Side.CLIENT)
     public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) {
-        GT_Renderer_Block.addDestroyEffects(effectRenderer, this, world, x, y, z);
+        GTRendererBlock.addDestroyEffects(effectRenderer, this, world, x, y, z);
         return true;
     }
 
     @Override
     public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (((tTileEntity instanceof GT_TileEntity_Ores))) {
-            return ((GT_TileEntity_Ores) tTileEntity).getMetaData();
+        if (((tTileEntity instanceof TileEntityOres))) {
+            return ((TileEntityOres) tTileEntity).getMetaData();
         }
         return 0;
     }
@@ -274,8 +274,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-            mTemporaryTileEntity.set((GT_TileEntity_Ores) tTileEntity);
+        if ((tTileEntity instanceof TileEntityOres)) {
+            mTemporaryTileEntity.set((TileEntityOres) tTileEntity);
         }
         super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata);
         aWorld.removeTileEntity(aX, aY, aZ);
@@ -293,8 +293,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     @Override
     public ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-            return ((GT_TileEntity_Ores) tTileEntity).getDrops(getDroppedBlock(), aFortune);
+        if ((tTileEntity instanceof TileEntityOres)) {
+            return ((TileEntityOres) tTileEntity).getDrops(getDroppedBlock(), aFortune);
         }
         return mTemporaryTileEntity.get() == null ? new ArrayList<>()
             : mTemporaryTileEntity.get()
@@ -303,7 +303,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
 
     @Override
     public TileEntity createTileEntity(World aWorld, int aMeta) {
-        return new GT_TileEntity_Ores();
+        return new TileEntityOres();
     }
 
     public abstract ITexture[] getTextureSet(); // Must have 16 entries.
@@ -311,8 +311,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item aItem, CreativeTabs aTab, List<ItemStack> aList) {
-        for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) {
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[i];
+        for (int i = 0; i < GregTechAPI.sGeneratedMaterials.length; i++) {
+            Materials tMaterial = GregTechAPI.sGeneratedMaterials[i];
             if ((tMaterial != null) && ((tMaterial.mTypes & 0x8) != 0) && !aBlockedOres.contains(tMaterial)) {
                 for (int meta = i; meta < 23000 + i; meta += 1000) {
                     if (!(new ItemStack(aItem, 1, meta).getDisplayName()
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/BlockReinforced.java
index a78fe5b70d..034d18e62e 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
+++ b/src/main/java/gregtech/common/blocks/BlockReinforced.java
@@ -24,40 +24,40 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
-import gregtech.api.items.GT_Generic_Block;
+import gregtech.api.items.GTGenericBlock;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
 import gregtech.api.util.WorldSpawnedEventBuilder;
 
-public class GT_Block_Reinforced extends GT_Generic_Block {
+public class BlockReinforced extends GTGenericBlock {
 
-    public GT_Block_Reinforced(String aName) {
-        super(GT_Item_Storage.class, aName, new GT_Material_Reinforced());
+    public BlockReinforced(String aName) {
+        super(ItemStorage.class, aName, new MaterialReinforced());
         for (int i = 0; i < 16; i++) {
             Textures.BlockIcons.casingTexturePages[1][i + 80] = TextureFactory.of(this, i);
         }
         setStepSound(soundTypeStone);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Bronzeplate Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Iridium Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Plascrete Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tungstensteel Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Brittle Charcoal");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Powderbarrel");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Solid Super Fuel");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Solid Super Fuel");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Steel Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Titanium Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Naquadah Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Neutronium Reinforced Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Raw Deep Dark Portal Block");
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Bronzeplate Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Iridium Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Plascrete Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tungstensteel Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Brittle Charcoal");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Powderbarrel");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Solid Super Fuel");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Solid Super Fuel");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Steel Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Titanium Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Naquadah Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Neutronium Reinforced Block");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Raw Deep Dark Portal Block");
         ItemList.Block_BronzePlate.set(
             new ItemStack(
                 this.setHardness(60.0f)
@@ -136,12 +136,12 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
                     .setResistance(5000.0f),
                 1,
                 12));
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             new ItemStack(Items.coal, 1, 1),
             new Object[] { ItemList.Block_BrittleCharcoal.get(1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Block_Powderbarrel.get(1L),
-            GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "WSW", "GGG", "WGW", 'W', OrePrefixes.plate.get(Materials.Wood), 'G',
                 new ItemStack(Items.gunpowder, 1), 'S', new ItemStack(Items.string, 1) });
     }
diff --git a/src/main/java/gregtech/common/blocks/BlockStones.java b/src/main/java/gregtech/common/blocks/BlockStones.java
new file mode 100644
index 0000000000..895a103016
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/BlockStones.java
@@ -0,0 +1,62 @@
+package gregtech.common.blocks;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
+
+public class BlockStones extends BlockStonesAbstract {
+
+    public BlockStones() {
+        super(ItemGranites.class, "gt.blockstones");
+        setResistance(60.0F);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Marble");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Marble Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Marble Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Marble Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Marble Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Marble Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Marble");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Marble");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Basalt");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Basalt Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Basalt Cobblestone");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Basalt Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Basalt Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Basalt Bricks");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Basalt");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Basalt");
+        for (int i = 0; i < 16; i++) {
+            GTOreDictUnificator
+                .registerOre(OrePrefixes.stone, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i));
+            GTOreDictUnificator
+                .registerOre(OrePrefixes.block, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i));
+            GTOreDictUnificator.registerOre(
+                (i < 8 ? Materials.Marble.mName.toLowerCase() : Materials.Basalt.mName.toLowerCase()),
+                new ItemStack(this, 1, i));
+        }
+    }
+
+    @Override
+    public int getHarvestLevel(int aMeta) {
+        return 2;
+    }
+
+    @Override
+    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
+        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ) * 3.0F;
+    }
+
+    @Override
+    public IIcon getIcon(int ordinalSide, int aMeta) {
+        if ((aMeta >= 0) && (aMeta < 16)) {
+            return gregtech.api.enums.Textures.BlockIcons.STONES[aMeta].getIcon();
+        }
+        return gregtech.api.enums.Textures.BlockIcons.STONES[0].getIcon();
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/BlockStonesAbstract.java
index 4a5bb9456e..3d8c4e9feb 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/BlockStonesAbstract.java
@@ -3,8 +3,8 @@ package gregtech.common.blocks;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import java.util.List;
 
@@ -23,23 +23,23 @@ 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.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OreDictNames;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
-import gregtech.api.items.GT_Generic_Block;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.GTGenericBlock;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
-public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRecipeRegistrator {
+public class BlockStonesAbstract extends GTGenericBlock implements IOreRecipeRegistrator {
 
-    public GT_Block_Stones_Abstract(Class<? extends ItemBlock> aItemClass, String aName) {
+    public BlockStonesAbstract(Class<? extends ItemBlock> aItemClass, String aName) {
         super(aItemClass, aName, Material.rock);
         OrePrefixes.crafting.add(this);
         setStepSound(soundTypeStone);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
 
         this.registerSmeltingRecipes();
         this.registerAssemblerRecipes();
@@ -49,34 +49,34 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe
     }
 
     private void registerSmeltingRecipes() {
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 0), new ItemStack(this, 1, 7));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 1), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 2), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 3), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 4), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 5), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 6), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 7), new ItemStack(this, 1, 0));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 8), new ItemStack(this, 1, 15));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 9), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 10), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 11), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 12), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 13), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 14), new ItemStack(this, 1, 8));
-        GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 15), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 0), new ItemStack(this, 1, 7));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 1), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 2), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 3), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 4), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 5), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 6), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 7), new ItemStack(this, 1, 0));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 8), new ItemStack(this, 1, 15));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 9), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 10), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 11), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 12), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 13), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 14), new ItemStack(this, 1, 8));
+        GTModHandler.addSmeltingRecipe(new ItemStack(this, 1, 15), new ItemStack(this, 1, 8));
 
     }
 
     private void registerAssemblerRecipes() {
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(this, 1, 0), GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(this, 1, 0), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(new ItemStack(this, 1, 3))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(this, 1, 8), GT_Utility.getIntegratedCircuit(4))
+        GTValues.RA.stdBuilder()
+            .itemInputs(new ItemStack(this, 1, 8), GTUtility.getIntegratedCircuit(4))
             .itemOutputs(new ItemStack(this, 1, 11))
             .duration(2 * SECONDS + 10 * TICKS)
             .eut(4)
@@ -84,71 +84,71 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe
     }
 
     private void registerCraftingRecipes() {
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 6),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "f", "X", 'X', new ItemStack(this, 1, 7) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 14),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "f", "X", 'X', new ItemStack(this, 1, 15) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 4),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "h", "X", 'X', new ItemStack(this, 1, 3) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 12),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "h", "X", 'X', new ItemStack(this, 1, 11) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 1),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "h", "X", 'X', new ItemStack(this, 1, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 1, 9),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "h", "X", 'X', new ItemStack(this, 1, 8) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 4, 3),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "XX", "XX", 'X', new ItemStack(this, 4, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 4, 11),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "XX", "XX", 'X', new ItemStack(this, 4, 8) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 4, 3),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "XX", "XX", 'X', new ItemStack(this, 4, 7) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             new ItemStack(this, 4, 11),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "XX", "XX", 'X', new ItemStack(this, 4, 15) });
     }
 
     private void registerForgeHammerRecipes() {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(this, 1, 3))
             .itemOutputs(new ItemStack(this, 1, 4))
             .duration(16 * TICKS)
             .eut(10)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(this, 1, 11))
             .itemOutputs(new ItemStack(this, 1, 12))
             .duration(16 * TICKS)
             .eut(10)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(this, 1, 0))
             .itemOutputs(new ItemStack(this, 1, 1))
             .duration(16 * TICKS)
             .eut(10)
             .addTo(hammerRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(this, 1, 8))
             .itemOutputs(new ItemStack(this, 1, 9))
             .duration(16 * TICKS)
@@ -161,15 +161,15 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe
         ItemStack aStack) {
         if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) {
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(this, 1, 7), GT_Utility.copyAmount(0, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(this, 1, 7), GTUtility.copyAmount(0, aStack))
                 .itemOutputs(new ItemStack(this, 1, 6))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
                 .addTo(laserEngraverRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(new ItemStack(this, 1, 15), GT_Utility.copyAmount(0, aStack))
+            GTValues.RA.stdBuilder()
+                .itemInputs(new ItemStack(this, 1, 15), GTUtility.copyAmount(0, aStack))
                 .itemOutputs(new ItemStack(this, 1, 14))
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java b/src/main/java/gregtech/common/blocks/BlockStorage.java
index ada3f01cde..1886d25d9b 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java
+++ b/src/main/java/gregtech/common/blocks/BlockStorage.java
@@ -17,15 +17,15 @@ 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.items.GT_Generic_Block;
+import gregtech.api.GregTechAPI;
+import gregtech.api.items.GTGenericBlock;
 
-public class GT_Block_Storage extends GT_Generic_Block {
+public class BlockStorage extends GTGenericBlock {
 
-    protected GT_Block_Storage(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
+    protected BlockStorage(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
         super(aItemClass, aName, aMaterial);
         setStepSound(soundTypeMetal);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_TintedIndustrialGlass.java b/src/main/java/gregtech/common/blocks/BlockTintedIndustrialGlass.java
index 93c6ebb298..16a22e7c35 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_TintedIndustrialGlass.java
+++ b/src/main/java/gregtech/common/blocks/BlockTintedIndustrialGlass.java
@@ -12,17 +12,17 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Block_TintedIndustrialGlass extends GT_Block_Casings_Abstract {
+public class BlockTintedIndustrialGlass extends BlockCasingsAbstract {
 
-    public GT_Block_TintedIndustrialGlass() {
-        super(GT_Item_Glass1.class, "gt.blocktintedglass", Material.glass, 4);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tinted Industrial Glass (White)");
-        GT_LanguageManager
+    public BlockTintedIndustrialGlass() {
+        super(ItemGlass1.class, "gt.blocktintedglass", Material.glass, 4);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tinted Industrial Glass (White)");
+        GTLanguageManager
             .addStringLocalization(getUnlocalizedName() + ".1.name", "Tinted Industrial Glass (Light Gray)");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Tinted Industrial Glass (Gray)");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tinted Industrial Glass (Black)");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Tinted Industrial Glass (Gray)");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tinted Industrial Glass (Black)");
         ItemList.GlassTintedIndustrialWhite.set(new ItemStack(this, 1, 0));
         ItemList.GlassTintedIndustrialLightGray.set(new ItemStack(this, 1, 1));
         ItemList.GlassTintedIndustrialGray.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gregtech/common/blocks/GT_WormholeRenderBlock.java b/src/main/java/gregtech/common/blocks/BlockWormholeRender.java
index 1c6e434477..7ae7615639 100644
--- a/src/main/java/gregtech/common/blocks/GT_WormholeRenderBlock.java
+++ b/src/main/java/gregtech/common/blocks/BlockWormholeRender.java
@@ -12,11 +12,11 @@ import net.minecraft.world.World;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.common.tileentities.render.TileWormhole;
+import gregtech.common.tileentities.render.TileEntityWormhole;
 
-public class GT_WormholeRenderBlock extends Block {
+public class BlockWormholeRender extends Block {
 
-    public GT_WormholeRenderBlock() {
+    public BlockWormholeRender() {
         super(Material.iron);
         this.setResistance(20f);
         this.setHardness(-1.0f);
@@ -59,7 +59,7 @@ public class GT_WormholeRenderBlock extends Block {
 
     @Override
     public TileEntity createTileEntity(World world, int metadata) {
-        return new TileWormhole();
+        return new TileEntityWormhole();
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Concretes.java b/src/main/java/gregtech/common/blocks/GT_Block_Concretes.java
deleted file mode 100644
index c7b7e2bb04..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Block_Concretes.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.interfaces.IBlockOnWalkOver;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-
-public class GT_Block_Concretes extends GT_Block_Stones_Abstract implements IBlockOnWalkOver {
-
-    public GT_Block_Concretes() {
-        super(GT_Item_Concretes.class, "gt.blockconcretes");
-        setResistance(20.0F);
-        // this.slipperiness = 0.9F;
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Dark Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Dark Concrete Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Dark Concrete Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Dark Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Dark Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Dark Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Dark Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Dark Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Light Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Light Concrete Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Light Concrete Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Light Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Light Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Light Concrete Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Light Concrete");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Light Concrete");
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 0));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 1));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 2));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 3));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 4));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 5));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 6));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 7));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 8));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 9));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 10));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 11));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 12));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 13));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 14));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Concrete, new ItemStack(this, 1, 15));
-    }
-
-    @Override
-    public int getHarvestLevel(int aMeta) {
-        return 1;
-    }
-
-    @Override
-    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
-        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ);
-    }
-
-    @Override
-    public IIcon getIcon(int ordinalSide, int aMeta) {
-        if ((aMeta >= 0) && (aMeta < 16)) {
-            return gregtech.api.enums.Textures.BlockIcons.CONCRETES[aMeta].getIcon();
-        }
-        return gregtech.api.enums.Textures.BlockIcons.CONCRETES[0].getIcon();
-    }
-
-    @Override
-    public void onWalkOver(EntityLivingBase aEntity, World aWorld, int aX, int aY, int aZ) {
-        if ((aEntity.motionX != 0 || aEntity.motionZ != 0) && !aEntity.isInWater()
-            && !aEntity.isWet()
-            && !aEntity.isSneaking()) {
-            double tSpeed = (aWorld.getBlock(aX, aY - 1, aZ).slipperiness >= 0.8 ? 1.5 : 1.2);
-            aEntity.motionX *= tSpeed;
-            aEntity.motionZ *= tSpeed;
-        }
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Granites.java b/src/main/java/gregtech/common/blocks/GT_Block_Granites.java
deleted file mode 100644
index 69ebc2e733..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Block_Granites.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.boss.EntityWither;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-
-public class GT_Block_Granites extends GT_Block_Stones_Abstract {
-
-    public GT_Block_Granites() {
-        super(GT_Item_Granites.class, "gt.blockgranites");
-        setResistance(60.0F);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Black Granite");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Black Granite Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Black Granite Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Black Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Black Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Black Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Black Granite");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Black Granite");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Red Granite");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Red Granite Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Red Granite Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Red Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Red Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Red Granite Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Red Granite");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Red Granite");
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 0));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 1));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 2));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 3));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 4));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 5));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 6));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(this, 1, 7));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 8));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 9));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 10));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 11));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 12));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 13));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 14));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(this, 1, 15));
-    }
-
-    @Override
-    public int getHarvestLevel(int aMeta) {
-        return 3;
-    }
-
-    @Override
-    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
-        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ) * 3.0F;
-    }
-
-    @Override
-    public IIcon getIcon(int ordinalSide, int aMeta) {
-        if ((aMeta >= 0) && (aMeta < 16)) {
-            return gregtech.api.enums.Textures.BlockIcons.GRANITES[aMeta].getIcon();
-        }
-        return gregtech.api.enums.Textures.BlockIcons.GRANITES[0].getIcon();
-    }
-
-    @Override
-    public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) {
-        return !(entity instanceof EntityWither);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones.java
deleted file mode 100644
index 4ca52aee56..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-
-public class GT_Block_Stones extends GT_Block_Stones_Abstract {
-
-    public GT_Block_Stones() {
-        super(GT_Item_Granites.class, "gt.blockstones");
-        setResistance(60.0F);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Marble");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Marble Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mossy Marble Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Marble Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Cracked Marble Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Mossy Marble Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Chiseled Marble");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Smooth Marble");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Basalt");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Basalt Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Mossy Basalt Cobblestone");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Basalt Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cracked Basalt Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Basalt Bricks");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Basalt");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Basalt");
-        for (int i = 0; i < 16; i++) {
-            GT_OreDictUnificator
-                .registerOre(OrePrefixes.stone, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i));
-            GT_OreDictUnificator
-                .registerOre(OrePrefixes.block, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i));
-            GT_OreDictUnificator.registerOre(
-                (i < 8 ? Materials.Marble.mName.toLowerCase() : Materials.Basalt.mName.toLowerCase()),
-                new ItemStack(this, 1, i));
-        }
-    }
-
-    @Override
-    public int getHarvestLevel(int aMeta) {
-        return 2;
-    }
-
-    @Override
-    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
-        return this.blockHardness = Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ) * 3.0F;
-    }
-
-    @Override
-    public IIcon getIcon(int ordinalSide, int aMeta) {
-        if ((aMeta >= 0) && (aMeta < 16)) {
-            return gregtech.api.enums.Textures.BlockIcons.STONES[aMeta].getIcon();
-        }
-        return gregtech.api.enums.Textures.BlockIcons.STONES[0].getIcon();
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Item_Casings.java b/src/main/java/gregtech/common/blocks/GT_Cyclotron_Item_Casings.java
deleted file mode 100644
index f1ca45a805..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Item_Casings.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-public class GT_Cyclotron_Item_Casings extends GT_Item_Casings_Abstract {
-
-    public GT_Cyclotron_Item_Casings(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings10.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings10.java
deleted file mode 100644
index 519549ce6b..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings10.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-/**
- * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
- * 16 subtypes at most.
- */
-public class GT_Item_Casings10 extends GT_Item_Casings_Abstract {
-
-    public GT_Item_Casings10(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings11.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings11.java
deleted file mode 100644
index 2941022b9c..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings11.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-/**
- * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
- * 16 subtypes at most.
- */
-public class GT_Item_Casings11 extends GT_Item_Casings_Abstract {
-
-    public GT_Item_Casings11(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java
deleted file mode 100644
index e3f3bbdf97..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-/**
- * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
- * 16 subtypes at most.
- */
-public class GT_Item_Casings8 extends GT_Item_Casings_Abstract {
-
-    public GT_Item_Casings8(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Granites.java b/src/main/java/gregtech/common/blocks/GT_Item_Granites.java
deleted file mode 100644
index 6e3eb8f12c..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Item_Granites.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-public class GT_Item_Granites extends GT_Item_Stones_Abstract {
-
-    public GT_Item_Granites(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_TintedIndustrialGlass.java b/src/main/java/gregtech/common/blocks/GT_Item_TintedIndustrialGlass.java
deleted file mode 100644
index 9f633922ac..0000000000
--- a/src/main/java/gregtech/common/blocks/GT_Item_TintedIndustrialGlass.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package gregtech.common.blocks;
-
-import net.minecraft.block.Block;
-
-public class GT_Item_TintedIndustrialGlass extends GT_Item_Casings_Abstract {
-
-    public GT_Item_TintedIndustrialGlass(Block block) {
-        super(block);
-    }
-}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Block_Laser.java b/src/main/java/gregtech/common/blocks/ItemBlockLaser.java
index db4f6ddddc..c8b4d4ce06 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Block_Laser.java
+++ b/src/main/java/gregtech/common/blocks/ItemBlockLaser.java
@@ -7,18 +7,18 @@ 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 class GT_Item_Block_Laser extends ItemBlock {
+public class ItemBlockLaser extends ItemBlock {
 
-    public GT_Item_Block_Laser(Block block) {
+    public ItemBlockLaser(Block block) {
         super(block);
     }
 
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean f3_h) {
         tooltip.add(
-            GT_LanguageManager
+            GTLanguageManager
                 .addStringLocalization("gt.laserplatingtooltip", "Engineered to withstand extreme temperatures"));
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java b/src/main/java/gregtech/common/blocks/ItemCasings1.java
index e2badca2cb..ad1c8c09e1 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings1.java
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings4 extends GT_Item_Casings_Abstract {
+public class ItemCasings1 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings4(Block block) {
+    public ItemCasings1(Block block) {
         super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java b/src/main/java/gregtech/common/blocks/ItemCasings10.java
index 861774d96f..0931987cd4 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings10.java
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings3 extends GT_Item_Casings_Abstract {
+public class ItemCasings10 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings3(Block block) {
+    public ItemCasings10(Block block) {
         super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java b/src/main/java/gregtech/common/blocks/ItemCasings11.java
index 1a86a2e534..5cae92a55d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings11.java
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings1 extends GT_Item_Casings_Abstract {
+public class ItemCasings11 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings1(Block block) {
+    public ItemCasings11(Block block) {
         super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java b/src/main/java/gregtech/common/blocks/ItemCasings2.java
index f98c169c7f..b0981c0dc3 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings2.java
@@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings2 extends GT_Item_Casings_Abstract {
+public class ItemCasings2 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings2(Block block) {
+    public ItemCasings2(Block block) {
         super(block);
     }
 
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java b/src/main/java/gregtech/common/blocks/ItemCasings3.java
index af533acfa8..737c9e5145 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings3.java
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings6 extends GT_Item_Casings_Abstract {
+public class ItemCasings3 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings6(Block block) {
+    public ItemCasings3(Block block) {
         super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/ItemCasings4.java b/src/main/java/gregtech/common/blocks/ItemCasings4.java
new file mode 100644
index 0000000000..97d160105a
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemCasings4.java
@@ -0,0 +1,14 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+/**
+ * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
+ * 16 subtypes at most.
+ */
+public class ItemCasings4 extends ItemCasingsAbstract {
+
+    public ItemCasings4(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/ItemCasings5.java
index 3b3ab68cb1..4192fb2a64 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings5.java
@@ -9,28 +9,28 @@ import net.minecraft.item.ItemStack;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.HeatingCoilLevel;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings5 extends GT_Item_Casings_Abstract {
+public class ItemCasings5 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings5(Block block) {
+    public ItemCasings5(Block block) {
         super(block);
     }
 
-    protected static final String mCoilHeatTooltip = GT_LanguageManager
+    protected static final String mCoilHeatTooltip = GTLanguageManager
         .addStringLocalization("gt.coilheattooltip", "Base Heating Capacity = ");
-    protected static final String mCoilUnitTooltip = GT_LanguageManager
+    protected static final String mCoilUnitTooltip = GTLanguageManager
         .addStringLocalization("gt.coilunittooltip", " Kelvin");
 
     @Override
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
         super.addInformation(aStack, aPlayer, aList, aF3_H);
-        HeatingCoilLevel coilLevel = GT_Block_Casings5.getCoilHeatFromDamage(aStack.getItemDamage());
+        HeatingCoilLevel coilLevel = BlockCasings5.getCoilHeatFromDamage(aStack.getItemDamage());
         aList.add(mCoilHeatTooltip + coilLevel.getHeat() + mCoilUnitTooltip);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/ItemCasings6.java b/src/main/java/gregtech/common/blocks/ItemCasings6.java
new file mode 100644
index 0000000000..36a25f7796
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemCasings6.java
@@ -0,0 +1,14 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+/**
+ * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
+ * 16 subtypes at most.
+ */
+public class ItemCasings6 extends ItemCasingsAbstract {
+
+    public ItemCasings6(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/ItemCasings8.java b/src/main/java/gregtech/common/blocks/ItemCasings8.java
new file mode 100644
index 0000000000..7183d78986
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemCasings8.java
@@ -0,0 +1,14 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+/**
+ * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
+ * 16 subtypes at most.
+ */
+public class ItemCasings8 extends ItemCasingsAbstract {
+
+    public ItemCasings8(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings9.java b/src/main/java/gregtech/common/blocks/ItemCasings9.java
index e9b39ee2cd..c4ae95a2f7 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings9.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasings9.java
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
  * The casings are split into separate files because they are registered as regular blocks, and a regular block can have
  * 16 subtypes at most.
  */
-public class GT_Item_Casings9 extends GT_Item_Casings_Abstract {
+public class ItemCasings9 extends ItemCasingsAbstract {
 
-    public GT_Item_Casings9(Block block) {
+    public ItemCasings9(Block block) {
         super(block);
     }
 
@@ -16,7 +16,7 @@ public class GT_Item_Casings9 extends GT_Item_Casings_Abstract {
      * @Override
      * public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
      * // Add tooltip info if it was given
-     * String localizedTooltip = GT_LanguageManager.getTranslation(aStack.getUnlocalizedName() + ".tooltip");
+     * String localizedTooltip = GTLanguageManager.getTranslation(aStack.getUnlocalizedName() + ".tooltip");
      * // getTranslation returns the key if no translation was found, but this just means
      * // no tooltip was set.
      * if (localizedTooltip.startsWith("gt.")) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/ItemCasingsAbstract.java
index 46b0aba237..577b1fb821 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/ItemCasingsAbstract.java
@@ -7,41 +7,41 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLanguageManager;
 
-public abstract class GT_Item_Casings_Abstract extends ItemBlock {
+public abstract class ItemCasingsAbstract extends ItemBlock {
 
-    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!");
-    protected final String mCoil01Tooltip = GT_LanguageManager
+    protected final String mCoil01Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil01tooltip", "Base Heating Capacity = 1800 Kelvin");
-    protected final String mCoil02Tooltip = GT_LanguageManager
+    protected final String mCoil02Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil02tooltip", "Base Heating Capacity = 2700 Kelvin");
-    protected final String mCoil03Tooltip = GT_LanguageManager
+    protected final String mCoil03Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil03tooltip", "Base Heating Capacity = 3600 Kelvin");
-    protected final String mCoil04Tooltip = GT_LanguageManager
+    protected final String mCoil04Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil04tooltip", "Base Heating Capacity = 4500 Kelvin");
-    protected final String mCoil05Tooltip = GT_LanguageManager
+    protected final String mCoil05Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil05tooltip", "Base Heating Capacity = 5400 Kelvin");
-    protected final String mCoil06Tooltip = GT_LanguageManager
+    protected final String mCoil06Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil06tooltip", "Base Heating Capacity = 7200 Kelvin");
-    protected final String mCoil07Tooltip = GT_LanguageManager
+    protected final String mCoil07Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil07tooltip", "Base Heating Capacity = 9001 Kelvin");
-    protected final String mCoil08Tooltip = GT_LanguageManager
+    protected final String mCoil08Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil08tooltip", "Base Heating Capacity = 9900 Kelvin");
-    protected final String mCoil09Tooltip = GT_LanguageManager
+    protected final String mCoil09Tooltip = GTLanguageManager
         .addStringLocalization("gt.coil09tooltip", "Base Heating Capacity = 10800 Kelvin");
-    protected final String mBlastProofTooltip = GT_LanguageManager
+    protected final String mBlastProofTooltip = GTLanguageManager
         .addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof");
 
-    public GT_Item_Casings_Abstract(Block block) {
+    public ItemCasingsAbstract(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java b/src/main/java/gregtech/common/blocks/ItemConcretes.java
index 44c094aa41..64f778d5d4 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java
+++ b/src/main/java/gregtech/common/blocks/ItemConcretes.java
@@ -6,14 +6,14 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Item_Concretes extends GT_Item_Stones_Abstract {
+public class ItemConcretes extends ItemStonesAbstract {
 
-    private final String mRunFasterToolTip = GT_LanguageManager
+    private final String mRunFasterToolTip = GTLanguageManager
         .addStringLocalization("gt.runfastertooltip", "You can walk faster on this Block");
 
-    public GT_Item_Concretes(Block block) {
+    public ItemConcretes(Block block) {
         super(block);
     }
 
diff --git a/src/main/java/gregtech/common/blocks/ItemCyclotronCasings.java b/src/main/java/gregtech/common/blocks/ItemCyclotronCasings.java
new file mode 100644
index 0000000000..febd101e0f
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemCyclotronCasings.java
@@ -0,0 +1,10 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+public class ItemCyclotronCasings extends ItemCasingsAbstract {
+
+    public ItemCyclotronCasings(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Frames.java b/src/main/java/gregtech/common/blocks/ItemFrames.java
index 002e19f5a6..daa6ca2d2e 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Frames.java
+++ b/src/main/java/gregtech/common/blocks/ItemFrames.java
@@ -7,17 +7,17 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Item_Frames extends ItemBlock {
+public class ItemFrames extends ItemBlock {
 
-    public GT_Item_Frames(Block block) {
+    public ItemFrames(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     private Block block() {
@@ -34,7 +34,7 @@ public class GT_Item_Frames extends ItemBlock {
     @Override
     public String getItemStackDisplayName(ItemStack aStack) {
         String aName = super.getItemStackDisplayName(aStack);
-        if (this.block() instanceof GT_Block_FrameBox) {
+        if (this.block() instanceof BlockFrameBox) {
             aName = Materials.getLocalizedNameForItem(aName, aStack.getItemDamage());
         }
         return aName;
@@ -43,14 +43,14 @@ public class GT_Item_Frames extends ItemBlock {
     @Override
     public int getColorFromItemStack(ItemStack aStack, int aPass) {
         int meta = aStack.getItemDamage();
-        Materials material = GT_Block_FrameBox.getMaterial(meta);
+        Materials material = BlockFrameBox.getMaterial(meta);
         return (material.mRGBa[0] << 16) | (material.mRGBa[1] << 8) | material.mRGBa[2];
     }
 
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
-        aList.add(GT_LanguageManager.getTranslation("gt.blockframes." + aStack.getItemDamage() + ".tooltip"));
-        aList.add(GT_LanguageManager.getTranslation("gt.blockmachines.gt_frame.desc.format"));
+        aList.add(GTLanguageManager.getTranslation("gt.blockframes." + aStack.getItemDamage() + ".tooltip"));
+        aList.add(GTLanguageManager.getTranslation("gt.blockmachines.gt_frame.desc.format"));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Glass1.java b/src/main/java/gregtech/common/blocks/ItemGlass1.java
index e8d0b6c236..5605bba48d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Glass1.java
+++ b/src/main/java/gregtech/common/blocks/ItemGlass1.java
@@ -6,23 +6,23 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 /**
  * The glass types are split into separate files because they are registered as regular blocks, and a regular block can
  * have
  * 16 subtypes at most.
  */
-public class GT_Item_Glass1 extends GT_Item_Casings_Abstract {
+public class ItemGlass1 extends ItemCasingsAbstract {
 
-    protected final String chemicalGlassTooltip = GT_LanguageManager.addStringLocalization(
+    protected final String chemicalGlassTooltip = GTLanguageManager.addStringLocalization(
         getUnlocalizedName() + ".0.tooltip",
         "Able to resist the most extreme chemical conditions.");
-    protected final String hawkingGlassTooltip = GT_LanguageManager.addStringLocalization(
+    protected final String hawkingGlassTooltip = GTLanguageManager.addStringLocalization(
         getUnlocalizedName() + ".4.tooltip",
         "Controls the outward flow of Hawking Radiation to stabilize a black hole.");
 
-    public GT_Item_Glass1(Block block) {
+    public ItemGlass1(Block block) {
         super(block);
     }
 
diff --git a/src/main/java/gregtech/common/blocks/ItemGranites.java b/src/main/java/gregtech/common/blocks/ItemGranites.java
new file mode 100644
index 0000000000..090ebc2a5a
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemGranites.java
@@ -0,0 +1,10 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+public class ItemGranites extends ItemStonesAbstract {
+
+    public ItemGranites(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java b/src/main/java/gregtech/common/blocks/ItemLongDistancePipe.java
index 52d0db5165..55f5c2c768 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java
+++ b/src/main/java/gregtech/common/blocks/ItemLongDistancePipe.java
@@ -7,21 +7,21 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Item_LongDistancePipe extends ItemBlock {
+public class ItemLongDistancePipe extends ItemBlock {
 
-    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 GT_Item_LongDistancePipe(Block block) {
+    public ItemLongDistancePipe(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/ItemMachines.java
index 059a3fda94..ff031c8456 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/ItemMachines.java
@@ -1,6 +1,6 @@
 package gregtech.common.blocks;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import java.util.List;
 
@@ -26,7 +26,7 @@ import net.minecraftforge.fluids.IFluidContainerItem;
 
 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.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.ISecondaryDescribable;
@@ -34,44 +34,44 @@ import gregtech.api.interfaces.metatileentity.IConnectable;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.CoverableTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item;
-import gregtech.api.util.GT_ItsNotMyFaultException;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalTankBase;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperTank;
+import gregtech.api.metatileentity.implementations.MTECable;
+import gregtech.api.metatileentity.implementations.MTEFluid;
+import gregtech.api.metatileentity.implementations.MTEFrame;
+import gregtech.api.metatileentity.implementations.MTEItem;
+import gregtech.api.util.GTItsNotMyFaultException;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
+import gregtech.common.tileentities.storage.MTEDigitalTankBase;
+import gregtech.common.tileentities.storage.MTESuperChest;
+import gregtech.common.tileentities.storage.MTESuperTank;
 
-public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
+public class ItemMachines extends ItemBlock implements IFluidContainerItem {
 
-    public GT_Item_Machines(Block block) {
+    public ItemMachines(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
     }
 
     public static IMetaTileEntity getMetaTileEntity(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return null;
-        if (!(aStack.getItem() instanceof GT_Item_Machines)) return null;
-        if (aStack.getItemDamage() < 0 || aStack.getItemDamage() > GregTech_API.METATILEENTITIES.length) return null;
-        return GregTech_API.METATILEENTITIES[aStack.getItemDamage()];
+        if (GTUtility.isStackInvalid(aStack)) return null;
+        if (!(aStack.getItem() instanceof ItemMachines)) return null;
+        if (aStack.getItemDamage() < 0 || aStack.getItemDamage() > GregTechAPI.METATILEENTITIES.length) return null;
+        return GregTechAPI.METATILEENTITIES[aStack.getItemDamage()];
     }
 
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
         try {
             final int tDamage = getDamage(aStack);
-            if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) {
+            if ((tDamage <= 0) || (tDamage >= GregTechAPI.METATILEENTITIES.length)) {
                 return;
             }
 
-            if (GregTech_API.METATILEENTITIES[tDamage] != null) {
-                final IGregTechTileEntity tTileEntity = GregTech_API.METATILEENTITIES[tDamage].getBaseMetaTileEntity();
-                if (!GregTech_API.sPostloadFinished
+            if (GregTechAPI.METATILEENTITIES[tDamage] != null) {
+                final IGregTechTileEntity tTileEntity = GregTechAPI.METATILEENTITIES[tDamage].getBaseMetaTileEntity();
+                if (!GregTechAPI.sPostloadFinished
                     && tTileEntity.getMetaTileEntity() instanceof ISecondaryDescribable) {
                     final String[] tSecondaryDescription = ((ISecondaryDescribable) tTileEntity.getMetaTileEntity())
                         .getSecondaryDescription();
@@ -87,40 +87,40 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
                 }
                 if (tTileEntity.getEUCapacity() > 0L) {
                     if (tTileEntity.getInputVoltage() > 0L) {
-                        final byte inputTier = GT_Utility.getTier(tTileEntity.getInputVoltage());
+                        final byte inputTier = GTUtility.getTier(tTileEntity.getInputVoltage());
                         aList.add(
-                            GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ")
+                            GTLanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ")
                                 + EnumChatFormatting.GREEN
-                                + GT_Utility.formatNumbers(tTileEntity.getInputVoltage())
+                                + GTUtility.formatNumbers(tTileEntity.getInputVoltage())
                                 + " ("
-                                + GT_Utility.getColoredTierNameFromTier(inputTier)
+                                + GTUtility.getColoredTierNameFromTier(inputTier)
                                 + EnumChatFormatting.GREEN
                                 + ")"
                                 + EnumChatFormatting.GRAY);
                     }
                     if (tTileEntity.getOutputVoltage() > 0L) {
-                        final byte outputTier = GT_Utility.getTier(tTileEntity.getOutputVoltage());
+                        final byte outputTier = GTUtility.getTier(tTileEntity.getOutputVoltage());
                         aList.add(
-                            GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ")
+                            GTLanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ")
                                 + EnumChatFormatting.GREEN
-                                + GT_Utility.formatNumbers(tTileEntity.getOutputVoltage())
+                                + GTUtility.formatNumbers(tTileEntity.getOutputVoltage())
                                 + " ("
-                                + GT_Utility.getColoredTierNameFromTier(outputTier)
+                                + GTUtility.getColoredTierNameFromTier(outputTier)
                                 + EnumChatFormatting.GREEN
                                 + ")"
                                 + EnumChatFormatting.GRAY);
                     }
                     if (tTileEntity.getOutputAmperage() > 1L) {
                         aList.add(
-                            GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ")
+                            GTLanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ")
                                 + EnumChatFormatting.YELLOW
-                                + GT_Utility.formatNumbers(tTileEntity.getOutputAmperage())
+                                + GTUtility.formatNumbers(tTileEntity.getOutputAmperage())
                                 + EnumChatFormatting.GRAY);
                     }
                     aList.add(
-                        GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ")
+                        GTLanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ")
                             + EnumChatFormatting.BLUE
-                            + GT_Utility.formatNumbers(tTileEntity.getEUCapacity())
+                            + GTUtility.formatNumbers(tTileEntity.getEUCapacity())
                             + EnumChatFormatting.GRAY
                             + " EU");
                 }
@@ -128,24 +128,24 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
             final NBTTagCompound aNBT = aStack.getTagCompound();
             if (aNBT != null) {
                 if (aNBT.getBoolean("mMuffler")) {
-                    aList.add(GT_LanguageManager.addStringLocalization("GT_TileEntity_MUFFLER", "has Muffler Upgrade"));
+                    aList.add(GTLanguageManager.addStringLocalization("GT_TileEntity_MUFFLER", "has Muffler Upgrade"));
                 }
                 if (aNBT.getBoolean("mSteamConverter")) {
                     aList.add(
-                        GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade"));
+                        GTLanguageManager.addStringLocalization("GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade"));
                 }
                 int tAmount = 0;
                 if ((tAmount = aNBT.getByte("mSteamTanks")) > 0) {
                     aList.add(
                         tAmount + " "
-                            + GT_LanguageManager
+                            + GTLanguageManager
                                 .addStringLocalization("GT_TileEntity_STEAMTANKS", "Steam Tank Upgrades"));
                 }
 
                 CoverableTileEntity.addInstalledCoversInformation(aNBT, aList);
                 if (aNBT.hasKey("mColor") && aNBT.getByte("mColor") != -1) {
                     aList.add(
-                        GT_LanguageManager.addStringLocalization("GT_TileEntity_COLORED", "Colored") + " ("
+                        GTLanguageManager.addStringLocalization("GT_TileEntity_COLORED", "Colored") + " ("
                             + Dyes.get(aNBT.getByte("mColor") - 1).formatting
                             + Dyes.get(aNBT.getByte("mColor") - 1).mName
                             + EnumChatFormatting.GRAY
@@ -162,7 +162,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
         if (aDescription == null) return;
         for (int i = 0, tLength = aDescription.length; i < tLength; i++) {
             String tDescLine = aDescription[i];
-            if (!GT_Utility.isStringValid(tDescLine)) continue;
+            if (!GTUtility.isStringValid(tDescLine)) continue;
 
             String tKey = String.format("TileEntity_DESCRIPTION_%05d%s_Index_%02d", aDamage, aSuffix, i);
             if (tDescLine.contains("%%%")) {
@@ -175,10 +175,10 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
                     tRep[j / 2] = tSplitStrings[j];
                 }
                 final String tTranslated = String
-                    .format(GT_LanguageManager.addStringLocalization(tKey, tBuffer.toString()), (Object[]) tRep);
+                    .format(GTLanguageManager.addStringLocalization(tKey, tBuffer.toString()), (Object[]) tRep);
                 if (aList != null) aList.add(tTranslated);
             } else {
-                String tTranslated = GT_LanguageManager.addStringLocalization(tKey, tDescLine);
+                String tTranslated = GTLanguageManager.addStringLocalization(tKey, tDescLine);
                 if (aList != null) aList.add(tTranslated.equals("") ? tDescLine : tTranslated);
             }
         }
@@ -186,9 +186,9 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
 
     @SideOnly(Side.CLIENT)
     public void registerDescription(int aDamage) {
-        if (aDamage >= GregTech_API.METATILEENTITIES.length) return;
-        if (GregTech_API.METATILEENTITIES[aDamage] != null) {
-            final IMetaTileEntity tMetaTileEntity = GregTech_API.METATILEENTITIES[aDamage].getBaseMetaTileEntity()
+        if (aDamage >= GregTechAPI.METATILEENTITIES.length) return;
+        if (GregTechAPI.METATILEENTITIES[aDamage] != null) {
+            final IMetaTileEntity tMetaTileEntity = GregTechAPI.METATILEENTITIES[aDamage].getBaseMetaTileEntity()
                 .getMetaTileEntity();
             if (tMetaTileEntity instanceof ISecondaryDescribable) {
                 final String[] tSecondaryDescription = ((ISecondaryDescribable) tMetaTileEntity)
@@ -208,11 +208,11 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     @Override
     public String getUnlocalizedName(ItemStack aStack) {
         final short tDamage = (short) getDamage(aStack);
-        if ((tDamage < 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) {
+        if ((tDamage < 0) || (tDamage >= GregTechAPI.METATILEENTITIES.length)) {
             return "";
         }
-        if (GregTech_API.METATILEENTITIES[tDamage] != null) {
-            return getUnlocalizedName() + "." + GregTech_API.METATILEENTITIES[tDamage].getMetaName();
+        if (GregTechAPI.METATILEENTITIES[tDamage] != null) {
+            return getUnlocalizedName() + "." + GregTechAPI.METATILEENTITIES[tDamage].getMetaName();
         }
         return "";
     }
@@ -221,17 +221,17 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     public String getItemStackDisplayName(ItemStack aStack) {
         String aName = super.getItemStackDisplayName(aStack);
         final short aDamage = (short) getDamage(aStack);
-        if (aDamage >= 0 && aDamage < GregTech_API.METATILEENTITIES.length
-            && GregTech_API.METATILEENTITIES[aDamage] != null) {
+        if (aDamage >= 0 && aDamage < GregTechAPI.METATILEENTITIES.length
+            && GregTechAPI.METATILEENTITIES[aDamage] != null) {
             Materials aMaterial = null;
-            if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Item) {
-                aMaterial = ((GT_MetaPipeEntity_Item) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;
-            } else if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Fluid) {
-                aMaterial = ((GT_MetaPipeEntity_Fluid) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;
-            } else if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Cable) {
-                aMaterial = ((GT_MetaPipeEntity_Cable) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;
-            } else if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Frame) {
-                aMaterial = ((GT_MetaPipeEntity_Frame) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;
+            if (GregTechAPI.METATILEENTITIES[aDamage] instanceof MTEItem) {
+                aMaterial = ((MTEItem) GregTechAPI.METATILEENTITIES[aDamage]).mMaterial;
+            } else if (GregTechAPI.METATILEENTITIES[aDamage] instanceof MTEFluid) {
+                aMaterial = ((MTEFluid) GregTechAPI.METATILEENTITIES[aDamage]).mMaterial;
+            } else if (GregTechAPI.METATILEENTITIES[aDamage] instanceof MTECable) {
+                aMaterial = ((MTECable) GregTechAPI.METATILEENTITIES[aDamage]).mMaterial;
+            } else if (GregTechAPI.METATILEENTITIES[aDamage] instanceof MTEFrame) {
+                aMaterial = ((MTEFrame) GregTechAPI.METATILEENTITIES[aDamage]).mMaterial;
             }
             if (aMaterial != null) {
                 aName = aMaterial.getLocalizedNameForItem(aName);
@@ -244,9 +244,9 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     public void onCreated(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
         super.onCreated(aStack, aWorld, aPlayer);
         final short tDamage = (short) getDamage(aStack);
-        if ((tDamage < 0) || ((tDamage >= GregTech_API.METATILEENTITIES.length)
-            && (GregTech_API.METATILEENTITIES[tDamage] != null))) {
-            GregTech_API.METATILEENTITIES[tDamage].onCreated(aStack, aWorld, aPlayer);
+        if ((tDamage < 0)
+            || ((tDamage >= GregTechAPI.METATILEENTITIES.length) && (GregTechAPI.METATILEENTITIES[tDamage] != null))) {
+            GregTechAPI.METATILEENTITIES[tDamage].onCreated(aStack, aWorld, aPlayer);
         }
     }
 
@@ -256,19 +256,19 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
         final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide);
         final short tDamage = (short) getDamage(aStack);
         if (tDamage > 0) {
-            if (GregTech_API.METATILEENTITIES[tDamage] == null) {
+            if (GregTechAPI.METATILEENTITIES[tDamage] == null) {
                 return false;
             }
-            final int tMetaData = GregTech_API.METATILEENTITIES[tDamage].getTileEntityBaseType();
+            final int tMetaData = GregTechAPI.METATILEENTITIES[tDamage].getTileEntityBaseType();
             if (!aWorld.setBlock(aX, aY, aZ, this.field_150939_a, tMetaData, 3)) {
                 return false;
             }
             if (aWorld.getBlock(aX, aY, aZ) != this.field_150939_a) {
-                throw new GT_ItsNotMyFaultException(
+                throw new GTItsNotMyFaultException(
                     "Failed to place Block even though World.setBlock returned true. It COULD be MCPC/Bukkit causing that. In case you really have that installed, don't report this Bug to me, I don't know how to fix it.");
             }
             if (aWorld.getBlockMetadata(aX, aY, aZ) != tMetaData) {
-                throw new GT_ItsNotMyFaultException(
+                throw new GTItsNotMyFaultException(
                     "Failed to set the MetaValue of the Block even though World.setBlock returned true. It COULD be MCPC/Bukkit causing that. In case you really have that installed, don't report this Bug to me, I don't know how to fix it.");
             }
             final IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aWorld.getTileEntity(aX, aY, aZ);
@@ -307,8 +307,8 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
         super.onUpdate(aStack, aWorld, aPlayer, aTimer, aIsInHand);
         final short tDamage = (short) getDamage(aStack);
         final EntityLivingBase tPlayer = (EntityPlayer) aPlayer;
-        if (GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_SuperChest
-            || GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_SuperTank) {
+        if (GregTechAPI.METATILEENTITIES[tDamage] instanceof MTESuperChest
+            || GregTechAPI.METATILEENTITIES[tDamage] instanceof MTESuperTank) {
             final NBTTagCompound tNBT = aStack.stackTagCompound;
             if (tNBT == null) return;
             if (tNBT.hasNoTags()) {
@@ -350,7 +350,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     public int getCapacity(ItemStack container) {
         if (container != null) {
             final int tDamage = container.getItemDamage();
-            final IMetaTileEntity tMetaTile = GregTech_API.METATILEENTITIES[tDamage];
+            final IMetaTileEntity tMetaTile = GregTechAPI.METATILEENTITIES[tDamage];
             if (tMetaTile != null) return tMetaTile.getCapacity();
         }
         return 0;
@@ -361,7 +361,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
         final NBTTagCompound tag = container.stackTagCompound;
         if (tag == null) return null;
         String lockedName = tag.getString("lockedFluidName");
-        if (GT_Utility.isStringInvalid(lockedName)) return null;
+        if (GTUtility.isStringInvalid(lockedName)) return null;
         return FluidRegistry.getFluid(lockedName);
     }
 
@@ -369,8 +369,8 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     public int fill(ItemStack container, FluidStack resource, boolean doFill) {
         if (container != null && resource != null) {
             final int tDamage = container.getItemDamage();
-            final IMetaTileEntity tMetaTile = GregTech_API.METATILEENTITIES[tDamage];
-            if (!(tMetaTile instanceof GT_MetaTileEntity_DigitalTankBase)) {
+            final IMetaTileEntity tMetaTile = GregTechAPI.METATILEENTITIES[tDamage];
+            if (!(tMetaTile instanceof MTEDigitalTankBase)) {
                 return 0;
             }
             if (container.stackTagCompound == null) container.stackTagCompound = new NBTTagCompound();
@@ -405,8 +405,8 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) {
         if (container != null && container.hasTagCompound()) {
             final int tDamage = container.getItemDamage();
-            final IMetaTileEntity tMetaTile = GregTech_API.METATILEENTITIES[tDamage];
-            if (!(tMetaTile instanceof GT_MetaTileEntity_DigitalTankBase)) {
+            final IMetaTileEntity tMetaTile = GregTechAPI.METATILEENTITIES[tDamage];
+            if (!(tMetaTile instanceof MTEDigitalTankBase)) {
                 return null;
             }
             final FluidStack tStoredFluid = getFluid(container);
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java b/src/main/java/gregtech/common/blocks/ItemOres.java
index 2ba78572b3..0691142bc3 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
+++ b/src/main/java/gregtech/common/blocks/ItemOres.java
@@ -11,16 +11,16 @@ import net.minecraft.world.World;
 
 import org.apache.commons.lang3.StringUtils;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 
-public class GT_Item_Ores extends ItemBlock {
+public class ItemOres extends ItemBlock {
 
-    public GT_Item_Ores(Block block) {
+    public ItemOres(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
@@ -37,7 +37,7 @@ public class GT_Item_Ores extends ItemBlock {
     @Override
     public String getItemStackDisplayName(ItemStack aStack) {
         String aName = super.getItemStackDisplayName(aStack);
-        if (this.field_150939_a instanceof GT_Block_Ores_Abstract) {
+        if (this.field_150939_a instanceof BlockOresAbstract) {
             aName = Materials.getLocalizedNameForItem(aName, aStack.getItemDamage() % 1000);
         }
         return aName;
@@ -53,13 +53,13 @@ public class GT_Item_Ores extends ItemBlock {
                 aY,
                 aZ,
                 this.field_150939_a,
-                GT_TileEntity_Ores.getHarvestData(
+                TileEntityOres.getHarvestData(
                     tDamage,
-                    ((GT_Block_Ores_Abstract) field_150939_a).getBaseBlockHarvestLevel(aMeta % 16000 / 1000)),
+                    ((BlockOresAbstract) field_150939_a).getBaseBlockHarvestLevel(aMeta % 16000 / 1000)),
                 3)) {
                 return false;
             }
-            GT_TileEntity_Ores tTileEntity = (GT_TileEntity_Ores) aWorld.getTileEntity(aX, aY, aZ);
+            TileEntityOres tTileEntity = (TileEntityOres) aWorld.getTileEntity(aX, aY, aZ);
             tTileEntity.mMetaData = tDamage;
             tTileEntity.mNatural = false;
         } else if (!aWorld.setBlock(aX, aY, aZ, this.field_150939_a, 0, 3)) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/ItemStonesAbstract.java
index 5b73108301..b8f924b609 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/ItemStonesAbstract.java
@@ -7,19 +7,19 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Item_Stones_Abstract extends ItemBlock {
+public class ItemStonesAbstract extends ItemBlock {
 
-    private final String mNoMobsToolTip = GT_LanguageManager
+    private final String mNoMobsToolTip = GTLanguageManager
         .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
 
-    public GT_Item_Stones_Abstract(Block block) {
+    public ItemStonesAbstract(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java b/src/main/java/gregtech/common/blocks/ItemStorage.java
index 4ac1b9cdfd..6dd0a2a6b4 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java
+++ b/src/main/java/gregtech/common/blocks/ItemStorage.java
@@ -7,15 +7,15 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 
-public class GT_Item_Storage extends ItemBlock {
+public class ItemStorage extends ItemBlock {
 
-    public GT_Item_Storage(Block block) {
+    public ItemStorage(Block block) {
         super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH_MATERIALS);
     }
 
     @Override
@@ -26,10 +26,10 @@ public class GT_Item_Storage extends ItemBlock {
     @Override
     public String getItemStackDisplayName(ItemStack aStack) {
         String aName = super.getItemStackDisplayName(aStack);
-        if (this.field_150939_a instanceof GT_Block_Metal) {
+        if (this.field_150939_a instanceof BlockMetal) {
             int aDamage = aStack.getItemDamage();
-            if (aDamage >= 0 && aDamage < ((GT_Block_Metal) this.field_150939_a).mMats.length) {
-                aName = ((GT_Block_Metal) this.field_150939_a).mMats[aDamage].getLocalizedNameForItem(aName);
+            if (aDamage >= 0 && aDamage < ((BlockMetal) this.field_150939_a).mMats.length) {
+                aName = ((BlockMetal) this.field_150939_a).mMats[aDamage].getLocalizedNameForItem(aName);
             }
         }
         return aName;
diff --git a/src/main/java/gregtech/common/blocks/ItemTintedIndustrialGlass.java b/src/main/java/gregtech/common/blocks/ItemTintedIndustrialGlass.java
new file mode 100644
index 0000000000..bba737ad15
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/ItemTintedIndustrialGlass.java
@@ -0,0 +1,10 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+public class ItemTintedIndustrialGlass extends ItemCasingsAbstract {
+
+    public ItemTintedIndustrialGlass(Block block) {
+        super(block);
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Material_Casings.java b/src/main/java/gregtech/common/blocks/MaterialCasings.java
index 2fc839768f..cde784d137 100644
--- a/src/main/java/gregtech/common/blocks/GT_Material_Casings.java
+++ b/src/main/java/gregtech/common/blocks/MaterialCasings.java
@@ -3,11 +3,11 @@ package gregtech.common.blocks;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 
-public class GT_Material_Casings extends Material {
+public class MaterialCasings extends Material {
 
-    public static final Material INSTANCE = new GT_Material_Casings();
+    public static final Material INSTANCE = new MaterialCasings();
 
-    private GT_Material_Casings() {
+    private MaterialCasings() {
         super(MapColor.ironColor);
         setRequiresTool();
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Material_Machines.java b/src/main/java/gregtech/common/blocks/MaterialMachines.java
index df8b57226c..311b72c764 100644
--- a/src/main/java/gregtech/common/blocks/GT_Material_Machines.java
+++ b/src/main/java/gregtech/common/blocks/MaterialMachines.java
@@ -3,9 +3,9 @@ package gregtech.common.blocks;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 
-public class GT_Material_Machines extends Material {
+public class MaterialMachines extends Material {
 
-    public GT_Material_Machines() {
+    public MaterialMachines() {
         super(MapColor.ironColor);
         setRequiresTool();
         setImmovableMobility();
diff --git a/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java b/src/main/java/gregtech/common/blocks/MaterialReinforced.java
index 2e3301bb60..b5256d306d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java
+++ b/src/main/java/gregtech/common/blocks/MaterialReinforced.java
@@ -3,9 +3,9 @@ package gregtech.common.blocks;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 
-public class GT_Material_Reinforced extends Material {
+public class MaterialReinforced extends Material {
 
-    public GT_Material_Reinforced() {
+    public MaterialReinforced() {
         super(MapColor.stoneColor);
         setRequiresTool();
         setAdventureModeExempt();
diff --git a/src/main/java/gregtech/common/blocks/GT_Packet_Ores.java b/src/main/java/gregtech/common/blocks/PacketOres.java
index a65ac47c44..6548f8ae66 100644
--- a/src/main/java/gregtech/common/blocks/GT_Packet_Ores.java
+++ b/src/main/java/gregtech/common/blocks/PacketOres.java
@@ -6,22 +6,22 @@ import net.minecraft.world.World;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.net.GT_PacketTypes;
-import gregtech.api.net.GT_Packet_New;
+import gregtech.api.net.GTPacketNew;
+import gregtech.api.net.GTPacketTypes;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_Ores extends GT_Packet_New {
+public class PacketOres extends GTPacketNew {
 
     private int mX;
     private int mZ;
     private short mY;
     private short mMetaData;
 
-    public GT_Packet_Ores() {
+    public PacketOres() {
         super(true);
     }
 
-    public GT_Packet_Ores(int aX, short aY, int aZ, short aMetaData) {
+    public PacketOres(int aX, short aY, int aZ, short aMetaData) {
         super(false);
         this.mX = aX;
         this.mY = aY;
@@ -38,16 +38,16 @@ public class GT_Packet_Ores extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_Ores(aData.readInt(), aData.readShort(), aData.readInt(), aData.readShort());
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new PacketOres(aData.readInt(), aData.readShort(), aData.readInt(), aData.readShort());
     }
 
     @Override
     public void process(IBlockAccess aWorld) {
         if (aWorld != null) {
             TileEntity tTileEntity = aWorld.getTileEntity(this.mX, this.mY, this.mZ);
-            if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                ((GT_TileEntity_Ores) tTileEntity).mMetaData = this.mMetaData;
+            if ((tTileEntity instanceof TileEntityOres)) {
+                ((TileEntityOres) tTileEntity).mMetaData = this.mMetaData;
             }
             if (((aWorld instanceof World)) && (((World) aWorld).isRemote)) {
                 ((World) aWorld).markBlockForUpdate(this.mX, this.mY, this.mZ);
@@ -57,6 +57,6 @@ public class GT_Packet_Ores extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.ORES.id;
+        return GTPacketTypes.ORES.id;
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/src/main/java/gregtech/common/blocks/TileEntityOres.java
index de69c011a2..9ddcbcc19c 100644
--- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
+++ b/src/main/java/gregtech/common/blocks/TileEntityOres.java
@@ -15,19 +15,19 @@ import net.minecraft.world.World;
 
 import org.jetbrains.annotations.NotNull;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IAllSidedTexturedTileEntity;
 import gregtech.api.objects.XSTR;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
-public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedTileEntity {
+public class TileEntityOres extends TileEntity implements IAllSidedTexturedTileEntity {
 
     public short mMetaData = 0;
     protected static boolean shouldFortune = false;
@@ -39,17 +39,17 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
     private ITexture[] mCachedTexture;
 
     public static byte getHarvestData(short aMetaData, int aBaseBlockHarvestLevel) {
-        Materials aMaterial = GregTech_API.sGeneratedMaterials[(aMetaData % 1000)];
+        Materials aMaterial = GregTechAPI.sGeneratedMaterials[(aMetaData % 1000)];
         byte tByte = aMaterial == null ? 0
             : (byte) Math
                 .max(aBaseBlockHarvestLevel, Math.min(7, aMaterial.mToolQuality - (aMetaData < 16000 ? 0 : 1)));
-        if (GT_Mod.gregtechproxy.mChangeHarvestLevels) {
+        if (GTMod.gregtechproxy.mChangeHarvestLevels) {
             tByte = aMaterial == null ? 0
                 : (byte) Math.max(
                     aBaseBlockHarvestLevel,
                     Math.min(
-                        GT_Mod.gregtechproxy.mMaxHarvestLevel,
-                        GT_Mod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] - (aMetaData < 16000 ? 0 : 1)));
+                        GTMod.gregtechproxy.mMaxHarvestLevel,
+                        GTMod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] - (aMetaData < 16000 ? 0 : 1)));
         }
         return tByte;
     }
@@ -64,7 +64,7 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
             aY = Math.min(aWorld.getActualHeight(), Math.max(aY, 1));
         }
         Block tBlock = aWorld.getBlock(aX, aY, aZ);
-        Block tOreBlock = GregTech_API.sBlockOres1;
+        Block tOreBlock = GregTechAPI.sBlockOres1;
         int BlockMeta = aWorld.getBlockMetadata(aX, aY, aZ);
         String BlockName = tBlock.getUnlocalizedName();
         aMetaData += isSmallOre ? 16000 : 0;
@@ -76,8 +76,8 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 aMetaData += 1000;
             } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone)) {
                 aMetaData += 2000;
-            } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)) {
-                if (tBlock == GregTech_API.sBlockGranites) {
+            } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockGranites)) {
+                if (tBlock == GregTechAPI.sBlockGranites) {
                     if (aWorld.getBlockMetadata(aX, aY, aZ) < 8) {
                         aMetaData += 3000;
                     } else {
@@ -86,8 +86,8 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 } else {
                     aMetaData += 3000;
                 }
-            } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockStones)) {
-                if (tBlock == GregTech_API.sBlockStones) {
+            } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockStones)) {
+                if (tBlock == GregTechAPI.sBlockStones) {
                     if (aWorld.getBlockMetadata(aX, aY, aZ) < 8) {
                         aMetaData += 5000;
                     } else {
@@ -97,20 +97,20 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                     aMetaData += 5000;
                 }
             } else if (BlockName.equals("tile.igneousStone")) {
-                if (GregTech_API.sBlockOresUb1 != null) {
-                    tOreBlock = GregTech_API.sBlockOresUb1;
+                if (GregTechAPI.sBlockOresUb1 != null) {
+                    tOreBlock = GregTechAPI.sBlockOresUb1;
                     aMetaData += (BlockMeta * 1000);
                     // GT_FML_LOGGER.info("Block changed to UB1");
                 }
             } else if (BlockName.equals("tile.metamorphicStone")) {
-                if (GregTech_API.sBlockOresUb2 != null) {
-                    tOreBlock = GregTech_API.sBlockOresUb2;
+                if (GregTechAPI.sBlockOresUb2 != null) {
+                    tOreBlock = GregTechAPI.sBlockOresUb2;
                     aMetaData += (BlockMeta * 1000);
                     // GT_FML_LOGGER.info("Block changed to UB2");
                 }
             } else if (BlockName.equals("tile.sedimentaryStone")) {
-                if (GregTech_API.sBlockOresUb3 != null) {
-                    tOreBlock = GregTech_API.sBlockOresUb3;
+                if (GregTechAPI.sBlockOresUb3 != null) {
+                    tOreBlock = GregTechAPI.sBlockOresUb3;
                     aMetaData += (BlockMeta * 1000);
                     // GT_FML_LOGGER.info("Block changed to UB3");
                 }
@@ -125,12 +125,12 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 tOreBlock,
                 getHarvestData(
                     (short) aMetaData,
-                    ((GT_Block_Ores_Abstract) tOreBlock).getBaseBlockHarvestLevel(aMetaData % 16000 / 1000)),
+                    ((BlockOresAbstract) tOreBlock).getBaseBlockHarvestLevel(aMetaData % 16000 / 1000)),
                 0);
             TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-            if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                ((GT_TileEntity_Ores) tTileEntity).mMetaData = ((short) aMetaData);
-                ((GT_TileEntity_Ores) tTileEntity).mNatural = true;
+            if ((tTileEntity instanceof TileEntityOres)) {
+                ((TileEntityOres) tTileEntity).mMetaData = ((short) aMetaData);
+                ((TileEntityOres) tTileEntity).mNatural = true;
             }
             return true;
         }
@@ -154,9 +154,9 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
     public void onUpdated() {
         if ((!this.worldObj.isRemote) && (this.mBlocked)) {
             this.mBlocked = false;
-            GT_Values.NW.sendPacketToAllPlayersInRange(
+            GTValues.NW.sendPacketToAllPlayersInRange(
                 this.worldObj,
-                new GT_Packet_Ores(this.xCoord, (short) this.yCoord, this.zCoord, this.mMetaData),
+                new PacketOres(this.xCoord, (short) this.yCoord, this.zCoord, this.mMetaData),
                 this.xCoord,
                 this.zCoord);
         }
@@ -167,9 +167,9 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
         if (!this.worldObj.isRemote) {
             boolean sendUpdate = mBlockedChecked ? !mBlocked : checkBlocked();
             if (sendUpdate) {
-                GT_Values.NW.sendPacketToAllPlayersInRange(
+                GTValues.NW.sendPacketToAllPlayersInRange(
                     this.worldObj,
-                    new GT_Packet_Ores(this.xCoord, (short) this.yCoord, this.zCoord, this.mMetaData),
+                    new PacketOres(this.xCoord, (short) this.yCoord, this.zCoord, this.mMetaData),
                     this.xCoord,
                     this.zCoord);
             }
@@ -182,37 +182,37 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
         mBlockedChecked = true;
         if (!worldObj.blockExists(xCoord + 1, yCoord, zCoord)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord + 1, yCoord, zCoord)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord + 1, yCoord, zCoord)) {
             mBlocked = false;
             return true;
         }
         if (!worldObj.blockExists(xCoord - 1, yCoord, zCoord)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord - 1, yCoord, zCoord)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord - 1, yCoord, zCoord)) {
             mBlocked = false;
             return true;
         }
         if (!worldObj.blockExists(xCoord, yCoord + 1, zCoord)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord, yCoord + 1, zCoord)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord, yCoord + 1, zCoord)) {
             mBlocked = false;
             return true;
         }
         if (!worldObj.blockExists(xCoord, yCoord - 1, zCoord)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord, yCoord - 1, zCoord)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord, yCoord - 1, zCoord)) {
             mBlocked = false;
             return true;
         }
         if (!worldObj.blockExists(xCoord, yCoord, zCoord + 1)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord, yCoord, zCoord + 1)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord, yCoord, zCoord + 1)) {
             mBlocked = false;
             return true;
         }
         if (!worldObj.blockExists(xCoord, yCoord, zCoord - 1)) {
             mBlockedChecked = false;
-        } else if (!GT_Utility.isOpaqueBlock(worldObj, xCoord, yCoord, zCoord - 1)) {
+        } else if (!GTUtility.isOpaqueBlock(worldObj, xCoord, yCoord, zCoord - 1)) {
             mBlocked = false;
             return true;
         }
@@ -234,8 +234,8 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 this.xCoord,
                 this.yCoord,
                 this.zCoord,
-                GregTech_API.sBlockGranites)) {
-                    if (aOverridingStoneBlock == GregTech_API.sBlockGranites) {
+                GregTechAPI.sBlockGranites)) {
+                    if (aOverridingStoneBlock == GregTechAPI.sBlockGranites) {
                         if (aOverridingStoneMeta < 8) {
                             this.mMetaData = ((short) (this.mMetaData + 3000));
                         } else {
@@ -249,8 +249,8 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                     this.xCoord,
                     this.yCoord,
                     this.zCoord,
-                    GregTech_API.sBlockStones)) {
-                        if (aOverridingStoneBlock == GregTech_API.sBlockStones) {
+                    GregTechAPI.sBlockStones)) {
+                        if (aOverridingStoneBlock == GregTechAPI.sBlockStones) {
                             if (aOverridingStoneMeta < 8) {
                                 this.mMetaData = ((short) (this.mMetaData + 5000));
                             } else {
@@ -266,23 +266,23 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
             this.zCoord,
             getHarvestData(
                 this.mMetaData,
-                ((GT_Block_Ores_Abstract) blockType).getBaseBlockHarvestLevel(mMetaData % 16000 / 1000)),
+                ((BlockOresAbstract) blockType).getBaseBlockHarvestLevel(mMetaData % 16000 / 1000)),
             0);
     }
 
     public void convertOreBlock(World aWorld, int aX, int aY, int aZ) {
         short aMeta = ((short) (this.mMetaData % 1000 + (this.mMetaData / 16000 * 16000)));
-        aWorld.setBlock(aX, aY, aZ, GregTech_API.sBlockOres1);
+        aWorld.setBlock(aX, aY, aZ, GregTechAPI.sBlockOres1);
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (tTileEntity instanceof GT_TileEntity_Ores) {
-            ((GT_TileEntity_Ores) tTileEntity).mMetaData = aMeta;
+        if (tTileEntity instanceof TileEntityOres) {
+            ((TileEntityOres) tTileEntity).mMetaData = aMeta;
             this.worldObj.setBlockMetadataWithNotify(
                 this.xCoord,
                 this.yCoord,
                 this.zCoord,
                 getHarvestData(
                     aMeta,
-                    ((GT_Block_Ores_Abstract) tTileEntity.blockType).getBaseBlockHarvestLevel(aMeta % 16000 / 1000)),
+                    ((BlockOresAbstract) tTileEntity.blockType).getBaseBlockHarvestLevel(aMeta % 16000 / 1000)),
                 0);
         }
     }
@@ -302,7 +302,7 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
             rList.add(new ItemStack(Blocks.cobblestone, 1, 0));
             return rList;
         }
-        Materials aOreMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)];
+        Materials aOreMaterial = GregTechAPI.sGeneratedMaterials[(this.mMetaData % 1000)];
         if (this.mMetaData < 16000) {
             boolean tIsRich = false;
 
@@ -311,11 +311,11 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
             // Dense ore
 
             // NetherOre
-            if (GT_Mod.gregtechproxy.mNetherOreYieldMultiplier && !tIsRich) {
+            if (GTMod.gregtechproxy.mNetherOreYieldMultiplier && !tIsRich) {
                 tIsRich = (this.mMetaData >= 1000 && this.mMetaData < 2000);
             }
             // EndOre
-            if (GT_Mod.gregtechproxy.mEndOreYieldMultiplier && !tIsRich) {
+            if (GTMod.gregtechproxy.mEndOreYieldMultiplier && !tIsRich) {
                 tIsRich = (this.mMetaData >= 2000 && this.mMetaData < 3000);
             }
 
@@ -324,9 +324,9 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 rList.add(new ItemStack(aDroppedOre, 1, this.mMetaData));
 
             } else {
-                switch (GT_Mod.gregtechproxy.oreDropSystem) {
+                switch (GTMod.gregtechproxy.oreDropSystem) {
                     case Item -> {
-                        rList.add(GT_OreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, (tIsRich ? 2 : 1)));
+                        rList.add(GTOreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, (tIsRich ? 2 : 1)));
                     }
                     // TODO: Test
                     case FortuneItem -> {
@@ -341,11 +341,11 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                             int amount = aMinAmount
                                 + Math.max(worldObj.rand.nextInt(aFortune * (tIsRich ? 2 : 1) + 2) - 1, 0);
                             for (int i = 0; i < amount; i++) {
-                                rList.add(GT_OreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, 1));
+                                rList.add(GTOreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, 1));
                             }
                         } else {
                             for (int i = 0; i < (tIsRich ? 2 : 1); i++) {
-                                rList.add(GT_OreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, 1));
+                                rList.add(GTOreDictUnificator.get(OrePrefixes.rawOre, aOreMaterial, 1));
                             }
                         }
                     }
@@ -383,53 +383,50 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
 
             Materials aMaterial = aOreMaterial.mOreReplacement;
 
-            ItemStack tStack = GT_OreDictUnificator
-                .get(OrePrefixes.gemExquisite, aMaterial, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L);
+            ItemStack tStack = GTOreDictUnificator
+                .get(OrePrefixes.gemExquisite, aMaterial, GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L);
             if (tStack != null) {
                 for (int i = 0; i < 1; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator
-                .get(OrePrefixes.gemFlawless, aMaterial, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L);
+            tStack = GTOreDictUnificator
+                .get(OrePrefixes.gemFlawless, aMaterial, GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L);
             if (tStack != null) {
                 for (int i = 0; i < 2; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);
+            tStack = GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);
             if (tStack != null) {
                 for (int i = 0; i < 12; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator.get(
-                OrePrefixes.gemFlawed,
-                aMaterial,
-                GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1L),
-                1L);
+            tStack = GTOreDictUnificator
+                .get(OrePrefixes.gemFlawed, aMaterial, GTOreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1L), 1L);
             if (tStack != null) {
                 for (int i = 0; i < 5; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1L);
+            tStack = GTOreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1L);
             if (tStack != null) {
                 for (int i = 0; i < 10; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator.get(
+            tStack = GTOreDictUnificator.get(
                 OrePrefixes.gemChipped,
                 aMaterial,
-                GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L),
+                GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L),
                 1L);
             if (tStack != null) {
                 for (int i = 0; i < 5; i++) {
                     tSelector.add(tStack);
                 }
             }
-            tStack = GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L);
+            tStack = GTOreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L);
             if (tStack != null) {
                 for (int i = 0; i < 10; i++) {
                     tSelector.add(tStack);
@@ -442,14 +439,13 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                     aMaterial.mOreMultiplier
                         + (aFortune > 0 ? tRandom.nextInt(1 + aFortune * aMaterial.mOreMultiplier) : 0) / 2); i
                             < j; i++) {
-                    rList.add(GT_Utility.copyAmount(1, tSelector.get(tRandom.nextInt(tSelector.size()))));
+                    rList.add(GTUtility.copyAmount(1, tSelector.get(tRandom.nextInt(tSelector.size()))));
                 }
             }
             if (tRandom.nextInt(3 + aFortune) > 1) {
-                Materials dustMat = ((GT_Block_Ores_Abstract) aDroppedOre).getDroppedDusts()[this.mMetaData / 1000
-                    % 16];
+                Materials dustMat = ((BlockOresAbstract) aDroppedOre).getDroppedDusts()[this.mMetaData / 1000 % 16];
                 if (dustMat != null) rList.add(
-                    GT_OreDictUnificator
+                    GTOreDictUnificator
                         .get(tRandom.nextInt(3) > 0 ? OrePrefixes.dustImpure : OrePrefixes.dust, dustMat, 1L));
             }
         }
@@ -466,8 +462,8 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
     }
 
     private ITexture @NotNull [] getTextureInternal(Block aBlock) {
-        Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)];
-        if ((aMaterial != null) && (this.mMetaData < 32000) && (aBlock instanceof GT_Block_Ores_Abstract)) {
+        Materials aMaterial = GregTechAPI.sGeneratedMaterials[(this.mMetaData % 1000)];
+        if ((aMaterial != null) && (this.mMetaData < 32000) && (aBlock instanceof BlockOresAbstract)) {
             ITexture iTexture = TextureFactory.builder()
                 .addIcon(
                     aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex
@@ -475,7 +471,7 @@ public class GT_TileEntity_Ores extends TileEntity implements IAllSidedTexturedT
                 .setRGBA(aMaterial.mRGBa)
                 .stdOrient()
                 .build();
-            return new ITexture[] { ((GT_Block_Ores_Abstract) aBlock).getTextureSet()[((this.mMetaData / 1000) % 16)],
+            return new ITexture[] { ((BlockOresAbstract) aBlock).getTextureSet()[((this.mMetaData / 1000) % 16)],
                 iTexture };
         }
         return new ITexture[] { TextureFactory.of(Blocks.stone, 0), TextureFactory.builder()
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/CoverArm.java
index 51f330e8df..fef9ef1327 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
+++ b/src/main/java/gregtech/common/covers/CoverArm.java
@@ -12,19 +12,19 @@ import com.gtnewhorizons.modularui.api.NumberFormatMUI;
 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.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-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.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_Arm extends GT_CoverBehavior {
+public class CoverArm extends CoverBehavior {
 
     public final int mTickRate;
     // msb converted, 2nd : direction (1=export)
@@ -34,7 +34,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     protected static final int SLOT_ID_MIN = 0;
     protected static final int CONVERTED_BIT = 0x80000000;
 
-    public GT_Cover_Arm(int aTickRate, ITexture coverTexture) {
+    public CoverArm(int aTickRate, ITexture coverTexture) {
         super(coverTexture);
         this.mTickRate = aTickRate;
     }
@@ -78,7 +78,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
 
         if (fromSlot > 0 && toSlot > 0) {
             if (fromTile instanceof IInventory fromInventory && toTile instanceof IInventory toInventory)
-                GT_Utility.moveFromSlotToSlot(
+                GTUtility.moveFromSlotToSlot(
                     fromInventory,
                     toInventory,
                     fromSlot - 1,
@@ -93,7 +93,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
             final ForgeDirection toSide;
             if ((aCoverVariable & EXPORT_MASK) > 0) toSide = side;
             else toSide = side.getOpposite();
-            GT_Utility.moveOneItemStackIntoSlot(
+            GTUtility.moveOneItemStackIntoSlot(
                 fromTile,
                 toTile,
                 toSide,
@@ -108,7 +108,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
             final ForgeDirection toSide;
             if ((aCoverVariable & EXPORT_MASK) > 0) toSide = side;
             else toSide = side.getOpposite();
-            if (fromTile instanceof IInventory) GT_Utility.moveFromSlotToSide(
+            if (fromTile instanceof IInventory) GTUtility.moveFromSlotToSide(
                 (IInventory) fromTile,
                 toTile,
                 fromSlot - 1,
@@ -129,7 +129,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                 fromSide = side.getOpposite();
                 toSide = side;
             }
-            GT_Utility.moveOneItemStack(
+            GTUtility.moveOneItemStack(
                 fromTile,
                 toTile,
                 fromSide,
@@ -149,7 +149,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     public int onCoverScrewdriverclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         int step = 0;
-        if (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
+        if (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
             step += aPlayer.isSneaking() ? 256 : 16;
         } else {
             step -= aPlayer.isSneaking() ? 256 : 16;
@@ -163,7 +163,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     protected boolean onCoverRightClickImpl(ForgeDirection side, int aCoverID,
         ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX,
         float aY, float aZ) {
-        int step = (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1;
+        int step = (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1;
         int tCoverVariable = getNewVar(aCoverVariable.get(), step);
         sendMessageToPlayer(aPlayer, tCoverVariable);
         aCoverVariable.set(tCoverVariable);
@@ -174,7 +174,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     @SuppressWarnings("deprecation")
     public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        final int step = (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1;
+        final int step = (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1;
         aCoverVariable = getNewVar(aCoverVariable, step);
         sendMessageToPlayer(aPlayer, aCoverVariable);
         aTileEntity.setCoverDataAtSide(side, aCoverVariable);
@@ -188,11 +188,11 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     }
 
     private void sendMessageToPlayer(EntityPlayer aPlayer, int var) {
-        if ((var & EXPORT_MASK) != 0) GT_Utility.sendChatToPlayer(
+        if ((var & EXPORT_MASK) != 0) GTUtility.sendChatToPlayer(
             aPlayer,
-            GT_Utility.trans("001", "Puts out into adjacent Slot #") + (((var >> 14) & SLOT_ID_MASK) - 1));
-        else GT_Utility
-            .sendChatToPlayer(aPlayer, GT_Utility.trans("002", "Grabs in for own Slot #") + ((var & SLOT_ID_MASK) - 1));
+            GTUtility.trans("001", "Puts out into adjacent Slot #") + (((var >> 14) & SLOT_ID_MASK) - 1));
+        else GTUtility
+            .sendChatToPlayer(aPlayer, GTUtility.trans("002", "Grabs in for own Slot #") + ((var & SLOT_ID_MASK) - 1));
     }
 
     private int getNewVar(int var, int step) {
@@ -277,7 +277,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ArmUIFactory(buildContext).createWindow();
     }
 
@@ -298,14 +298,14 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
             @Override
             public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) {
                 if (number < 0) {
-                    return toAppendTo.append(GT_Utility.trans("ANY", "Any"));
+                    return toAppendTo.append(GTUtility.trans("ANY", "Any"));
                 } else {
                     return super.format(number, toAppendTo, pos);
                 }
             }
         };
 
-        protected ArmUIFactory(GT_CoverUIBuildContext buildContext) {
+        protected ArmUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -314,8 +314,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
         protected void addUIWidgets(ModularWindow.Builder builder) {
             maxSlot = getMaxSlot();
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_Arm.this).addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverArm.this).addFollower(
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> getFlagExport(convert(coverData)) > 0,
                     (coverData, state) -> {
                         if (state) {
@@ -326,11 +326,11 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                                 convert(coverData) & ~EXPORT_MASK | CONVERTED_BIT);
                         }
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT)
-                        .addTooltip(GT_Utility.trans("006", "Export"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT)
+                        .addTooltip(GTUtility.trans("006", "Export"))
                         .setPos(spaceX * 0, spaceY * 0))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> getFlagExport(convert(coverData)) == 0,
                         (coverData, state) -> {
                             if (state) {
@@ -341,11 +341,11 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                                     convert(coverData) | EXPORT_MASK | CONVERTED_BIT);
                             }
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT)
-                            .addTooltip(GT_Utility.trans("007", "Import"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT)
+                            .addTooltip(GTUtility.trans("007", "Import"))
                             .setPos(spaceX * 1, spaceY * 0))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) (getFlagInternalSlot(convert(coverData)) - 1),
                         (coverData, state) -> {
                             final int coverVariable = convert(coverData);
@@ -361,7 +361,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                             .setPos(spaceX * 0, spaceY * 1 + 2)
                             .setSize(spaceX * 2 + 5, 12))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) (getFlagAdjacentSlot(convert(coverData)) - 1),
                         (coverData, state) -> {
                             final int coverVariable = convert(coverData);
@@ -395,15 +395,15 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                 .widget(
                     new TextWidget()
                         .setStringSupplier(
-                            () -> (convert(getCoverData()) & EXPORT_MASK) > 0 ? GT_Utility.trans("006", "Export")
-                                : GT_Utility.trans("007", "Import"))
+                            () -> (convert(getCoverData()) & EXPORT_MASK) > 0 ? GTUtility.trans("006", "Export")
+                                : GTUtility.trans("007", "Import"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("254.1", "Internal slot#")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("254.1", "Internal slot#")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("255", "Adjacent slot#")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("255", "Adjacent slot#")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 3, 4 + startY + spaceY * 2));
         }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Chest.java b/src/main/java/gregtech/common/covers/CoverChest.java
index 36e441102b..4afc3b9578 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Chest.java
+++ b/src/main/java/gregtech/common/covers/CoverChest.java
@@ -20,20 +20,20 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 
 import cpw.mods.fml.common.network.ByteBufUtils;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
+import gregtech.api.util.CoverBehaviorBase;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInventory> {
+public class CoverChest extends CoverBehaviorBase<CoverChest.ChestInventory> {
 
     private final int slots;
     private final int stackSizeLimit = 1;
 
-    public GT_Cover_Chest(int slots, ITexture coverTexture) {
+    public CoverChest(int slots, ITexture coverTexture) {
         super(ChestInventory.class, coverTexture);
         if (slots <= 0) throw new IllegalArgumentException("slots must be greater than 0");
         this.slots = slots;
@@ -109,7 +109,7 @@ public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInv
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ChestUIFactory(buildContext).createWindow();
     }
 
@@ -118,7 +118,7 @@ public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInv
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public ChestUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ChestUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -149,7 +149,7 @@ public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInv
             CoverDataControllerWidget<ChestInventory> w = new CoverDataControllerWidget<>(
                 this::getCoverData,
                 this::setCoverData,
-                GT_Cover_Chest.this);
+                CoverChest.this);
             ChestInventory d = getCoverData();
             LimitingItemStackHandler h;
             if (d == null) {
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/CoverControlsWork.java
index 2c51cdc355..6c92c61351 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
+++ b/src/main/java/gregtech/common/covers/CoverControlsWork.java
@@ -8,21 +8,21 @@ import net.minecraftforge.fluids.Fluid;
 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.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.covers.IControlsWorkCover;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-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_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControlsWorkCover {
+public class CoverControlsWork extends CoverBehavior implements IControlsWorkCover {
 
-    public GT_Cover_ControlsWork(ITexture coverTexture) {
+    public CoverControlsWork(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -47,7 +47,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
                         if (player != null) {
                             lastPlayer = null;
                             mPlayerNotified = true;
-                            GT_Utility.sendChatToPlayer(
+                            GTUtility.sendChatToPlayer(
                                 player,
                                 aTileEntity.getInventoryName() + "at "
                                     + String.format(
@@ -135,19 +135,19 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
             aCoverVariable = 2;
         }
         if (aCoverVariable == 0) {
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("003", "Enable with Signal"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("003", "Enable with Signal"));
         }
         if (aCoverVariable == 1) {
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("004", "Disable with Signal"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("004", "Disable with Signal"));
         }
         if (aCoverVariable == 2) {
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("005", "Disabled"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("005", "Disabled"));
         }
         if (aCoverVariable == 3) {
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("505", "Enable with Signal (Safe)"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("505", "Enable with Signal (Safe)"));
         }
         if (aCoverVariable == 4) {
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("506", "Disable with Signal (Safe)"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("506", "Disable with Signal (Safe)"));
         }
         // TODO: Set lastPlayer
         return aCoverVariable;
@@ -177,7 +177,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ControlsWorkUIFactory(buildContext).createWindow();
     }
 
@@ -188,7 +188,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public ControlsWorkUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ControlsWorkUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -200,48 +200,48 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                         this::getCoverData,
                         this::setCoverData,
-                        GT_Cover_ControlsWork.this,
+                        CoverControlsWork.this,
                         (id, coverData) -> !getClickable(id, convert(coverData)),
                         (id, coverData) -> new ISerializableObject.LegacyCoverData(
                             getNewCoverVariable(id, convert(coverData))))
                                 .addToggleButton(
                                     0,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_REDSTONE_ON)
                                         .setPos(spaceX * 0, spaceY * 0))
                                 .addToggleButton(
                                     1,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_REDSTONE_OFF)
                                         .setPos(spaceX * 0, spaceY * 1))
                                 .addToggleButton(
                                     2,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CROSS)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CROSS)
                                         .setPos(spaceX * 0, spaceY * 2))
                                 .setPos(startX, startY))
                 .widget(
-                    new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_ControlsWork.this)
+                    new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverControlsWork.this)
                         .addFollower(
-                            CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                            CoverDataFollowerToggleButtonWidget.ofCheckAndCross(),
                             coverData -> convert(coverData) > 2,
                             (coverData, state) -> new ISerializableObject.LegacyCoverData(
                                 adjustCoverVariable(state, convert(coverData))),
                             widget -> widget.setPos(spaceX * 0, spaceY * 3))
                         .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("243", "Enable with Redstone"))
+                    new TextWidget(GTUtility.trans("243", "Enable with Redstone"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("244", "Disable with Redstone"))
+                    new TextWidget(GTUtility.trans("244", "Disable with Redstone"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("245", "Disable machine")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("245", "Disable machine")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("507", "Safe Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("507", "Safe Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3));
         }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/CoverConveyor.java
index b7eb782bbf..cb2690d95b 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
+++ b/src/main/java/gregtech/common/covers/CoverConveyor.java
@@ -1,6 +1,6 @@
 package gregtech.common.covers;
 
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 
 import java.util.Arrays;
 
@@ -12,23 +12,23 @@ import net.minecraftforge.fluids.Fluid;
 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.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-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_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_Conveyor extends GT_CoverBehavior {
+public class CoverConveyor extends CoverBehavior {
 
     public final int mTickRate;
     private final int mMaxStacks;
 
-    public GT_Cover_Conveyor(int aTickRate, int maxStacks, ITexture coverTexture) {
+    public CoverConveyor(int aTickRate, int maxStacks, ITexture coverTexture) {
         super(coverTexture);
         this.mTickRate = aTickRate;
         this.mMaxStacks = maxStacks;
@@ -78,21 +78,18 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
             aCoverVariable = 11;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)"));
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)"));
-            case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input"));
-            case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output"));
-            case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)"));
-            case 9 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("015", "Import allow Output (conditional)"));
-            case 10 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("016", "Export allow Input (invert cond)"));
-            case 11 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("017", "Import allow Output (invert cond)"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("006", "Export"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("007", "Import"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("008", "Export (conditional)"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("009", "Import (conditional)"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("010", "Export (invert cond)"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("011", "Import (invert cond)"));
+            case 6 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("012", "Export allow Input"));
+            case 7 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("013", "Import allow Output"));
+            case 8 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("014", "Export allow Input (conditional)"));
+            case 9 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("015", "Import allow Output (conditional)"));
+            case 10 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("016", "Export allow Input (invert cond)"));
+            case 11 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("017", "Import allow Output (invert cond)"));
         }
         return aCoverVariable;
     }
@@ -159,7 +156,7 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ConveyorUIFactory(buildContext).createWindow();
     }
 
@@ -170,10 +167,10 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        private CoverDataFollower_ToggleButtonWidget<ISerializableObject.LegacyCoverData> mBlockWidget = null;
-        private CoverDataFollower_ToggleButtonWidget<ISerializableObject.LegacyCoverData> mAllowWidget = null;
+        private CoverDataFollowerToggleButtonWidget<ISerializableObject.LegacyCoverData> mBlockWidget = null;
+        private CoverDataFollowerToggleButtonWidget<ISerializableObject.LegacyCoverData> mAllowWidget = null;
 
-        public ConveyorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ConveyorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -184,86 +181,86 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
                 new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                     this::getCoverData,
                     this::setCoverData,
-                    GT_Cover_Conveyor.this,
+                    CoverConveyor.this,
                     (id, coverData) -> !getClickable(id, convert(coverData)),
                     (id, coverData) -> new ISerializableObject.LegacyCoverData(
                         getNewCoverVariable(id, convert(coverData))))
                             .addToggleButton(
                                 0,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT)
-                                    .addTooltip(GT_Utility.trans("006", "Export"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT)
+                                    .addTooltip(GTUtility.trans("006", "Export"))
                                     .setPos(spaceX * 0, spaceY * 0))
                             .addToggleButton(
                                 1,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT)
-                                    .addTooltip(GT_Utility.trans("007", "Import"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT)
+                                    .addTooltip(GTUtility.trans("007", "Import"))
                                     .setPos(spaceX * 1, spaceY * 0))
                             .addToggleButton(
                                 2,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
-                                    .addTooltip(GT_Utility.trans("224", "Always On"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK)
+                                    .addTooltip(GTUtility.trans("224", "Always On"))
                                     .setPos(spaceX * 0, spaceY * 1))
                             .addToggleButton(
                                 3,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
-                                    .addTooltip(GT_Utility.trans("343", "Use Machine Processing State"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
+                                    .addTooltip(GTUtility.trans("343", "Use Machine Processing State"))
                                     .setPos(spaceX * 1, spaceY * 1))
                             .addToggleButton(
                                 4,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
                                 widget -> widget
-                                    .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
-                                    .addTooltip(GT_Utility.trans("343.1", "Use Inverted Machine Processing State"))
+                                    .setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
+                                    .addTooltip(GTUtility.trans("343.1", "Use Inverted Machine Processing State"))
                                     .setPos(spaceX * 2, spaceY * 1))
-                            .addToggleButton(5, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> {
+                            .addToggleButton(5, CoverDataFollowerToggleButtonWidget.ofDisableable(), widget -> {
                                 mAllowWidget = widget;
                                 widget.setTextureGetter(i -> {
                                     ISerializableObject.LegacyCoverData coverData = getCoverData();
                                     return coverData == null || coverData.get() % 2 == 0
-                                        ? GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT
-                                        : GT_UITextures.OVERLAY_BUTTON_ALLOW_OUTPUT;
+                                        ? GTUITextures.OVERLAY_BUTTON_ALLOW_INPUT
+                                        : GTUITextures.OVERLAY_BUTTON_ALLOW_OUTPUT;
                                 })
                                     .dynamicTooltip(() -> {
                                         ISerializableObject.LegacyCoverData coverData = getCoverData();
                                         return Arrays.asList(
                                             coverData == null || coverData.get() % 2 == 0
-                                                ? GT_Utility.trans("314", "Allow Input")
-                                                : GT_Utility.trans("312", "Allow Output"));
+                                                ? GTUtility.trans("314", "Allow Input")
+                                                : GTUtility.trans("312", "Allow Output"));
                                     })
                                     .setPos(spaceX * 0, spaceY * 2);
                             })
-                            .addToggleButton(6, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> {
+                            .addToggleButton(6, CoverDataFollowerToggleButtonWidget.ofDisableable(), widget -> {
                                 mBlockWidget = widget;
                                 widget.setTextureGetter(i -> {
                                     ISerializableObject.LegacyCoverData coverData = getCoverData();
                                     return coverData == null || coverData.get() % 2 == 0
-                                        ? GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT
-                                        : GT_UITextures.OVERLAY_BUTTON_BLOCK_OUTPUT;
+                                        ? GTUITextures.OVERLAY_BUTTON_BLOCK_INPUT
+                                        : GTUITextures.OVERLAY_BUTTON_BLOCK_OUTPUT;
                                 })
                                     .dynamicTooltip(() -> {
                                         ISerializableObject.LegacyCoverData coverData = getCoverData();
                                         return Arrays.asList(
                                             coverData == null || coverData.get() % 2 == 0
-                                                ? GT_Utility.trans("313", "Block Input")
-                                                : GT_Utility.trans("311", "Block Output"));
+                                                ? GTUtility.trans("313", "Block Input")
+                                                : GTUtility.trans("311", "Block Output"));
                                     })
                                     .setPos(spaceX * 1, spaceY * 2);
                             })
                             .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 3, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 3, 4 + startY + spaceY * 1))
                 .widget(TextWidget.dynamicString(() -> {
                     ISerializableObject.LegacyCoverData coverData = getCoverData();
-                    return coverData == null || coverData.get() % 2 == 0 ? GT_Utility.trans("344", "Input Blocking")
-                        : GT_Utility.trans("344.1", "Output Blocking");
+                    return coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("344", "Input Blocking")
+                        : GTUtility.trans("344.1", "Output Blocking");
                 })
                     .setSynced(false)
                     .setDefaultColor(COLOR_TEXT_GRAY.get())
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java b/src/main/java/gregtech/common/covers/CoverCrafting.java
index f492542fa9..10da32033c 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java
+++ b/src/main/java/gregtech/common/covers/CoverCrafting.java
@@ -8,12 +8,12 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.CoverBehavior;
 import gregtech.api.util.ISerializableObject;
 
-public class GT_Cover_Crafting extends GT_CoverBehavior {
+public class CoverCrafting extends CoverBehavior {
 
-    public GT_Cover_Crafting(ITexture coverTexture) {
+    public CoverCrafting(ITexture coverTexture) {
         super(coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtech/common/covers/CoverDoesWork.java
index 96ef77f207..1575f243ab 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
+++ b/src/main/java/gregtech/common/covers/CoverDoesWork.java
@@ -7,24 +7,24 @@ import net.minecraftforge.fluids.Fluid;
 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.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-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_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_DoesWork extends GT_CoverBehavior {
+public class CoverDoesWork extends CoverBehavior {
 
     private static int FLAG_INVERTED = 0x1;
     private static int FLAG_PROGRESS = 0x2;
     private static int FLAG_ENABLED = 0x4;
 
-    public GT_Cover_DoesWork(ITexture coverTexture) {
+    public CoverDoesWork(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -71,17 +71,17 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
             aCoverVariable = 5;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("018", "Normal"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("018", "Normal"));
             // Progress scaled
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("019", "Inverted"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("019", "Inverted"));
             // ^ inverted
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("020", "Ready to work"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("020", "Ready to work"));
             // Not Running
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("021", "Not ready to work"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("021", "Not ready to work"));
             // Running
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("028", "Machine Enabled"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("028", "Machine Enabled"));
             // Enabled
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("029", "Machine Disabled"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("029", "Machine Disabled"));
             // Disabled
         }
         return aCoverVariable;
@@ -140,7 +140,7 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new DoesWorkUIFactory(buildContext).createWindow();
     }
 
@@ -155,7 +155,7 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public DoesWorkUIFactory(GT_CoverUIBuildContext buildContext) {
+        public DoesWorkUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -167,39 +167,39 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                         this::getCoverData,
                         this::setCoverData,
-                        GT_Cover_DoesWork.this,
+                        CoverDoesWork.this,
                         (id, coverData) -> isEnabled(id, convert(coverData)),
                         (id, coverData) -> new ISerializableObject.LegacyCoverData(
                             getNewCoverVariable(id, convert(coverData))))
                                 .addToggleButton(
                                     0,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_PROGRESS)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_PROGRESS)
                                         .setPos(spaceX * 0, spaceY * 0))
                                 .addToggleButton(
                                     1,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK)
                                         .setPos(spaceX * 1, spaceY * 0))
                                 .addToggleButton(
                                     2,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON)
                                         .setPos(spaceX * 2, spaceY * 0))
                                 .addToggleButton(
                                     3,
-                                    CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                                    CoverDataFollowerToggleButtonWidget.ofRedstone(),
                                     widget -> widget.setPos(spaceX * 0, spaceY * 1))
                                 .setPos(startX, startY))
                 .widget(TextWidget.dynamicString(() -> {
                     int coverVariable = convert(getCoverData());
 
                     if (isFlagSet(coverVariable, FLAG_ENABLED)) {
-                        return GT_Utility.trans("271", "Machine enabled");
+                        return GTUtility.trans("271", "Machine enabled");
                     } else if (isFlagSet(coverVariable, FLAG_PROGRESS)) {
-                        return GT_Utility.trans("242", "Machine idle");
+                        return GTUtility.trans("242", "Machine idle");
                     } else {
-                        return GT_Utility.trans("241", "Recipe progress");
+                        return GTUtility.trans("241", "Recipe progress");
                     }
 
                 })
@@ -210,8 +210,8 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
                     TextWidget
                         .dynamicString(
                             () -> isFlagSet(convert(getCoverData()), FLAG_INVERTED)
-                                ? GT_Utility.trans("INVERTED", "Inverted")
-                                : GT_Utility.trans("NORMAL", "Normal"))
+                                ? GTUtility.trans("INVERTED", "Inverted")
+                                : GTUtility.trans("NORMAL", "Normal"))
                         .setSynced(false)
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1));
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/CoverDrain.java
index 2590f8e7ae..ff10c3a992 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
+++ b/src/main/java/gregtech/common/covers/CoverDrain.java
@@ -13,12 +13,12 @@ import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 
-public class GT_Cover_Drain extends GT_CoverBehavior {
+public class CoverDrain extends CoverBehavior {
 
-    public GT_Cover_Drain(ITexture coverTexture) {
+    public CoverDrain(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -112,12 +112,12 @@ public class GT_Cover_Drain extends GT_CoverBehavior {
             aCoverVariable = 5;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("022", "Import"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("023", "Import (conditional)"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("024", "Import (invert cond)"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("025", "Keep Liquids Away"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("026", "Keep Liquids Away (conditional)"));
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("027", "Keep Liquids Away (invert cond)"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("022", "Import"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("023", "Import (conditional)"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("024", "Import (invert cond)"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("025", "Keep Liquids Away"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("026", "Keep Liquids Away (conditional)"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("027", "Keep Liquids Away (invert cond)"));
         }
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/CoverEUMeter.java
index 5b1f48d04f..07f54012d5 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
+++ b/src/main/java/gregtech/common/covers/CoverEUMeter.java
@@ -17,25 +17,25 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicBatteryBuffer;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_CycleButtonWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerCycleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMeterData> {
+public class CoverEUMeter extends CoverBehaviorBase<CoverEUMeter.EUMeterData> {
 
-    public GT_Cover_EUMeter(ITexture coverTexture) {
+    public CoverEUMeter(ITexture coverTexture) {
         super(EUMeterData.class, coverTexture);
     }
 
@@ -90,21 +90,20 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
         int num = (aCoverVariable.getNum() + (aPlayer.isSneaking() ? -1 : 1) + EnergyType.values().length * 2)
             % (EnergyType.values().length * 2);
         switch (num) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("031", "Normal Universal Storage"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("032", "Inverted Universal Storage"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("033", "Normal Electricity Storage"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("034", "Inverted Electricity Storage"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("035", "Normal Steam Storage"));
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("036", "Inverted Steam Storage"));
-            case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("037", "Normal Average Electric Input"));
-            case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("038", "Inverted Average Electric Input"));
-            case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("039", "Normal Average Electric Output"));
-            case 9 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("040", "Inverted Average Electric Output"));
-            case 10 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("041", "Normal Electricity Storage(Including Batteries)"));
-            case 11 -> GT_Utility.sendChatToPlayer(
-                aPlayer,
-                GT_Utility.trans("042", "Inverted Electricity Storage(Including Batteries)"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("031", "Normal Universal Storage"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("032", "Inverted Universal Storage"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("033", "Normal Electricity Storage"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("034", "Inverted Electricity Storage"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("035", "Normal Steam Storage"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("036", "Inverted Steam Storage"));
+            case 6 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("037", "Normal Average Electric Input"));
+            case 7 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("038", "Inverted Average Electric Input"));
+            case 8 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("039", "Normal Average Electric Output"));
+            case 9 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("040", "Inverted Average Electric Output"));
+            case 10 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("041", "Normal Electricity Storage(Including Batteries)"));
+            case 11 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("042", "Inverted Electricity Storage(Including Batteries)"));
         }
         aCoverVariable.setNum(num);
         return aCoverVariable;
@@ -173,7 +172,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new EUMeterUIFactory(buildContext).createWindow();
     }
 
@@ -184,35 +183,34 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public EUMeterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public EUMeterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
         @SuppressWarnings("PointlessArithmeticExpression")
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
-            final String INVERTED = GT_Utility.trans("INVERTED", "Inverted");
-            final String NORMAL = GT_Utility.trans("NORMAL", "Normal");
+            final String INVERTED = GTUtility.trans("INVERTED", "Inverted");
+            final String NORMAL = GTUtility.trans("NORMAL", "Normal");
 
-            final CoverDataFollower_NumericWidget<EUMeterData> numericWidget = new CoverDataFollower_NumericWidget<>();
+            final CoverDataFollowerNumericWidget<EUMeterData> numericWidget = new CoverDataFollowerNumericWidget<>();
 
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_EUMeter.this)
-                    .addFollower(
-                        new CoverDataFollower_CycleButtonWidget<>(),
-                        coverData -> coverData.type.ordinal(),
-                        (coverData, state) -> {
-                            coverData.type = EnergyType.getEnergyType(state);
-                            return coverData;
-                        },
-                        widget -> widget.setLength(EnergyType.values().length)
-                            .addTooltip(
-                                state -> EnergyType.getEnergyType(state)
-                                    .getTooltip())
-                            .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
-                            .setPos(spaceX * 0, spaceY * 0))
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverEUMeter.this).addFollower(
+                    new CoverDataFollowerCycleButtonWidget<>(),
+                    coverData -> coverData.type.ordinal(),
+                    (coverData, state) -> {
+                        coverData.type = EnergyType.getEnergyType(state);
+                        return coverData;
+                    },
+                    widget -> widget.setLength(EnergyType.values().length)
+                        .addTooltip(
+                            state -> EnergyType.getEnergyType(state)
+                                .getTooltip())
+                        .setStaticTexture(GTUITextures.OVERLAY_BUTTON_CYCLIC)
+                        .setPos(spaceX * 0, spaceY * 0))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                        CoverDataFollowerToggleButtonWidget.ofRedstone(),
                         coverData -> coverData.inverted,
                         (coverData, state) -> {
                             coverData.inverted = state;
@@ -242,7 +240,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX, 4 + startY + spaceY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("222.1", "Energy threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("222.1", "Energy threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX, startY + spaceY * 3 + 4))
 
                 .widget(
@@ -337,22 +335,22 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
 
     private enum EnergyType {
 
-        UNIVERSAL_STORAGE(GT_Utility.trans("301", "Universal"), GT_Utility.trans("256", "Universal Storage"),
+        UNIVERSAL_STORAGE(GTUtility.trans("301", "Universal"), GTUtility.trans("256", "Universal Storage"),
             ICoverable::getUniversalEnergyStored, ICoverable::getUniversalEnergyCapacity),
-        ELECTRICITY_STORAGE(GT_Utility.trans("302", "Int. EU"), GT_Utility.trans("257", "Electricity Storage"),
+        ELECTRICITY_STORAGE(GTUtility.trans("302", "Int. EU"), GTUtility.trans("257", "Electricity Storage"),
             ICoverable::getStoredEU, ICoverable::getEUCapacity),
-        STEAM_STORAGE(GT_Utility.trans("303", "Steam"), GT_Utility.trans("258", "Steam Storage"),
+        STEAM_STORAGE(GTUtility.trans("303", "Steam"), GTUtility.trans("258", "Steam Storage"),
             ICoverable::getStoredSteam, ICoverable::getSteamCapacity),
-        AVERAGE_ELECTRIC_INPUT(GT_Utility.trans("304", "Avg. Input"), GT_Utility.trans("259", "Average Electric Input"),
+        AVERAGE_ELECTRIC_INPUT(GTUtility.trans("304", "Avg. Input"), GTUtility.trans("259", "Average Electric Input"),
             ICoverable::getAverageElectricInput, (te) -> te.getInputVoltage() * te.getInputAmperage()),
-        AVERAGE_ELECTRIC_OUTPUT(GT_Utility.trans("305", "Avg. Output"),
-            GT_Utility.trans("260", "Average Electric Output"), ICoverable::getAverageElectricOutput,
+        AVERAGE_ELECTRIC_OUTPUT(GTUtility.trans("305", "Avg. Output"),
+            GTUtility.trans("260", "Average Electric Output"), ICoverable::getAverageElectricOutput,
             (te) -> te.getOutputVoltage() * te.getOutputAmperage()),
-        ELECTRICITY_STORAGE_INCLUDING_BATTERIES(GT_Utility.trans("306", "EU stored"),
-            GT_Utility.trans("261", "Electricity Storage(Including Batteries)"), (te) -> {
+        ELECTRICITY_STORAGE_INCLUDING_BATTERIES(GTUtility.trans("306", "EU stored"),
+            GTUtility.trans("261", "Electricity Storage(Including Batteries)"), (te) -> {
                 if (te instanceof IGregTechTileEntity) {
                     IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity();
-                    if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) {
+                    if (mte instanceof MTEBasicBatteryBuffer buffer) {
                         return buffer.getStoredEnergy()[0];
                     }
                 }
@@ -360,7 +358,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
             }, (te) -> {
                 if (te instanceof IGregTechTileEntity) {
                     IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity();
-                    if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) {
+                    if (mte instanceof MTEBasicBatteryBuffer buffer) {
                         return buffer.getStoredEnergy()[1];
                     }
                 }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeAE.java b/src/main/java/gregtech/common/covers/CoverFacadeAE.java
index da6c2c9cfa..2104f711c5 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeAE.java
+++ b/src/main/java/gregtech/common/covers/CoverFacadeAE.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 
 import appeng.facade.IFacadeItem;
 
-public class GT_Cover_FacadeAE extends GT_Cover_FacadeBase {
+public class CoverFacadeAE extends CoverFacadeBase {
 
     @Override
     protected Block getTargetBlock(ItemStack aFacadeStack) {
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/CoverFacadeBase.java
index 4d7d0eb7ee..b5aa93d530 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
+++ b/src/main/java/gregtech/common/covers/CoverFacadeBase.java
@@ -18,24 +18,24 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import cpw.mods.fml.common.network.ByteBufUtils;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_RenderingWorld;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTRenderingWorld;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_FacadeBase.FacadeData> {
+public abstract class CoverFacadeBase extends CoverBehaviorBase<CoverFacadeBase.FacadeData> {
 
     /**
      * This is the Dummy, if there is a generic Cover without behavior
      */
-    public GT_Cover_FacadeBase() {
+    public CoverFacadeBase() {
         super(FacadeData.class);
     }
 
@@ -58,12 +58,12 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     protected FacadeData onCoverScrewdriverClickImpl(ForgeDirection side, int aCoverID, FacadeData aCoverVariable,
         ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         aCoverVariable.mFlags = ((aCoverVariable.mFlags + 1) & 15);
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
-            ((aCoverVariable.mFlags & 1) != 0 ? GT_Utility.trans("128.1", "Redstone ") : "")
-                + ((aCoverVariable.mFlags & 2) != 0 ? GT_Utility.trans("129.1", "Energy ") : "")
-                + ((aCoverVariable.mFlags & 4) != 0 ? GT_Utility.trans("130.1", "Fluids ") : "")
-                + ((aCoverVariable.mFlags & 8) != 0 ? GT_Utility.trans("131.1", "Items ") : ""));
+            ((aCoverVariable.mFlags & 1) != 0 ? GTUtility.trans("128.1", "Redstone ") : "")
+                + ((aCoverVariable.mFlags & 2) != 0 ? GTUtility.trans("129.1", "Energy ") : "")
+                + ((aCoverVariable.mFlags & 4) != 0 ? GTUtility.trans("130.1", "Fluids ") : "")
+                + ((aCoverVariable.mFlags & 8) != 0 ? GTUtility.trans("131.1", "Items ") : ""));
         return aCoverVariable;
     }
 
@@ -119,10 +119,10 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     public void placeCover(ForgeDirection side, ItemStack aCover, ICoverable aTileEntity) {
         aTileEntity.setCoverIdAndDataAtSide(
             side,
-            GT_Utility.stackToInt(aCover),
-            new FacadeData(GT_Utility.copyAmount(1, aCover), 0));
+            GTUtility.stackToInt(aCover),
+            new FacadeData(GTUtility.copyAmount(1, aCover), 0));
 
-        if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance()
+        if (aTileEntity.isClientSide()) GTRenderingWorld.getInstance()
             .register(
                 aTileEntity.getXCoord(),
                 aTileEntity.getYCoord(),
@@ -146,7 +146,7 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     @Override
     protected ITexture getSpecialCoverTextureImpl(ForgeDirection side, int aCoverID, FacadeData aCoverVariable,
         ICoverable aTileEntity) {
-        if (GT_Utility.isStackInvalid(aCoverVariable.mStack)) return Textures.BlockIcons.ERROR_RENDERING[0];
+        if (GTUtility.isStackInvalid(aCoverVariable.mStack)) return Textures.BlockIcons.ERROR_RENDERING[0];
         Block block = getTargetBlock(aCoverVariable.mStack);
         if (block == null) return Textures.BlockIcons.ERROR_RENDERING[0];
         // TODO: change this when *someone* made the block render in both pass
@@ -161,14 +161,14 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     @Override
     protected Block getFacadeBlockImpl(ForgeDirection side, int aCoverID, FacadeData aCoverVariable,
         ICoverable aTileEntity) {
-        if (GT_Utility.isStackInvalid(aCoverVariable.mStack)) return null;
+        if (GTUtility.isStackInvalid(aCoverVariable.mStack)) return null;
         return getTargetBlock(aCoverVariable.mStack);
     }
 
     @Override
     protected int getFacadeMetaImpl(ForgeDirection side, int aCoverID, FacadeData aCoverVariable,
         ICoverable aTileEntity) {
-        if (GT_Utility.isStackInvalid(aCoverVariable.mStack)) return 0;
+        if (GTUtility.isStackInvalid(aCoverVariable.mStack)) return 0;
         return getTargetMeta(aCoverVariable.mStack);
     }
 
@@ -185,7 +185,7 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     @Override
     protected void onDataChangedImpl(ForgeDirection side, int aCoverID, FacadeData aCoverVariable,
         ICoverable aTileEntity) {
-        if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance()
+        if (aTileEntity.isClientSide()) GTRenderingWorld.getInstance()
             .register(
                 aTileEntity.getXCoord(),
                 aTileEntity.getYCoord(),
@@ -200,11 +200,11 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
             for (final ForgeDirection iSide : ForgeDirection.VALID_DIRECTIONS) {
                 if (iSide == side) continue;
                 // since we do not allow multiple type of facade per block, this check would be enough.
-                if (aTileEntity.getCoverBehaviorAtSideNew(iSide) instanceof GT_Cover_FacadeBase) return;
+                if (aTileEntity.getCoverBehaviorAtSideNew(iSide) instanceof CoverFacadeBase) return;
             }
             if (aCoverVariable.mStack != null)
                 // mStack == null -> cover removed before data reach client
-                GT_RenderingWorld.getInstance()
+                GTRenderingWorld.getInstance()
                     .unregister(
                         aTileEntity.getXCoord(),
                         aTileEntity.getYCoord(),
@@ -303,7 +303,7 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new FacadeBaseUIFactory(buildContext).createWindow();
     }
 
@@ -314,7 +314,7 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public FacadeBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+        public FacadeBaseUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -325,26 +325,26 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
                 new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                     this::getCoverData,
                     this::setCoverData,
-                    GT_Cover_FacadeBase.this,
+                    CoverFacadeBase.this,
                     this::isEnabled,
                     (id, coverData) -> {
                         coverData.mFlags = getNewCoverVariable(id, coverData);
                         return coverData;
                     }).addToggleButton(
                         0,
-                        CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                        CoverDataFollowerToggleButtonWidget.ofCheckAndCross(),
                         widget -> widget.setPos(spaceX * 0, spaceY * 0))
                         .addToggleButton(
                             1,
-                            CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                            CoverDataFollowerToggleButtonWidget.ofCheckAndCross(),
                             widget -> widget.setPos(spaceX * 0, spaceY * 1))
                         .addToggleButton(
                             2,
-                            CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                            CoverDataFollowerToggleButtonWidget.ofCheckAndCross(),
                             widget -> widget.setPos(spaceX * 0, spaceY * 2))
                         .addToggleButton(
                             3,
-                            CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                            CoverDataFollowerToggleButtonWidget.ofCheckAndCross(),
                             widget -> widget.setPos(spaceX * 0, spaceY * 3))
                         .setPos(startX, startY))
                 .widget(
@@ -357,16 +357,16 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
                         .setDefaultColor(COLOR_TITLE.get())
                         .setPos(25, 9))
                 .widget(
-                    new TextWidget(GT_Utility.trans("128", "Redstone")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("128", "Redstone")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("129", "Energy")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("129", "Energy")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("130", "Fluids")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("130", "Fluids")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("131", "Items")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("131", "Items")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3));
         }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java b/src/main/java/gregtech/common/covers/CoverFluidLimiter.java
index e7d8288ccf..4669a3a442 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidLimiter.java
@@ -16,22 +16,22 @@ import com.google.common.io.ByteArrayDataInput;
 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.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+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;
 import io.netty.buffer.ByteBuf;
 
 /***
  * @author TrainerSnow#5086
  */
-public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLimiter.FluidLimiterData> {
+public class CoverFluidLimiter extends CoverBehaviorBase<CoverFluidLimiter.FluidLimiterData> {
 
-    public GT_Cover_FluidLimiter(ITexture coverTexture) {
+    public CoverFluidLimiter(ITexture coverTexture) {
         super(FluidLimiterData.class, coverTexture);
     }
 
@@ -40,7 +40,7 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi
         FluidLimiterData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aTileEntity instanceof IFluidHandler) {
             adjustThreshold(aCoverVariable, !aPlayer.isSneaking());
-            GT_Utility.sendChatToPlayer(aPlayer, String.format("Threshold: %f", aCoverVariable.threshold));
+            GTUtility.sendChatToPlayer(aPlayer, String.format("Threshold: %f", aCoverVariable.threshold));
         }
         return aCoverVariable;
     }
@@ -164,7 +164,7 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new FluidLimiterUIFactory(buildContext).createWindow();
     }
 
@@ -175,16 +175,16 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public FluidLimiterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public FluidLimiterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_FluidLimiter.this)
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverFluidLimiter.this)
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) Math.round(coverData.threshold * 100),
                         (coverData, val) -> {
                             coverData.threshold = val.floatValue() / 100;
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java
index 3805dfe2de..a41ed08320 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java
@@ -20,17 +20,17 @@ import com.gtnewhorizons.modularui.api.drawable.Text;
 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.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+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.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
 /**
@@ -49,7 +49,7 @@ import io.netty.buffer.ByteBuf;
  * speed is negative. This way, `0` means 1tick interval, while `-1` means 1 tick interval as well, preserving the
  * legacy behavior.
  */
-public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_FluidRegulator.FluidRegulatorData> {
+public class CoverFluidRegulator extends CoverBehaviorBase<CoverFluidRegulator.FluidRegulatorData> {
 
     private static final int SPEED_LENGTH = 20;
     private static final int TICK_RATE_LENGTH = Integer.SIZE - SPEED_LENGTH - 1;
@@ -60,7 +60,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
     public final int mTransferRate;
     private boolean allowFluid = false;
 
-    public GT_Cover_FluidRegulator(int aTransferRate, ITexture coverTexture) {
+    public CoverFluidRegulator(int aTransferRate, ITexture coverTexture) {
         super(FluidRegulatorData.class, coverTexture);
         if (aTransferRate > (-1 >>> (Integer.SIZE - SPEED_LENGTH)))
             throw new IllegalArgumentException("aTransferRate too big: " + aTransferRate);
@@ -107,7 +107,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
             }
             if (tTank1 != null && tTank2 != null) {
                 allowFluid = true;
-                GT_Utility
+                GTUtility
                     .moveFluid(tTank1, tTank2, directionFrom, Math.abs(aCoverVariable.speed), this::canTransferFluid);
                 allowFluid = false;
             }
@@ -121,20 +121,20 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
         int tTickRate = aCoverVariable.tickRate;
         if (Math.abs(tSpeed) > mTransferRate * tTickRate) {
             tSpeed = mTransferRate * tTickRate * (tSpeed > 0 ? 1 : -1);
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("316", "Pump speed limit reached!"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("316", "Pump speed limit reached!"));
         }
         if (tTickRate == 1) {
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
-                GT_Utility.trans("048", "Pump speed: ") + tSpeed
-                    + GT_Utility.trans("049", "L/tick ")
+                GTUtility.trans("048", "Pump speed: ") + tSpeed
+                    + GTUtility.trans("049", "L/tick ")
                     + tSpeed * 20
-                    + GT_Utility.trans("050", "L/sec"));
+                    + GTUtility.trans("050", "L/sec"));
         } else {
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 String.format(
-                    GT_Utility.trans("207", "Pump speed: %dL every %d ticks, %.2f L/sec on average"),
+                    GTUtility.trans("207", "Pump speed: %dL every %d ticks, %.2f L/sec on average"),
                     tSpeed,
                     tTickRate,
                     tSpeed * 20d / tTickRate));
@@ -144,7 +144,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
     @Override
     public FluidRegulatorData onCoverScrewdriverClickImpl(ForgeDirection side, int aCoverID,
         FluidRegulatorData 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) {
             adjustSpeed(aPlayer, aCoverVariable, aPlayer.isSneaking() ? 256 : 16);
         } else {
             adjustSpeed(aPlayer, aCoverVariable, aPlayer.isSneaking() ? -256 : -16);
@@ -224,7 +224,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new FluidRegulatorUIFactory(buildContext).createWindow();
     }
 
@@ -241,7 +241,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
             numberFormat.setMaximumFractionDigits(2);
         }
 
-        public FluidRegulatorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public FluidRegulatorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -251,59 +251,59 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
             AtomicBoolean warn = new AtomicBoolean(false);
 
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_FluidRegulator.this)
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverFluidRegulator.this)
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> coverData.speed >= 0,
                         (coverData, state) -> {
                             coverData.speed = Math.abs(coverData.speed);
                             return coverData;
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT)
-                            .addTooltip(GT_Utility.trans("006", "Export"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT)
+                            .addTooltip(GTUtility.trans("006", "Export"))
                             .setPos(spaceX * 0, spaceY * 0))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> coverData.speed <= 0,
                         (coverData, state) -> {
                             coverData.speed = -Math.abs(coverData.speed);
                             return coverData;
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT)
-                            .addTooltip(GT_Utility.trans("007", "Import"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT)
+                            .addTooltip(GTUtility.trans("007", "Import"))
                             .setPos(spaceX * 1, spaceY * 0))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> coverData.condition == Conditional.Always,
                         (coverData, state) -> {
                             coverData.condition = Conditional.Always;
                             return coverData;
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
-                            .addTooltip(GT_Utility.trans("224", "Always On"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK)
+                            .addTooltip(GTUtility.trans("224", "Always On"))
                             .setPos(spaceX * 0, spaceY * 1))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> coverData.condition == Conditional.Conditional,
                         (coverData, state) -> {
                             coverData.condition = Conditional.Conditional;
                             return coverData;
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
-                            .addTooltip(GT_Utility.trans("343", "Use Machine Processing State"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
+                            .addTooltip(GTUtility.trans("343", "Use Machine Processing State"))
                             .setPos(spaceX * 1, spaceY * 1))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> coverData.condition == Conditional.Inverted,
                         (coverData, state) -> {
                             coverData.condition = Conditional.Inverted;
                             return coverData;
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
-                            .addTooltip(GT_Utility.trans("343.1", "Use Inverted Machine Processing State"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
+                            .addTooltip(GTUtility.trans("343.1", "Use Inverted Machine Processing State"))
                             .setPos(spaceX * 2, spaceY * 1))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) coverData.speed,
                         (coverData, state) -> {
                             coverData.speed = state.intValue();
@@ -313,7 +313,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
                             .setValidator(val -> {
                                 final int tickRate = getCoverData() != null ? getCoverData().tickRate : 0;
                                 final long maxFlow = (long) mTransferRate
-                                    * GT_Utility.clamp(tickRate, TICK_RATE_MIN, TICK_RATE_MAX);
+                                    * GTUtility.clamp(tickRate, TICK_RATE_MIN, TICK_RATE_MAX);
                                 warn.set(false);
                                 if (val > maxFlow) {
                                     val = maxFlow;
@@ -329,7 +329,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
                             .setPos(spaceX * 0, spaceY * 2 + 2)
                             .setSize(spaceX * 4 - 3, 12))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) coverData.tickRate,
                         (coverData, state) -> {
                             coverData.tickRate = state.intValue();
@@ -355,26 +355,26 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
                             .setSize(spaceX * 2 - 3, 12))
                     .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 4, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 4, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("208", " L")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("208", " L")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 4, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("209", " ticks")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("209", " ticks")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 7, 4 + startY + spaceY * 2))
                 .widget(new TextWidget().setTextSupplier(() -> {
                     FluidRegulatorData coverVariable = getCoverData();
                     if (coverVariable == null) return new Text("");
                     return new Text(
-                        GT_Utility.trans("210.1", "Average:") + " "
+                        GTUtility.trans("210.1", "Average:") + " "
                             + numberFormat.format(
                                 coverVariable.tickRate == 0 ? 0 : coverVariable.speed * 20d / coverVariable.tickRate)
                             + " "
-                            + GT_Utility.trans("210.2", "L/sec"))
+                            + GTUtility.trans("210.2", "L/sec"))
                                 .color(warn.get() ? COLOR_TEXT_WARN.get() : COLOR_TEXT_GRAY.get());
                 })
                     .setPos(startX + spaceX * 0, 4 + startY + spaceY * 3));
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java b/src/main/java/gregtech/common/covers/CoverFluidStorageMonitor.java
index 7f9fda7cbc..bf829f1f1d 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidStorageMonitor.java
@@ -45,17 +45,17 @@ import gregtech.api.interfaces.ITextureBuilder;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalTankBase;
+import gregtech.common.tileentities.storage.MTEDigitalTankBase;
 import io.netty.buffer.ByteBuf;
 
 /**
  * TODO: Implement overlay rendering only with
- * {@link GT_CoverBehaviorBase#getSpecialCoverFGTextureImpl(ForgeDirection, int, ISerializableObject, ICoverable)}
+ * {@link CoverBehaviorBase#getSpecialCoverFGTextureImpl(ForgeDirection, int, ISerializableObject, ICoverable)}
  */
-public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_FluidStorageMonitor.FluidStorageData> {
+public class CoverFluidStorageMonitor extends CoverBehaviorBase<CoverFluidStorageMonitor.FluidStorageData> {
 
     private static final IIconContainer[] icons = new IIconContainer[] { OVERLAY_FLUID_STORAGE_MONITOR0,
         OVERLAY_FLUID_STORAGE_MONITOR1, OVERLAY_FLUID_STORAGE_MONITOR2, OVERLAY_FLUID_STORAGE_MONITOR3,
@@ -64,7 +64,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
         OVERLAY_FLUID_STORAGE_MONITOR10, OVERLAY_FLUID_STORAGE_MONITOR11, OVERLAY_FLUID_STORAGE_MONITOR12,
         OVERLAY_FLUID_STORAGE_MONITOR13, OVERLAY_FLUID_STORAGE_MONITOR14, };
 
-    public GT_Cover_FluidStorageMonitor() {
+    public CoverFluidStorageMonitor() {
         super(FluidStorageData.class);
     }
 
@@ -164,7 +164,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
         }
         IFluidHandler tankHandler = (IFluidHandler) aTileEntity;
 
-        final ItemStack heldItemSizedOne = GT_Utility.copyAmount(1, heldItem);
+        final ItemStack heldItemSizedOne = GTUtility.copyAmount(1, heldItem);
         if (heldItemSizedOne == null || heldItemSizedOne.stackSize <= 0) {
             return false;
         }
@@ -185,7 +185,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
 
     protected static ItemStack fillToTank(@Nonnull ItemStack container, @Nonnull IFluidHandler tank,
         ForgeDirection side) {
-        final FluidStack fluidToFill = GT_Utility.getFluidForFilledItem(container, true);
+        final FluidStack fluidToFill = GTUtility.getFluidForFilledItem(container, true);
         if (fluidToFill == null || fluidToFill.getFluid() == null || fluidToFill.amount <= 0) {
             return null;
         }
@@ -206,7 +206,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
                 return null;
             }
             tank.fill(side, fluidToFill, true);
-            return GT_Utility.getContainerForFilledItem(container, false);
+            return GTUtility.getContainerForFilledItem(container, false);
         }
     }
 
@@ -227,7 +227,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
                             side,
                             new FluidStack(tankInfo.fluid.getFluid(), containerItem.getCapacity(container)),
                             false))
-                    .filter(fs -> GT_Utility.areFluidsEqual(fs, tankInfo.fluid))
+                    .filter(fs -> GTUtility.areFluidsEqual(fs, tankInfo.fluid))
                     .map(fs -> fs.amount)
                     .orElse(0),
                 containerItem.fill(
@@ -241,16 +241,16 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
             tank.drain(side, new FluidStack(tankInfo.fluid.getFluid(), filled), true);
             return container;
         } else {
-            final ItemStack filledContainer = GT_Utility.fillFluidContainer(tankInfo.fluid, container, false, false);
+            final ItemStack filledContainer = GTUtility.fillFluidContainer(tankInfo.fluid, container, false, false);
             if (filledContainer == null) {
                 return null;
             }
-            final FluidStack filledFluid = GT_Utility.getFluidForFilledItem(filledContainer, false);
+            final FluidStack filledFluid = GTUtility.getFluidForFilledItem(filledContainer, false);
             if (filledFluid == null || filledFluid.getFluid() == null || filledFluid.amount <= 0) {
                 return null;
             }
             if (Optional.ofNullable(tank.drain(side, filledFluid, false))
-                .filter(fs -> GT_Utility.areFluidsEqual(fs, filledFluid))
+                .filter(fs -> GTUtility.areFluidsEqual(fs, filledFluid))
                 .map(fs -> fs.amount)
                 .orElse(0) != filledFluid.amount) {
                 return null;
@@ -263,7 +263,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
     protected static void replaceHeldItemStack(@Nonnull EntityPlayer player, @Nonnull ItemStack heldItem,
         @Nonnull ItemStack result) {
         heldItem.stackSize--;
-        GT_Utility.addItemToPlayerInventory(player, result);
+        GTUtility.addItemToPlayerInventory(player, result);
         player.inventoryContainer.detectAndSendChanges();
     }
 
@@ -274,7 +274,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
             aCoverVariable
                 .setSide(ForgeDirection.values()[(aCoverVariable.side.ordinal() + 1) % ForgeDirection.values().length])
                 .setSlot(0);
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("SIDE", "Side: ") + aCoverVariable.side.name());
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("SIDE", "Side: ") + aCoverVariable.side.name());
             return aCoverVariable;
         }
         final FluidTankInfo[] tanks = getValidFluidTankInfos(aTileEntity, aCoverVariable.side);
@@ -288,7 +288,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
             aCoverVariable
                 .setSlot((aCoverVariable.slot + tanks.length + (aPlayer.isSneaking() ? -1 : 1)) % tanks.length);
         }
-        GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + aCoverVariable.slot);
+        GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("053", "Slot: ") + aCoverVariable.slot);
         return aCoverVariable;
     }
 
@@ -332,7 +332,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
     protected static FluidTankInfo[] getValidFluidTankInfosForDisplay(@Nullable ICoverable tileEntity,
         @Nonnull ForgeDirection side) {
         if (tileEntity instanceof IGregTechTileEntity baseMetaTileEntity
-            && baseMetaTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalTankBase digitalTank) {
+            && baseMetaTileEntity.getMetaTileEntity() instanceof MTEDigitalTankBase digitalTank) {
             return digitalTank.getRealTankInfo(side);
         }
         return getValidFluidTankInfos(tileEntity, side);
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/CoverFluidfilter.java
index 44e264c8e8..630a7c9ddf 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidfilter.java
@@ -1,6 +1,6 @@
 package gregtech.common.covers;
 
-import static gregtech.api.enums.GT_Values.E;
+import static gregtech.api.enums.GTValues.E;
 
 import javax.annotation.Nonnull;
 
@@ -21,19 +21,19 @@ import com.gtnewhorizons.modularui.api.forge.ItemStackHandler;
 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.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_SlotWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerSlotWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfilter.FluidFilterData> {
+public class CoverFluidfilter extends CoverBehaviorBase<CoverFluidfilter.FluidFilterData> {
 
     // Uses the lower 3 bits of the cover variable, so we have 8 options to work with (0-7)
     private final int FILTER_INPUT_DENY_OUTPUT = 0; // 000
@@ -45,7 +45,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
     private final int ANY_INPUT_FILTER_OUTPUT = 6; // 110
     private final int ANY_INPUT_INVERT_OUTPUT = 7; // 111
 
-    public GT_Cover_Fluidfilter(ITexture coverTexture) {
+    public CoverFluidfilter(ITexture coverTexture) {
         super(FluidFilterData.class, coverTexture);
     }
 
@@ -84,14 +84,14 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
 
     public String getFilterMode(int aFilterMode) {
         return switch (aFilterMode) {
-            case FILTER_INPUT_DENY_OUTPUT -> GT_Utility.trans("043", "Filter input, Deny output");
-            case INVERT_INPUT_DENY_OUTPUT -> GT_Utility.trans("044", "Invert input, Deny output");
-            case FILTER_INPUT_ANY_OUTPUT -> GT_Utility.trans("045", "Filter input, Permit any output");
-            case INVERT_INPUT_ANY_OUTPUT -> GT_Utility.trans("046", "Invert input, Permit any output");
-            case DENY_INPUT_FILTER_OUTPUT -> GT_Utility.trans("307", "Deny input, Filter output");
-            case DENY_INPUT_INVERT_OUTPUT -> GT_Utility.trans("308", "Deny input, Invert output");
-            case ANY_INPUT_FILTER_OUTPUT -> GT_Utility.trans("309", "Permit any input, Filter output");
-            case ANY_INPUT_INVERT_OUTPUT -> GT_Utility.trans("310", "Permit any input, Invert output");
+            case FILTER_INPUT_DENY_OUTPUT -> GTUtility.trans("043", "Filter input, Deny output");
+            case INVERT_INPUT_DENY_OUTPUT -> GTUtility.trans("044", "Invert input, Deny output");
+            case FILTER_INPUT_ANY_OUTPUT -> GTUtility.trans("045", "Filter input, Permit any output");
+            case INVERT_INPUT_ANY_OUTPUT -> GTUtility.trans("046", "Invert input, Permit any output");
+            case DENY_INPUT_FILTER_OUTPUT -> GTUtility.trans("307", "Deny input, Filter output");
+            case DENY_INPUT_INVERT_OUTPUT -> GTUtility.trans("308", "Deny input, Invert output");
+            case ANY_INPUT_FILTER_OUTPUT -> GTUtility.trans("309", "Permit any input, Filter output");
+            case ANY_INPUT_INVERT_OUTPUT -> GTUtility.trans("310", "Permit any input, Invert output");
             default -> ("UNKNOWN");
         };
     }
@@ -104,7 +104,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
             aCoverVariable.mFilterMode = 7;
         }
 
-        GT_Utility.sendChatToPlayer(aPlayer, getFilterMode(aCoverVariable.mFilterMode));
+        GTUtility.sendChatToPlayer(aPlayer, getFilterMode(aCoverVariable.mFilterMode));
 
         return aCoverVariable;
     }
@@ -119,14 +119,14 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
             final ItemStack tStack = aPlayer.inventory.getCurrentItem();
             if (tStack == null) return true;
 
-            final FluidStack tFluid = GT_Utility.getFluidForFilledItem(tStack, true);
+            final FluidStack tFluid = GTUtility.getFluidForFilledItem(tStack, true);
             if (tFluid != null) {
                 final int aFluid = tFluid.getFluidID();
                 aCoverVariable.mFluidID = aFluid;
                 aTileEntity.setCoverDataAtSide(side, aCoverVariable);
                 final FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aFluid), 1000);
-                GT_Utility
-                    .sendChatToPlayer(aPlayer, GT_Utility.trans("047", "Filter Fluid: ") + sFluid.getLocalizedName());
+                GTUtility
+                    .sendChatToPlayer(aPlayer, GTUtility.trans("047", "Filter Fluid: ") + sFluid.getLocalizedName());
             }
             return true;
         }
@@ -219,7 +219,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new FluidFilterUIFactory(buildContext).createWindow();
     }
 
@@ -230,7 +230,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public FluidFilterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public FluidFilterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -241,85 +241,82 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
                 new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                     this::getCoverData,
                     this::setCoverData,
-                    GT_Cover_Fluidfilter.this,
+                    CoverFluidfilter.this,
                     (id, coverData) -> !getClickable(id, coverData),
                     (id, coverData) -> {
                         coverData.mFilterMode = getNewFilterMode(id, coverData);
                         return coverData;
                     }).addToggleButton(
                         0,
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT)
-                            .addTooltip(GT_Utility.trans("232", "Filter Input"))
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT)
+                            .addTooltip(GTUtility.trans("232", "Filter Input"))
                             .setPos(spaceX * 0, spaceY * 0))
                         .addToggleButton(
                             1,
-                            CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                            widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT)
-                                .addTooltip(GT_Utility.trans("233", "Filter Output"))
+                            CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                            widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT)
+                                .addTooltip(GTUtility.trans("233", "Filter Output"))
                                 .setPos(spaceX * 1, spaceY * 0))
                         .addToggleButton(
                             2,
-                            CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                            widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT)
-                                .addTooltip(GT_Utility.trans("234", "Block Output"))
+                            CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                            widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_BLOCK_INPUT)
+                                .addTooltip(GTUtility.trans("234", "Block Output"))
                                 .setPos(spaceX * 0, spaceY * 2))
                         .addToggleButton(
                             3,
-                            CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                            widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT)
-                                .addTooltip(GT_Utility.trans("235", "Allow Output"))
+                            CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                            widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_ALLOW_INPUT)
+                                .addTooltip(GTUtility.trans("235", "Allow Output"))
                                 .setPos(spaceX * 1, spaceY * 2))
                         .addToggleButton(
                             4,
-                            CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                            widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_WHITELIST)
-                                .addTooltip(GT_Utility.trans("236", "Whitelist Fluid"))
+                            CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                            widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_WHITELIST)
+                                .addTooltip(GTUtility.trans("236", "Whitelist Fluid"))
                                 .setPos(spaceX * 0, spaceY * 1))
                         .addToggleButton(
                             5,
-                            CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                            widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLACKLIST)
-                                .addTooltip(GT_Utility.trans("237", "Blacklist Fluid"))
+                            CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                            widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_BLACKLIST)
+                                .addTooltip(GTUtility.trans("237", "Blacklist Fluid"))
                                 .setPos(spaceX * 1, spaceY * 1))
-                        .addFollower(
-                            new CoverDataFollower_SlotWidget<FluidFilterData>(new ItemStackHandler(), 0, true) {
-
-                                @Override
-                                protected void putClickedStack(ItemStack stack, int mouseButton) {
-                                    if (stack != null && GT_Utility.getFluidFromContainerOrFluidDisplay(stack) == null)
-                                        return;
-                                    super.putClickedStack(
-                                        GT_Utility.getFluidDisplayStack(
-                                            GT_Utility.getFluidFromContainerOrFluidDisplay(stack),
-                                            false),
-                                        mouseButton);
+                        .addFollower(new CoverDataFollowerSlotWidget<FluidFilterData>(new ItemStackHandler(), 0, true) {
+
+                            @Override
+                            protected void putClickedStack(ItemStack stack, int mouseButton) {
+                                if (stack != null && GTUtility.getFluidFromContainerOrFluidDisplay(stack) == null)
+                                    return;
+                                super.putClickedStack(
+                                    GTUtility.getFluidDisplayStack(
+                                        GTUtility.getFluidFromContainerOrFluidDisplay(stack),
+                                        false),
+                                    mouseButton);
+                            }
+                        }, this::getFluidDisplayItem, (coverData, stack) -> {
+                            if (stack == null) {
+                                coverData.mFluidID = -1;
+                            } else {
+                                FluidStack fluid = GTUtility.getFluidFromDisplayStack(stack);
+                                if (fluid != null && fluid.getFluid() != null) {
+                                    coverData.mFluidID = fluid.getFluid()
+                                        .getID();
                                 }
-                            },
-                            this::getFluidDisplayItem,
-                            (coverData, stack) -> {
-                                if (stack == null) {
-                                    coverData.mFluidID = -1;
-                                } else {
-                                    FluidStack fluid = GT_Utility.getFluidFromDisplayStack(stack);
-                                    if (fluid != null && fluid.getFluid() != null) {
-                                        coverData.mFluidID = fluid.getFluid()
-                                            .getID();
-                                    }
-                                }
-                                return coverData;
-                            },
+                            }
+                            return coverData;
+                        },
                             widget -> widget.setBackground(ModularUITextures.FLUID_SLOT)
                                 .setPos(0, spaceY * 3 + 2))
                         .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("238", "Filter Direction")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("238", "Filter Direction")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 2, 3 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("239", "Filter Type")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("239", "Filter Type")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 2, 3 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("240", "Block Flow")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("240", "Block Flow")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 2, 3 + startY + spaceY * 2))
                 .widget(TextWidget.dynamicString(() -> {
                     if (getCoverData() != null) {
@@ -328,7 +325,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
                             return fluidDisplay.getDisplayName();
                         }
                     }
-                    return GT_Utility.trans("315", "Filter Empty");
+                    return GTUtility.trans("315", "Filter Empty");
                 })
                     .setSynced(false)
                     .setDefaultColor(COLOR_TITLE.get())
@@ -358,7 +355,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
 
         private ItemStack getFluidDisplayItem(FluidFilterData coverData) {
             Fluid fluid = FluidRegistry.getFluid(coverData.mFluidID);
-            return GT_Utility.getFluidDisplayStack(fluid);
+            return GTUtility.getFluidDisplayStack(fluid);
         }
     }
 
diff --git a/src/main/java/gregtech/common/covers/CoverInfo.java b/src/main/java/gregtech/common/covers/CoverInfo.java
index 48f6dd9748..0a3ef3a07b 100644
--- a/src/main/java/gregtech/common/covers/CoverInfo.java
+++ b/src/main/java/gregtech/common/covers/CoverInfo.java
@@ -15,12 +15,12 @@ import org.jetbrains.annotations.NotNull;
 
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.GregTechAPI;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 
 public final class CoverInfo {
@@ -33,7 +33,7 @@ public final class CoverInfo {
     public static final CoverInfo EMPTY_INFO = new CoverInfo(ForgeDirection.UNKNOWN, null);
     private final ForgeDirection coverSide;
     private int coverID = 0;
-    private GT_CoverBehaviorBase<?> coverBehavior;
+    private CoverBehaviorBase<?> coverBehavior;
     private ISerializableObject coverData;
     private final WeakReference<ICoverable> coveredTile;
     private boolean needsUpdate = false;
@@ -43,13 +43,13 @@ public final class CoverInfo {
     public CoverInfo(ForgeDirection side, ICoverable aTile) {
         coverSide = side;
         coveredTile = new WeakReference<>(aTile);
-        coverBehavior = GregTech_API.sNoBehavior;
+        coverBehavior = GregTechAPI.sNoBehavior;
     }
 
     public CoverInfo(ForgeDirection side, int aID, ICoverable aTile, ISerializableObject aCoverData) {
         coverSide = side;
         coverID = aID;
-        coverBehavior = GregTech_API.getCoverBehaviorNew(aID);
+        coverBehavior = GregTechAPI.getCoverBehaviorNew(aID);
         coverData = aCoverData == null ? coverBehavior.createDataObject() : aCoverData;
         coveredTile = new WeakReference<>(aTile);
     }
@@ -57,7 +57,7 @@ public final class CoverInfo {
     public CoverInfo(ICoverable aTile, NBTTagCompound aNBT) {
         coverSide = ForgeDirection.getOrientation(aNBT.getByte(NBT_SIDE));
         coverID = aNBT.getInteger(NBT_ID);
-        coverBehavior = GregTech_API.getCoverBehaviorNew(coverID);
+        coverBehavior = GregTechAPI.getCoverBehaviorNew(coverID);
         coverData = aNBT.hasKey(NBT_DATA) ? coverBehavior.createDataObject(aNBT.getTag(NBT_DATA))
             : coverBehavior.createDataObject();
         coveredTile = new WeakReference<>(aTile);
@@ -89,13 +89,13 @@ public final class CoverInfo {
         needsUpdate = aUpdate;
     }
 
-    public GT_CoverBehaviorBase<?> getCoverBehavior() {
+    public CoverBehaviorBase<?> getCoverBehavior() {
         return coverBehavior;
     }
 
     public ISerializableObject getCoverData() {
         if (coverData != null) return coverData;
-        return GregTech_API.sNoBehavior.createDataObject();
+        return GregTechAPI.sNoBehavior.createDataObject();
     }
 
     public boolean onCoverRemoval(boolean aForced) {
@@ -160,7 +160,7 @@ public final class CoverInfo {
     }
 
     public void updateCoverBehavior() {
-        coverBehavior = GregTech_API.getCoverBehaviorNew(coverID);
+        coverBehavior = GregTechAPI.getCoverBehaviorNew(coverID);
     }
 
     public void preDataChanged(int aCoverID, ISerializableObject aCoverData) {
@@ -176,7 +176,7 @@ public final class CoverInfo {
     }
 
     public ModularWindow createWindow(EntityPlayer player) {
-        final GT_CoverUIBuildContext buildContext = new GT_CoverUIBuildContext(
+        final CoverUIBuildContext buildContext = new CoverUIBuildContext(
             player,
             coverID,
             coverSide,
@@ -246,7 +246,7 @@ public final class CoverInfo {
     public void onCoverJackhammer(EntityPlayer aPlayer) {
         adjustTickRateMultiplier(aPlayer.isSneaking());
 
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             StatCollector.translateToLocalFormatted("gt.cover.info.chat.tick_rate", getCurrentTickRateFormatted()));
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java b/src/main/java/gregtech/common/covers/CoverItemFilter.java
index 2274722c9a..acdbda795b 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
+++ b/src/main/java/gregtech/common/covers/CoverItemFilter.java
@@ -1,7 +1,7 @@
 package gregtech.common.covers;
 
-import static gregtech.api.util.GT_Utility.intToStack;
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTUtility.intToStack;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 
 import java.util.Collections;
 import java.util.List;
@@ -24,23 +24,23 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import cpw.mods.fml.common.network.ByteBufUtils;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_SlotWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerSlotWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilter.ItemFilterData> {
+public class CoverItemFilter extends CoverBehaviorBase<CoverItemFilter.ItemFilterData> {
 
     private final boolean mExport;
 
-    public GT_Cover_ItemFilter(boolean isExport, ITexture coverTexture) {
+    public CoverItemFilter(boolean isExport, ITexture coverTexture) {
         super(ItemFilterData.class, coverTexture);
         this.mExport = isExport;
     }
@@ -94,10 +94,10 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
         final ItemStack tStack = aPlayer.inventory.getCurrentItem();
         if (tStack != null) {
             aCoverVariable.mFilter = tStack;
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("299", "Item Filter: ") + tStack.getDisplayName());
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("299", "Item Filter: ") + tStack.getDisplayName());
         } else {
             aCoverVariable.mFilter = null;
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("300", "Filter Cleared!"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("300", "Filter Cleared!"));
         }
         return true;
     }
@@ -106,10 +106,10 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
     protected ItemFilterData onCoverScrewdriverClickImpl(ForgeDirection side, int aCoverID,
         ItemFilterData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         aCoverVariable.mWhitelist = !aCoverVariable.mWhitelist;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
-            aCoverVariable.mWhitelist ? GT_Utility.trans("125.1", "Whitelist Mode")
-                : GT_Utility.trans("124.1", "Blacklist Mode"));
+            aCoverVariable.mWhitelist ? GTUtility.trans("125.1", "Whitelist Mode")
+                : GTUtility.trans("124.1", "Blacklist Mode"));
         return aCoverVariable;
     }
 
@@ -181,7 +181,7 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ItemFilterUIFactory(buildContext).createWindow();
     }
 
@@ -192,7 +192,7 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public ItemFilterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ItemFilterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -204,9 +204,9 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
                 filterInvHandler.setStackInSlot(0, setStackSize1(getCoverData().mFilter));
             }
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_ItemFilter.this)
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverItemFilter.this)
                     .addFollower(
-                        new CoverDataFollower_ToggleButtonWidget<>(),
+                        new CoverDataFollowerToggleButtonWidget<>(),
                         coverData -> coverData.mWhitelist,
                         (coverData, state) -> {
                             coverData.mWhitelist = state;
@@ -214,26 +214,26 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
                         },
                         widget -> widget
                             .setToggleTexture(
-                                GT_UITextures.OVERLAY_BUTTON_BLACKLIST,
-                                GT_UITextures.OVERLAY_BUTTON_WHITELIST)
-                            .addTooltip(0, GT_Utility.trans("125.1", "Whitelist Mode"))
-                            .addTooltip(1, GT_Utility.trans("124.1", "Blacklist Mode"))
+                                GTUITextures.OVERLAY_BUTTON_BLACKLIST,
+                                GTUITextures.OVERLAY_BUTTON_WHITELIST)
+                            .addTooltip(0, GTUtility.trans("125.1", "Whitelist Mode"))
+                            .addTooltip(1, GTUtility.trans("124.1", "Blacklist Mode"))
                             .setPos(spaceX * 0, spaceY * 0))
                     .addFollower(
-                        new CoverDataFollower_SlotWidget<>(filterInvHandler, 0, true),
+                        new CoverDataFollowerSlotWidget<>(filterInvHandler, 0, true),
                         coverData -> setStackSize1(coverData.mFilter),
                         (coverData, stack) -> {
                             coverData.mFilter = setStackSize1(stack);
                             return coverData;
                         },
-                        widget -> widget.setBackground(GT_UITextures.SLOT_DARK_GRAY)
+                        widget -> widget.setBackground(GTUITextures.SLOT_DARK_GRAY)
                             .setPos(spaceX * 0, spaceY * 2))
                     .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("317", "Filter: ")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("317", "Filter: ")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 0, 3 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("318", "Check Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("318", "Check Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 2, 3 + startY + spaceY * 0));
         }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/CoverItemMeter.java
index 46be8daddd..376a93682c 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
+++ b/src/main/java/gregtech/common/covers/CoverItemMeter.java
@@ -18,30 +18,30 @@ import com.gtnewhorizons.modularui.api.NumberFormatMUI;
 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.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+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.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import gregtech.common.gui.modularui.widget.ItemWatcherSlotWidget;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
+import gregtech.common.tileentities.machines.MTEHatchOutputBusME;
+import gregtech.common.tileentities.storage.MTEDigitalChestBase;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.ItemMeterData> {
+public class CoverItemMeter extends CoverBehaviorBase<CoverItemMeter.ItemMeterData> {
 
     // Legacy data format
     private static final int SLOT_MASK = 0x3FFFFFFF; // 0 = all, 1 = 0 ...
     private static final int CONVERTED_BIT = 0x80000000;
     private static final int INVERT_BIT = 0x40000000;
 
-    public GT_Cover_ItemMeter(ITexture coverTexture) {
+    public CoverItemMeter(ITexture coverTexture) {
         super(ItemMeterData.class, coverTexture);
     }
 
@@ -74,11 +74,11 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
         long max = 0;
         long used = 0;
         final IMetaTileEntity mte = ((IGregTechTileEntity) tileEntity).getMetaTileEntity();
-        if (mte instanceof GT_MetaTileEntity_DigitalChestBase dc) {
+        if (mte instanceof MTEDigitalChestBase dc) {
             max = dc.getMaxItemCount();
             used = dc.getProgresstime();
-        } else if (mte instanceof GT_MetaTileEntity_Hatch_OutputBus_ME) {
-            if (((GT_MetaTileEntity_Hatch_OutputBus_ME) mte).canAcceptItem()) {
+        } else if (mte instanceof MTEHatchOutputBusME) {
+            if (((MTEHatchOutputBusME) mte).canAcceptItem()) {
                 max = 64;
                 used = 0;
             }
@@ -94,7 +94,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
             }
         }
 
-        return GT_Utility.convertRatioToRedstone(used, max, threshold, inverted);
+        return GTUtility.convertRatioToRedstone(used, max, threshold, inverted);
     }
 
     @Override
@@ -117,18 +117,18 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
         if (aPlayer.isSneaking()) {
             if (aCoverVariable.inverted) {
                 aCoverVariable.inverted = false;
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("055", "Normal"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("055", "Normal"));
             } else {
                 aCoverVariable.inverted = true;
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("054", "Inverted"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("054", "Inverted"));
             }
         } else {
             aCoverVariable.slot++;
             if (aCoverVariable.slot > aTileEntity.getSizeInventory()) aCoverVariable.slot = -1;
 
-            if (aCoverVariable.slot == -1) GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + GT_Utility.trans("ALL", "All"));
-            else GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + aCoverVariable.slot);
+            if (aCoverVariable.slot == -1)
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("053", "Slot: ") + GTUtility.trans("ALL", "All"));
+            else GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("053", "Slot: ") + aCoverVariable.slot);
         }
 
         return aCoverVariable;
@@ -190,7 +190,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ItemMeterUIFactory(buildContext).createWindow();
     }
 
@@ -209,7 +209,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
             @Override
             public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) {
                 if (number < 0) {
-                    return toAppendTo.append(GT_Utility.trans("ALL", "All"));
+                    return toAppendTo.append(GTUtility.trans("ALL", "All"));
                 } else {
                     return super.format(number, toAppendTo, pos);
                 }
@@ -219,22 +219,22 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
         private int maxSlot;
         private int maxThreshold;
 
-        public ItemMeterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ItemMeterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
-            final String INVERTED = GT_Utility.trans("INVERTED", "Inverted");
-            final String NORMAL = GT_Utility.trans("NORMAL", "Normal");
+            final String INVERTED = GTUtility.trans("INVERTED", "Inverted");
+            final String NORMAL = GTUtility.trans("NORMAL", "Normal");
 
             setMaxSlot();
             setMaxThreshold();
 
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_ItemMeter.this)
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverItemMeter.this)
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                        CoverDataFollowerToggleButtonWidget.ofRedstone(),
                         coverData -> coverData.inverted,
                         (coverData, state) -> {
                             coverData.inverted = state;
@@ -244,7 +244,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
                             .addTooltip(1, INVERTED)
                             .setPos(0, 0))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) coverData.threshold,
                         (coverData, state) -> {
                             coverData.threshold = state.intValue();
@@ -256,7 +256,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
                             .setPos(0, 2 + spaceY)
                             .setSize(spaceX * 4 + 5, 12))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) coverData.slot,
                         (coverData, state) -> {
                             coverData.slot = state.intValue();
@@ -279,17 +279,17 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX, 4 + startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("254", "Detect slot #")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("254", "Detect slot #")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 4 + 9, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("221", "Item threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("221", "Item threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 4 + 9, 4 + startY + spaceY));
         }
 
         private void setMaxSlot() {
             final ICoverable tile = getUIBuildContext().getTile();
             if (!tile.isDead() && tile instanceof IGregTechTileEntity gtTile
-                && !(gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) {
+                && !(gtTile.getMetaTileEntity() instanceof MTEDigitalChestBase)) {
                 maxSlot = Math.min(tile.getSizeInventory() - 1, SLOT_MASK - 1);
             } else {
                 maxSlot = -1;
@@ -299,7 +299,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
         private void setMaxThreshold() {
             final ICoverable tile = getUIBuildContext().getTile();
             if (!tile.isDead() && tile instanceof IGregTechTileEntity gtTile
-                && gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase) {
+                && gtTile.getMetaTileEntity() instanceof MTEDigitalChestBase) {
                 maxThreshold = gtTile.getMaxItemCount();
             } else {
                 maxThreshold = maxSlot > 0 ? maxSlot * 64 : Integer.MAX_VALUE;
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Lens.java b/src/main/java/gregtech/common/covers/CoverLens.java
index 94794e5892..37c257ff4d 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Lens.java
+++ b/src/main/java/gregtech/common/covers/CoverLens.java
@@ -4,13 +4,13 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.CoverBehavior;
 
-public class GT_Cover_Lens extends GT_CoverBehavior {
+public class CoverLens extends CoverBehavior {
 
     private final byte mColor;
 
-    public GT_Cover_Lens(byte aColor, ITexture coverTexture) {
+    public CoverLens(byte aColor, ITexture coverTexture) {
         super(coverTexture);
         this.mColor = aColor;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java b/src/main/java/gregtech/common/covers/CoverLiquidMeter.java
index f7c8bb8cd3..2f13f25421 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
+++ b/src/main/java/gregtech/common/covers/CoverLiquidMeter.java
@@ -18,26 +18,26 @@ import com.google.common.io.ByteArrayDataInput;
 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.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+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.CoverDataFollower_ToggleButtonWidget;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalTankBase;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
+import gregtech.common.tileentities.storage.MTEDigitalTankBase;
 import io.netty.buffer.ByteBuf;
 
 /**
  * TODO: Implement overlay rendering only with
- * {@link GT_CoverBehaviorBase#getSpecialCoverFGTextureImpl(ForgeDirection, int, ISerializableObject, ICoverable)}
+ * {@link CoverBehaviorBase#getSpecialCoverFGTextureImpl(ForgeDirection, int, ISerializableObject, ICoverable)}
  */
-public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMeter.LiquidMeterData> {
+public class CoverLiquidMeter extends CoverBehaviorBase<CoverLiquidMeter.LiquidMeterData> {
 
-    public GT_Cover_LiquidMeter(ITexture coverTexture) {
+    public CoverLiquidMeter(ITexture coverTexture) {
         super(LiquidMeterData.class, coverTexture);
     }
 
@@ -65,10 +65,10 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
             if (tanks != null) {
                 for (FluidTankInfo tank : tanks) {
                     if (tank != null) {
-                        if (tileEntity instanceof BaseMetaTileEntity && ((BaseMetaTileEntity) tileEntity)
-                            .getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalTankBase) {
-                            max += ((GT_MetaTileEntity_DigitalTankBase) ((BaseMetaTileEntity) tileEntity)
-                                .getMetaTileEntity()).getRealCapacity();
+                        if (tileEntity instanceof BaseMetaTileEntity
+                            && ((BaseMetaTileEntity) tileEntity).getMetaTileEntity() instanceof MTEDigitalTankBase) {
+                            max += ((MTEDigitalTankBase) ((BaseMetaTileEntity) tileEntity).getMetaTileEntity())
+                                .getRealCapacity();
                         } else max += tank.capacity;
                         FluidStack tLiquid = tank.fluid;
                         if (tLiquid != null) {
@@ -78,7 +78,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
                 }
             }
 
-            return GT_Utility.convertRatioToRedstone(used, max, threshold, inverted);
+            return GTUtility.convertRatioToRedstone(used, max, threshold, inverted);
         } else {
             return 0;
         }
@@ -98,10 +98,10 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
         LiquidMeterData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aCoverVariable.inverted) {
             aCoverVariable.inverted = false;
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("055", "Normal"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("055", "Normal"));
         } else {
             aCoverVariable.inverted = true;
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("054", "Inverted"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("054", "Inverted"));
         }
         return aCoverVariable;
     }
@@ -162,7 +162,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new LiquidMeterUIFactory(buildContext).createWindow();
     }
 
@@ -174,22 +174,22 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
         private static final int spaceY = 18;
         private int maxCapacity;
 
-        public LiquidMeterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public LiquidMeterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
         @SuppressWarnings("PointlessArithmeticExpression")
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
-            final String INVERTED = GT_Utility.trans("INVERTED", "Inverted");
-            final String NORMAL = GT_Utility.trans("NORMAL", "Normal");
+            final String INVERTED = GTUtility.trans("INVERTED", "Inverted");
+            final String NORMAL = GTUtility.trans("NORMAL", "Normal");
 
             setMaxCapacity();
 
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_LiquidMeter.this)
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverLiquidMeter.this)
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                        CoverDataFollowerToggleButtonWidget.ofRedstone(),
                         coverData -> coverData.inverted,
                         (coverData, state) -> {
                             coverData.inverted = state;
@@ -199,7 +199,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
                             .addTooltip(1, INVERTED)
                             .setPos(spaceX * 0, spaceY * 0))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) coverData.threshold,
                         (coverData, state) -> {
                             coverData.threshold = state.intValue();
@@ -218,7 +218,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 5 - 10, startY + spaceY * 1 + 4));
         }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Metrics_Transmitter.java b/src/main/java/gregtech/common/covers/CoverMetricsTransmitter.java
index 6d3cf529d3..9715fd11f0 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Metrics_Transmitter.java
+++ b/src/main/java/gregtech/common/covers/CoverMetricsTransmitter.java
@@ -26,7 +26,7 @@ import gregtech.api.interfaces.metatileentity.IMetricsExporter;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.util.GT_CoverBehaviorBase;
+import gregtech.api.util.CoverBehaviorBase;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.events.MetricsCoverDataEvent;
 import gregtech.common.events.MetricsCoverSelfDestructEvent;
@@ -41,8 +41,7 @@ import io.netty.buffer.ByteBuf;
  * This cover will retrieve information, preferentially, using {@link IMetricsExporter#reportMetrics()}. Absent this
  * method, it will resort to {@link BaseMetaTileEntity#getInfoData()} instead.
  */
-public class GT_Cover_Metrics_Transmitter
-    extends GT_CoverBehaviorBase<GT_Cover_Metrics_Transmitter.MetricsTransmitterData> {
+public class CoverMetricsTransmitter extends CoverBehaviorBase<CoverMetricsTransmitter.MetricsTransmitterData> {
 
     @SuppressWarnings("SpellCheckingInspection")
     public static final String FREQUENCY_MSB_KEY = "gt.metricscover.freq_msb";
@@ -52,11 +51,11 @@ public class GT_Cover_Metrics_Transmitter
     public static final String CARD_STATE_KEY = "card_state";
 
     @SuppressWarnings("unused")
-    public GT_Cover_Metrics_Transmitter() {
+    public CoverMetricsTransmitter() {
         this(null);
     }
 
-    public GT_Cover_Metrics_Transmitter(ITexture coverTexture) {
+    public CoverMetricsTransmitter(ITexture coverTexture) {
         super(MetricsTransmitterData.class, coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java b/src/main/java/gregtech/common/covers/CoverNeedMaintainance.java
index cf51f9bdea..f137ce5844 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
+++ b/src/main/java/gregtech/common/covers/CoverNeedMaintainance.java
@@ -8,27 +8,27 @@ import net.minecraftforge.fluids.Fluid;
 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.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
+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_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
+public class CoverNeedMaintainance extends CoverBehavior {
 
-    public GT_Cover_NeedMaintainance(ITexture coverTexture) {
+    public CoverNeedMaintainance(ITexture coverTexture) {
         super(coverTexture);
     }
 
     public static boolean isRotor(ItemStack rotor) {
-        return (rotor != null && rotor.getItem() instanceof GT_MetaGenerated_Tool
+        return (rotor != null && rotor.getItem() instanceof MetaGeneratedTool
             && rotor.getItemDamage() >= 170
             && rotor.getItemDamage() <= 176);
     }
@@ -45,7 +45,7 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
         boolean needsRepair = false;
         if (aTileEntity instanceof IGregTechTileEntity tTileEntity) {
             final IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity();
-            if (mTileEntity instanceof GT_MetaTileEntity_MultiBlockBase multi) {
+            if (mTileEntity instanceof MTEMultiBlockBase multi) {
                 final int ideal = multi.getIdealStatus();
                 final int real = multi.getRepairStatus();
                 final ItemStack tRotor = multi.getRealInventory()[1];
@@ -54,8 +54,8 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
                     if (ideal - real > coverVar) needsRepair = true;
                 } else if (coverVar == 5 || coverVar == 6) {
                     if (isRotor(tRotor)) {
-                        long tMax = GT_MetaGenerated_Tool.getToolMaxDamage(tRotor);
-                        long tCur = GT_MetaGenerated_Tool.getToolDamage(tRotor);
+                        long tMax = MetaGeneratedTool.getToolMaxDamage(tRotor);
+                        long tCur = MetaGeneratedTool.getToolDamage(tRotor);
                         if (coverVar == 5) {
                             needsRepair = (tCur >= tMax * 8 / 10);
                         } else {
@@ -88,32 +88,31 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
             aCoverVariable = 13;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("056", "Emit if 1 Maintenance Needed"));
-            case 1 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("057", "Emit if 1 Maintenance Needed(inverted)"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("058", "Emit if 2 Maintenance Needed"));
-            case 3 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("059", "Emit if 2 Maintenance Needed(inverted)"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("060", "Emit if 3 Maintenance Needed"));
-            case 5 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("061", "Emit if 3 Maintenance Needed(inverted)"));
-            case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("062", "Emit if 4 Maintenance Needed"));
-            case 7 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("063", "Emit if 4 Maintenance Needed(inverted)"));
-            case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("064", "Emit if 5 Maintenance Needed"));
-            case 9 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("065", "Emit if 5 Maintenance Needed(inverted)"));
-            case 10 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod"));
-            case 11 -> GT_Utility.sendChatToPlayer(
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("056", "Emit if 1 Maintenance Needed"));
+            case 1 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("057", "Emit if 1 Maintenance Needed(inverted)"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("058", "Emit if 2 Maintenance Needed"));
+            case 3 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("059", "Emit if 2 Maintenance Needed(inverted)"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("060", "Emit if 3 Maintenance Needed"));
+            case 5 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("061", "Emit if 3 Maintenance Needed(inverted)"));
+            case 6 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("062", "Emit if 4 Maintenance Needed"));
+            case 7 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("063", "Emit if 4 Maintenance Needed(inverted)"));
+            case 8 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("064", "Emit if 5 Maintenance Needed"));
+            case 9 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("065", "Emit if 5 Maintenance Needed(inverted)"));
+            case 10 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("066", "Emit if rotor needs maintenance low accuracy mod"));
+            case 11 -> GTUtility.sendChatToPlayer(
                 aPlayer,
-                GT_Utility.trans("067", "Emit if rotor needs maintenance low accuracy mod(inverted)"));
-            case 12 -> GT_Utility.sendChatToPlayer(
+                GTUtility.trans("067", "Emit if rotor needs maintenance low accuracy mod(inverted)"));
+            case 12 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("068", "Emit if rotor needs maintenance high accuracy mod"));
+            case 13 -> GTUtility.sendChatToPlayer(
                 aPlayer,
-                GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod"));
-            case 13 -> GT_Utility.sendChatToPlayer(
-                aPlayer,
-                GT_Utility.trans("069", "Emit if rotor needs maintenance high accuracy mod(inverted)"));
+                GTUtility.trans("069", "Emit if rotor needs maintenance high accuracy mod(inverted)"));
         }
         return aCoverVariable;
     }
@@ -171,7 +170,7 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new NeedMaintainanceUIFactory(buildContext).createWindow();
     }
 
@@ -182,74 +181,74 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public NeedMaintainanceUIFactory(GT_CoverUIBuildContext buildContext) {
+        public NeedMaintainanceUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
         @SuppressWarnings("PointlessArithmeticExpression")
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
-            final String[] tooltipText = { GT_Utility.trans("056", "Emit if 1 Maintenance Needed"),
-                GT_Utility.trans("058", "Emit if 2 Maintenance Needed"),
-                GT_Utility.trans("060", "Emit if 3 Maintenance Needed"),
-                GT_Utility.trans("062", "Emit if 4 Maintenance Needed"),
-                GT_Utility.trans("064", "Emit if 5 Maintenance Needed"),
-                GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod"),
-                GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod"), };
+            final String[] tooltipText = { GTUtility.trans("056", "Emit if 1 Maintenance Needed"),
+                GTUtility.trans("058", "Emit if 2 Maintenance Needed"),
+                GTUtility.trans("060", "Emit if 3 Maintenance Needed"),
+                GTUtility.trans("062", "Emit if 4 Maintenance Needed"),
+                GTUtility.trans("064", "Emit if 5 Maintenance Needed"),
+                GTUtility.trans("066", "Emit if rotor needs maintenance low accuracy mod"),
+                GTUtility.trans("068", "Emit if rotor needs maintenance high accuracy mod"), };
 
-            final String[] buttonText = { GT_Utility.trans("247", "1 Issue"), GT_Utility.trans("248", "2 Issues"),
-                GT_Utility.trans("249", "3 Issues"), GT_Utility.trans("250", "4 Issues"),
-                GT_Utility.trans("251", "5 Issues"), GT_Utility.trans("252", "Rotor < 20%"),
-                GT_Utility.trans("253", "Rotor ≈ 0%"), GT_Utility.trans("INVERTED", "Inverted"),
-                GT_Utility.trans("NORMAL", "Normal"), };
+            final String[] buttonText = { GTUtility.trans("247", "1 Issue"), GTUtility.trans("248", "2 Issues"),
+                GTUtility.trans("249", "3 Issues"), GTUtility.trans("250", "4 Issues"),
+                GTUtility.trans("251", "5 Issues"), GTUtility.trans("252", "Rotor < 20%"),
+                GTUtility.trans("253", "Rotor ≈ 0%"), GTUtility.trans("INVERTED", "Inverted"),
+                GTUtility.trans("NORMAL", "Normal"), };
 
             builder
                 .widget(
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                         this::getCoverData,
                         this::setCoverData,
-                        GT_Cover_NeedMaintainance.this,
+                        CoverNeedMaintainance.this,
                         (index, coverData) -> isEnabled(index, convert(coverData)),
                         (index, coverData) -> new ISerializableObject.LegacyCoverData(
                             getNewCoverVariable(index, convert(coverData))))
                                 .addToggleButton(
                                     0,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[0])
                                         .setPos(spaceX * 0, spaceY * 0))
                                 .addToggleButton(
                                     1,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[1])
                                         .setPos(spaceX * 0, spaceY * 1))
                                 .addToggleButton(
                                     2,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[2])
                                         .setPos(spaceX * 0, spaceY * 2))
                                 .addToggleButton(
                                     3,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[3])
                                         .setPos(spaceX * 0, spaceY * 3))
                                 .addToggleButton(
                                     4,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[4])
                                         .setPos(spaceX * 4 + 4, spaceY * 0))
                                 .addToggleButton(
                                     5,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[5])
                                         .setPos(spaceX * 4 + 4, spaceY * 1))
                                 .addToggleButton(
                                     6,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[6])
                                         .setPos(spaceX * 4 + 4, spaceY * 2))
                                 .addToggleButton(
                                     7,
-                                    CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                                    CoverDataFollowerToggleButtonWidget.ofRedstone(),
                                     widget -> widget.setPos(spaceX * 4 + 4, spaceY * 3))
                                 .setPos(startX, startY))
                 .widget(
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/CoverPlayerDetector.java
index 600e167f2d..48fe9260bb 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
+++ b/src/main/java/gregtech/common/covers/CoverPlayerDetector.java
@@ -8,22 +8,22 @@ import net.minecraftforge.fluids.Fluid;
 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.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-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_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
+public class CoverPlayerDetector extends CoverBehavior {
 
     private String placer = "";
     private int range = 8;
 
-    public GT_Cover_PlayerDetector(ITexture coverTexture) {
+    public CoverPlayerDetector(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -86,9 +86,9 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
             aCoverVariable = 2;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("068.1", "Emit if any Player is close"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("069.1", "Emit if other Player is close"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("070", "Emit if you are close"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("068.1", "Emit if any Player is close"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("069.1", "Emit if other Player is close"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("070", "Emit if you are close"));
         }
         return aCoverVariable;
     }
@@ -146,7 +146,7 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new PlayerDetectorUIFactory(buildContext).createWindow();
     }
 
@@ -157,7 +157,7 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public PlayerDetectorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public PlayerDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -169,33 +169,33 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                         this::getCoverData,
                         this::setCoverData,
-                        GT_Cover_PlayerDetector.this,
+                        CoverPlayerDetector.this,
                         (index, coverData) -> index == convert(coverData),
                         (index, coverData) -> new ISerializableObject.LegacyCoverData(index))
                             .addToggleButton(
                                 0,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
-                                widget -> widget.addTooltip(GT_Utility.trans("068.1", "Emit if any Player is close"))
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
+                                widget -> widget.addTooltip(GTUtility.trans("068.1", "Emit if any Player is close"))
                                     .setPos(spaceX * 0, spaceY * 0))
                             .addToggleButton(
                                 1,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
-                                widget -> widget.addTooltip(GT_Utility.trans("069.1", "Emit if other Player is close"))
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
+                                widget -> widget.addTooltip(GTUtility.trans("069.1", "Emit if other Player is close"))
                                     .setPos(spaceX * 0, spaceY * 1))
                             .addToggleButton(
                                 2,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
-                                widget -> widget.addTooltip(GT_Utility.trans("070", "Emit if you are close"))
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
+                                widget -> widget.addTooltip(GTUtility.trans("070", "Emit if you are close"))
                                     .setPos(spaceX * 0, spaceY * 2))
                             .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("319", "Any player")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("319", "Any player")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("320", "Other players")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("320", "Other players")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("321", "Only owner")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("321", "Only owner")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, 4 + startY + spaceY * 2));
         }
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/CoverPump.java
index c4671f586e..99d39dccad 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
+++ b/src/main/java/gregtech/common/covers/CoverPump.java
@@ -11,22 +11,22 @@ 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.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-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_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_Pump extends GT_CoverBehavior {
+public class CoverPump extends CoverBehavior {
 
     public final int mTransferRate;
 
-    public GT_Cover_Pump(int aTransferRate, ITexture coverTexture) {
+    public CoverPump(int aTransferRate, ITexture coverTexture) {
         super(coverTexture);
         this.mTransferRate = aTransferRate;
     }
@@ -59,7 +59,7 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
         IFluidHandler source = export ? current : toAccess;
         IFluidHandler dest = export ? toAccess : current;
         ForgeDirection drainSide = export ? side : side.getOpposite();
-        GT_Utility.moveFluid(source, dest, drainSide, mTransferRate, this::canTransferFluid);
+        GTUtility.moveFluid(source, dest, drainSide, mTransferRate, this::canTransferFluid);
     }
 
     protected boolean canTransferFluid(FluidStack fluid) {
@@ -74,21 +74,18 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
             aCoverVariable = 11;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)"));
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)"));
-            case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input"));
-            case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output"));
-            case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)"));
-            case 9 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("015", "Import allow Output (conditional)"));
-            case 10 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("016", "Export allow Input (invert cond)"));
-            case 11 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("017", "Import allow Output (invert cond)"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("006", "Export"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("007", "Import"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("008", "Export (conditional)"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("009", "Import (conditional)"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("010", "Export (invert cond)"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("011", "Import (invert cond)"));
+            case 6 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("012", "Export allow Input"));
+            case 7 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("013", "Import allow Output"));
+            case 8 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("014", "Export allow Input (conditional)"));
+            case 9 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("015", "Import allow Output (conditional)"));
+            case 10 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("016", "Export allow Input (invert cond)"));
+            case 11 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("017", "Import allow Output (invert cond)"));
         }
         return aCoverVariable;
     }
@@ -165,7 +162,7 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new PumpUIFactory(buildContext).createWindow();
     }
 
@@ -176,10 +173,10 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        private CoverDataFollower_ToggleButtonWidget<ISerializableObject.LegacyCoverData> mBlockWidget = null;
-        private CoverDataFollower_ToggleButtonWidget<ISerializableObject.LegacyCoverData> mAllowWidget = null;
+        private CoverDataFollowerToggleButtonWidget<ISerializableObject.LegacyCoverData> mBlockWidget = null;
+        private CoverDataFollowerToggleButtonWidget<ISerializableObject.LegacyCoverData> mAllowWidget = null;
 
-        public PumpUIFactory(GT_CoverUIBuildContext buildContext) {
+        public PumpUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -190,86 +187,86 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
                 new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                     this::getCoverData,
                     this::setCoverData,
-                    GT_Cover_Pump.this,
+                    CoverPump.this,
                     (id, coverData) -> !getClickable(id, convert(coverData)),
                     (id, coverData) -> new ISerializableObject.LegacyCoverData(
                         getNewCoverVariable(id, convert(coverData))))
                             .addToggleButton(
                                 0,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT)
-                                    .addTooltip(GT_Utility.trans("006", "Export"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT)
+                                    .addTooltip(GTUtility.trans("006", "Export"))
                                     .setPos(spaceX * 0, spaceY * 0))
                             .addToggleButton(
                                 1,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT)
-                                    .addTooltip(GT_Utility.trans("007", "Import"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT)
+                                    .addTooltip(GTUtility.trans("007", "Import"))
                                     .setPos(spaceX * 1, spaceY * 0))
                             .addToggleButton(
                                 2,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
-                                    .addTooltip(GT_Utility.trans("224", "Always On"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK)
+                                    .addTooltip(GTUtility.trans("224", "Always On"))
                                     .setPos(spaceX * 0, spaceY * 1))
                             .addToggleButton(
                                 3,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
-                                    .addTooltip(GT_Utility.trans("343", "Use Machine Processing State"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
+                                    .addTooltip(GTUtility.trans("343", "Use Machine Processing State"))
                                     .setPos(spaceX * 1, spaceY * 1))
                             .addToggleButton(
                                 4,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
                                 widget -> widget
-                                    .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
-                                    .addTooltip(GT_Utility.trans("343.1", "Use Inverted Machine Processing State"))
+                                    .setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
+                                    .addTooltip(GTUtility.trans("343.1", "Use Inverted Machine Processing State"))
                                     .setPos(spaceX * 2, spaceY * 1))
-                            .addToggleButton(5, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> {
+                            .addToggleButton(5, CoverDataFollowerToggleButtonWidget.ofDisableable(), widget -> {
                                 mAllowWidget = widget;
                                 widget.setTextureGetter(i -> {
                                     ISerializableObject.LegacyCoverData coverData = getCoverData();
                                     return coverData == null || coverData.get() % 2 == 0
-                                        ? GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT
-                                        : GT_UITextures.OVERLAY_BUTTON_ALLOW_OUTPUT;
+                                        ? GTUITextures.OVERLAY_BUTTON_ALLOW_INPUT
+                                        : GTUITextures.OVERLAY_BUTTON_ALLOW_OUTPUT;
                                 })
                                     .dynamicTooltip(() -> {
                                         ISerializableObject.LegacyCoverData coverData = getCoverData();
                                         return Arrays.asList(
                                             coverData == null || coverData.get() % 2 == 0
-                                                ? GT_Utility.trans("314", "Allow Input")
-                                                : GT_Utility.trans("312", "Allow Output"));
+                                                ? GTUtility.trans("314", "Allow Input")
+                                                : GTUtility.trans("312", "Allow Output"));
                                     })
                                     .setPos(spaceX * 0, spaceY * 2);
                             })
-                            .addToggleButton(6, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> {
+                            .addToggleButton(6, CoverDataFollowerToggleButtonWidget.ofDisableable(), widget -> {
                                 mBlockWidget = widget;
                                 widget.setTextureGetter(i -> {
                                     ISerializableObject.LegacyCoverData coverData = getCoverData();
                                     return coverData == null || coverData.get() % 2 == 0
-                                        ? GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT
-                                        : GT_UITextures.OVERLAY_BUTTON_BLOCK_OUTPUT;
+                                        ? GTUITextures.OVERLAY_BUTTON_BLOCK_INPUT
+                                        : GTUITextures.OVERLAY_BUTTON_BLOCK_OUTPUT;
                                 })
                                     .dynamicTooltip(() -> {
                                         ISerializableObject.LegacyCoverData coverData = getCoverData();
                                         return Arrays.asList(
                                             coverData == null || coverData.get() % 2 == 0
-                                                ? GT_Utility.trans("313", "Block Input")
-                                                : GT_Utility.trans("311", "Block Output"));
+                                                ? GTUtility.trans("313", "Block Input")
+                                                : GTUtility.trans("311", "Block Output"));
                                     })
                                     .setPos(spaceX * 1, spaceY * 2);
                             })
                             .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 3, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 3, 4 + startY + spaceY * 1))
                 .widget(TextWidget.dynamicString(() -> {
                     ISerializableObject.LegacyCoverData coverData = getCoverData();
-                    return coverData == null || coverData.get() % 2 == 0 ? GT_Utility.trans("344", "Input Blocking")
-                        : GT_Utility.trans("344.1", "Output Blocking");
+                    return coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("344", "Input Blocking")
+                        : GTUtility.trans("344.1", "Output Blocking");
                 })
                     .setSynced(false)
                     .setDefaultColor(COLOR_TEXT_GRAY.get())
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java b/src/main/java/gregtech/common/covers/CoverRedstoneConductor.java
index edaec13a81..a85a20b703 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneConductor.java
@@ -6,13 +6,13 @@ import net.minecraftforge.fluids.Fluid;
 
 import gregtech.api.interfaces.ITexture;
 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;
 
 @SuppressWarnings("unused") // Legacy from GT4. TODO: Consider re-enable registration
-public class GT_Cover_RedstoneConductor extends GT_CoverBehavior {
+public class CoverRedstoneConductor extends CoverBehavior {
 
-    GT_Cover_RedstoneConductor(ITexture coverTexture) {
+    CoverRedstoneConductor(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -43,13 +43,13 @@ public class GT_Cover_RedstoneConductor extends GT_CoverBehavior {
             aCoverVariable = 6;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("071", "Conducts strongest Input"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("072", "Conducts from bottom Input"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("073", "Conducts from top Input"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("074", "Conducts from north Input"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("075", "Conducts from south Input"));
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("076", "Conducts from west Input"));
-            case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("077", "Conducts from east Input"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("071", "Conducts strongest Input"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("072", "Conducts from bottom Input"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("073", "Conducts from top Input"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("074", "Conducts from north Input"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("075", "Conducts from south Input"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("076", "Conducts from west Input"));
+            case 6 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("077", "Conducts from east Input"));
         }
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/CoverRedstoneReceiverExternal.java
index eabf90f4de..aeaacb3404 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneReceiverExternal.java
@@ -2,13 +2,13 @@ package gregtech.common.covers;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_Cover_RedstoneReceiverExternal extends GT_Cover_RedstoneWirelessBase {
+public class CoverRedstoneReceiverExternal extends CoverRedstoneWirelessBase {
 
-    public GT_Cover_RedstoneReceiverExternal(ITexture coverTexture) {
+    public CoverRedstoneReceiverExternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -23,8 +23,8 @@ public class GT_Cover_RedstoneReceiverExternal extends GT_Cover_RedstoneWireless
         ICoverable aTileEntity, long aTimer) {
         aTileEntity.setOutputRedstoneSignal(
             side,
-            GregTech_API.sWirelessRedstone.get(aCoverVariable) == null ? 0
-                : GregTech_API.sWirelessRedstone.get(aCoverVariable));
+            GregTechAPI.sWirelessRedstone.get(aCoverVariable) == null ? 0
+                : GregTechAPI.sWirelessRedstone.get(aCoverVariable));
         return aCoverVariable;
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/CoverRedstoneReceiverInternal.java
index 3edd7f7e43..0fc5802ba4 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneReceiverInternal.java
@@ -2,15 +2,15 @@ package gregtech.common.covers;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
 import gregtech.api.util.ISerializableObject;
 
-public class GT_Cover_RedstoneReceiverInternal extends GT_Cover_RedstoneWirelessBase {
+public class CoverRedstoneReceiverInternal extends CoverRedstoneWirelessBase {
 
-    public GT_Cover_RedstoneReceiverInternal(ITexture coverTexture) {
+    public CoverRedstoneReceiverInternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -35,8 +35,8 @@ public class GT_Cover_RedstoneReceiverInternal extends GT_Cover_RedstoneWireless
     @Override
     public byte getRedstoneInput(ForgeDirection side, byte aInputRedstone, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
-        return GregTech_API.sWirelessRedstone.get(aCoverVariable) == null ? 0
-            : GregTech_API.sWirelessRedstone.get(aCoverVariable);
+        return GregTechAPI.sWirelessRedstone.get(aCoverVariable) == null ? 0
+            : GregTechAPI.sWirelessRedstone.get(aCoverVariable);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java b/src/main/java/gregtech/common/covers/CoverRedstoneSignalizer.java
index 4eead134c8..0f3937044a 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneSignalizer.java
@@ -7,13 +7,13 @@ import net.minecraftforge.fluids.Fluid;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 
 @SuppressWarnings("unused") // TODO: Consider re-registering this
-public class GT_Cover_RedstoneSignalizer extends GT_CoverBehavior {
+public class CoverRedstoneSignalizer extends CoverBehavior {
 
-    GT_Cover_RedstoneSignalizer(ITexture coverTexture) {
+    CoverRedstoneSignalizer(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -28,13 +28,12 @@ public class GT_Cover_RedstoneSignalizer extends GT_CoverBehavior {
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         aCoverVariable = (aCoverVariable + 1) % 48;
         switch (aCoverVariable / 16) {
-            case 0 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("078", "Signal = ") + (aCoverVariable & 0xF));
-            case 1 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF));
-            case 2 -> GT_Utility.sendChatToPlayer(
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("078", "Signal = ") + (aCoverVariable & 0xF));
+            case 1 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF));
+            case 2 -> GTUtility.sendChatToPlayer(
                 aPlayer,
-                GT_Utility.trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF));
+                GTUtility.trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF));
         }
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java b/src/main/java/gregtech/common/covers/CoverRedstoneTransmitterExternal.java
index 1ee0a05837..130ba4c5d7 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneTransmitterExternal.java
@@ -3,15 +3,15 @@ package gregtech.common.covers;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.covers.IControlsWorkCover;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.util.ISerializableObject;
 
-public class GT_Cover_RedstoneTransmitterExternal extends GT_Cover_RedstoneWirelessBase {
+public class CoverRedstoneTransmitterExternal extends CoverRedstoneWirelessBase {
 
-    public GT_Cover_RedstoneTransmitterExternal(ITexture coverTexture) {
+    public CoverRedstoneTransmitterExternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -20,7 +20,7 @@ public class GT_Cover_RedstoneTransmitterExternal extends GT_Cover_RedstoneWirel
         ICoverable aTileEntity, long aTimer) {
         // TODO remove next line after 2.3.0
         if (!IControlsWorkCover.makeSureOnlyOne(side, aTileEntity)) return aCoverVariable;
-        GregTech_API.sWirelessRedstone.put(aCoverVariable, aInputRedstone);
+        GregTechAPI.sWirelessRedstone.put(aCoverVariable, aInputRedstone);
         return aCoverVariable;
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/CoverRedstoneTransmitterInternal.java
index a812a49990..10a63a6642 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneTransmitterInternal.java
@@ -2,13 +2,13 @@ package gregtech.common.covers;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirelessBase {
+public class CoverRedstoneTransmitterInternal extends CoverRedstoneWirelessBase {
 
-    public GT_Cover_RedstoneTransmitterInternal(ITexture coverTexture) {
+    public CoverRedstoneTransmitterInternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -21,7 +21,7 @@ public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirel
     @Override
     public int doCoverThings(ForgeDirection side, byte aInputRedstone, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity, long aTimer) {
-        GregTech_API.sWirelessRedstone.put(aCoverVariable, aTileEntity.getOutputRedstoneSignal(side));
+        GregTechAPI.sWirelessRedstone.put(aCoverVariable, aTileEntity.getOutputRedstoneSignal(side));
         return aCoverVariable;
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/CoverRedstoneWirelessBase.java
index 54d025898a..0ec962fc02 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneWirelessBase.java
@@ -7,32 +7,32 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.GregTechAPI;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 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.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
+public abstract class CoverRedstoneWirelessBase extends CoverBehavior {
 
     private static final int MAX_CHANNEL = 65535;
     private static final int PRIVATE_MASK = 0xFFFE0000;
     private static final int PUBLIC_MASK = 0x0000FFFF;
     private static final int CHECKBOX_MASK = 0x00010000;
 
-    public GT_Cover_RedstoneWirelessBase(ITexture coverTexture) {
+    public CoverRedstoneWirelessBase(ITexture coverTexture) {
         super(coverTexture);
     }
 
     @Override
     public boolean onCoverRemoval(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         boolean aForced) {
-        GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0);
+        GregTechAPI.sWirelessRedstone.put(aCoverVariable, (byte) 0);
         return true;
     }
 
@@ -41,11 +41,11 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
         ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX,
         float aY, float aZ) {
         if (((aX > 0.375D) && (aX < 0.625D)) || ((side.offsetX != 0) && ((aY > 0.375D) && (aY < 0.625D)))) {
-            GregTech_API.sWirelessRedstone.put(aCoverVariable.get(), (byte) 0);
+            GregTechAPI.sWirelessRedstone.put(aCoverVariable.get(), (byte) 0);
             aCoverVariable.set(
                 (aCoverVariable.get() & (PRIVATE_MASK | CHECKBOX_MASK))
-                    | (((Integer) GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem())).hashCode() & PUBLIC_MASK));
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("081", "Frequency: ") + aCoverVariable);
+                    | (((Integer) GTUtility.stackToInt(aPlayer.inventory.getCurrentItem())).hashCode() & PUBLIC_MASK));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("081", "Frequency: ") + aCoverVariable);
             return true;
         }
         return false;
@@ -56,17 +56,15 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
     public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (((aX > 0.375D) && (aX < 0.625D)) || ((side.offsetX != 0) && ((aY > 0.375D) && (aY < 0.625D)))) {
-            GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0);
+            GregTechAPI.sWirelessRedstone.put(aCoverVariable, (byte) 0);
 
-            int val = GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem())
-                * (1 + aPlayer.inventory.getCurrentItem()
-                    .getItemDamage());
+            int val = GTUtility.stackToInt(aPlayer.inventory.getCurrentItem()) * (1 + aPlayer.inventory.getCurrentItem()
+                .getItemDamage());
 
             aCoverVariable = (aCoverVariable & (PRIVATE_MASK | CHECKBOX_MASK)) | (val & PUBLIC_MASK);
 
             aTileEntity.setCoverDataAtSide(side, aCoverVariable);
-            GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK));
             return true;
         }
         return false;
@@ -83,8 +81,8 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (((aX > 0.375D) && (aX < 0.625D))
             || ((side.offsetX == 0) || (((aY > 0.375D) && (aY < 0.625D)) || ((((aZ <= 0.375D) || (aZ >= 0.625D))))))) {
-            GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0);
-            final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ);
+            GregTechAPI.sWirelessRedstone.put(aCoverVariable, (byte) 0);
+            final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ);
 
             final short tAdjustVal = switch ((byte) ((byte) (int) (tCoords[0] * 2.0F)
                 + 2 * (byte) (int) (tCoords[1] * 2.0F))) {
@@ -105,7 +103,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
                 aCoverVariable = (aCoverVariable & (PRIVATE_MASK | CHECKBOX_MASK)) | tPublicChannel;
             }
         }
-        GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK));
+        GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK));
         return aCoverVariable;
     }
 
@@ -145,7 +143,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
 
     @Override
     public String getDescription(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return GT_Utility.trans("081", "Frequency: ") + aCoverVariable;
+        return GTUtility.trans("081", "Frequency: ") + aCoverVariable;
     }
 
     @Override
@@ -161,7 +159,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new RedstoneWirelessBaseUIFactory(buildContext).createWindow();
     }
 
@@ -172,7 +170,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public RedstoneWirelessBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+        public RedstoneWirelessBaseUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -184,35 +182,31 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
         @SuppressWarnings("PointlessArithmeticExpression")
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
-            builder
+            builder.widget(
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverRedstoneWirelessBase.this)
+
+                    .addFollower(
+                        new CoverDataFollowerNumericWidget<>(),
+                        coverData -> (double) getFlagFrequency(convert(coverData)),
+                        (coverData, state) -> new ISerializableObject.LegacyCoverData(
+                            state.intValue() | getFlagCheckbox(convert(coverData))),
+                        widget -> widget.setBounds(0, MAX_CHANNEL)
+                            .setScrollValues(1, 1000, 10)
+                            .setFocusOnGuiOpen(true)
+                            .setPos(spaceX * 0, spaceY * 0 + 2)
+                            .setSize(spaceX * 4 - 3, 12))
+                    .addFollower(
+                        CoverDataFollowerToggleButtonWidget.ofCheck(),
+                        coverData -> getFlagCheckbox(convert(coverData)) > 0,
+                        (coverData, state) -> new ISerializableObject.LegacyCoverData(
+                            getFlagFrequency(convert(coverData)) | (state ? CHECKBOX_MASK : 0)),
+                        widget -> widget.setPos(spaceX * 0, spaceY * 2))
+                    .setPos(startX, startY))
                 .widget(
-                    new CoverDataControllerWidget<>(
-                        this::getCoverData,
-                        this::setCoverData,
-                        GT_Cover_RedstoneWirelessBase.this)
-
-                            .addFollower(
-                                new CoverDataFollower_NumericWidget<>(),
-                                coverData -> (double) getFlagFrequency(convert(coverData)),
-                                (coverData, state) -> new ISerializableObject.LegacyCoverData(
-                                    state.intValue() | getFlagCheckbox(convert(coverData))),
-                                widget -> widget.setBounds(0, MAX_CHANNEL)
-                                    .setScrollValues(1, 1000, 10)
-                                    .setFocusOnGuiOpen(true)
-                                    .setPos(spaceX * 0, spaceY * 0 + 2)
-                                    .setSize(spaceX * 4 - 3, 12))
-                            .addFollower(
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
-                                coverData -> getFlagCheckbox(convert(coverData)) > 0,
-                                (coverData, state) -> new ISerializableObject.LegacyCoverData(
-                                    getFlagFrequency(convert(coverData)) | (state ? CHECKBOX_MASK : 0)),
-                                widget -> widget.setPos(spaceX * 0, spaceY * 2))
-                            .setPos(startX, startY))
-                .widget(
-                    new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 4, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("602", "Use Private Frequency"))
+                    new TextWidget(GTUtility.trans("602", "Use Private Frequency"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, startY + spaceY * 2 + 4));
         }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Screen.java b/src/main/java/gregtech/common/covers/CoverScreen.java
index fab2b81b0b..09f45730d8 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Screen.java
+++ b/src/main/java/gregtech/common/covers/CoverScreen.java
@@ -6,11 +6,11 @@ import net.minecraftforge.fluids.Fluid;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.CoverBehavior;
 
-public class GT_Cover_Screen extends GT_CoverBehavior {
+public class CoverScreen extends CoverBehavior {
 
-    public GT_Cover_Screen(ITexture coverTexture) {
+    public CoverScreen(ITexture coverTexture) {
         super(coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/CoverShutter.java
index 40fad1c537..480062d430 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
+++ b/src/main/java/gregtech/common/covers/CoverShutter.java
@@ -7,20 +7,20 @@ import net.minecraftforge.fluids.Fluid;
 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.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
-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_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_Shutter extends GT_CoverBehavior {
+public class CoverShutter extends CoverBehavior {
 
-    public GT_Cover_Shutter(ITexture coverTexture) {
+    public CoverShutter(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -44,10 +44,10 @@ public class GT_Cover_Shutter extends GT_CoverBehavior {
             aCoverVariable = 3;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("082", "Open if work enabled"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("083", "Open if work disabled"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("084", "Only Output allowed"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("085", "Only Input allowed"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("082", "Open if work enabled"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("083", "Open if work disabled"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("084", "Only Output allowed"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("085", "Only Input allowed"));
         }
         if (aTileEntity instanceof BaseMetaPipeEntity) {
             ((BaseMetaPipeEntity) aTileEntity).reloadLocks();
@@ -133,7 +133,7 @@ public class GT_Cover_Shutter extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ShutterUIFactory(buildContext).createWindow();
     }
 
@@ -144,7 +144,7 @@ public class GT_Cover_Shutter extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public ShutterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ShutterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -156,40 +156,39 @@ public class GT_Cover_Shutter extends GT_CoverBehavior {
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                         this::getCoverData,
                         this::setCoverData,
-                        GT_Cover_Shutter.this,
+                        CoverShutter.this,
                         (index, coverData) -> index == convert(coverData),
                         (index, coverData) -> new ISerializableObject.LegacyCoverData(index))
                             .addToggleButton(
                                 0,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
                                 widget -> widget.setPos(spaceX * 0, spaceY * 0))
                             .addToggleButton(
                                 1,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
                                 widget -> widget.setPos(spaceX * 0, spaceY * 1))
                             .addToggleButton(
                                 2,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
                                 widget -> widget.setPos(spaceX * 0, spaceY * 2))
                             .addToggleButton(
                                 3,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
                                 widget -> widget.setPos(spaceX * 0, spaceY * 3))
                             .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("082", "Open if work enabled"))
+                    new TextWidget(GTUtility.trans("082", "Open if work enabled"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("083", "Open if work disabled"))
+                    new TextWidget(GTUtility.trans("083", "Open if work disabled"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("084", "Only Output allowed"))
-                        .setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("084", "Only Output allowed")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("085", "Only Input allowed")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("085", "Only Input allowed")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3));
         }
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/CoverSolarPanel.java
index 4b88a90194..f0b544633d 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java
+++ b/src/main/java/gregtech/common/covers/CoverSolarPanel.java
@@ -8,15 +8,15 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
 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;
 
-public class GT_Cover_SolarPanel extends GT_CoverBehavior {
+public class CoverSolarPanel extends CoverBehavior {
 
     private final int mVoltage;
 
-    public GT_Cover_SolarPanel(int aVoltage) {
+    public CoverSolarPanel(int aVoltage) {
         this.mVoltage = aVoltage;
     }
 
@@ -75,7 +75,7 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior {
         ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX,
         float aY, float aZ) {
         if (aPlayer.capabilities.isCreativeMode) {
-            GT_Utility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable.get() >> 2) + "% dirt");
+            GTUtility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable.get() >> 2) + "% dirt");
             aCoverVariable.set(aCoverVariable.get() & 0x3);
             return true;
         }
@@ -86,13 +86,13 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior {
                 .equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) {
                 aPlayer.inventory.mainInventory[i] = new ItemStack(Items.bucket);
                 if (aPlayer.inventoryContainer != null) aPlayer.inventoryContainer.detectAndSendChanges();
-                GT_Utility
+                GTUtility
                     .sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable.get() >> 2) + "% dirt");
                 aCoverVariable.set(aCoverVariable.get() & 0x3);
                 return true;
             }
         }
-        GT_Utility.sendChatToPlayer(aPlayer, "You need water bucket in inventory to clean the panel.");
+        GTUtility.sendChatToPlayer(aPlayer, "You need water bucket in inventory to clean the panel.");
         return false;
     }
 
@@ -101,7 +101,7 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior {
     public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aPlayer.capabilities.isCreativeMode) {
-            GT_Utility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt");
+            GTUtility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt");
             aTileEntity.setCoverDataAtSide(side, (aCoverVariable & 0x3));
             return true;
         }
@@ -112,12 +112,12 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior {
                 .equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) {
                 aPlayer.inventory.mainInventory[i] = new ItemStack(Items.bucket);
                 if (aPlayer.inventoryContainer != null) aPlayer.inventoryContainer.detectAndSendChanges();
-                GT_Utility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt");
+                GTUtility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt");
                 aTileEntity.setCoverDataAtSide(side, (aCoverVariable & 0x3));
                 return true;
             }
         }
-        GT_Utility.sendChatToPlayer(aPlayer, "You need water bucket in inventory to clean the panel.");
+        GTUtility.sendChatToPlayer(aPlayer, "You need water bucket in inventory to clean the panel.");
         return false;
     }
 
diff --git a/src/main/java/gregtech/common/covers/CoverSteamRegulator.java b/src/main/java/gregtech/common/covers/CoverSteamRegulator.java
new file mode 100644
index 0000000000..413e835ad2
--- /dev/null
+++ b/src/main/java/gregtech/common/covers/CoverSteamRegulator.java
@@ -0,0 +1,18 @@
+package gregtech.common.covers;
+
+import net.minecraftforge.fluids.FluidStack;
+
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.util.GTModHandler;
+
+public class CoverSteamRegulator extends CoverFluidRegulator {
+
+    public CoverSteamRegulator(int aTransferRate, ITexture coverTexture) {
+        super(aTransferRate, coverTexture);
+    }
+
+    @Override
+    protected boolean canTransferFluid(FluidStack fluid) {
+        return GTModHandler.isAnySteam(fluid) || GTModHandler.isSuperHeatedSteam(fluid);
+    }
+}
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java b/src/main/java/gregtech/common/covers/CoverSteamValve.java
index 5787a99c0b..329cf634a7 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java
+++ b/src/main/java/gregtech/common/covers/CoverSteamValve.java
@@ -5,11 +5,11 @@ import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTModHandler;
 
-public class GT_Cover_SteamValve extends GT_Cover_Pump {
+public class CoverSteamValve extends CoverPump {
 
-    public GT_Cover_SteamValve(int aTransferRate, ITexture coverTexture) {
+    public CoverSteamValve(int aTransferRate, ITexture coverTexture) {
         super(aTransferRate, coverTexture);
     }
 
@@ -21,6 +21,6 @@ public class GT_Cover_SteamValve extends GT_Cover_Pump {
 
     @Override
     protected boolean canTransferFluid(FluidStack fluid) {
-        return GT_ModHandler.isAnySteam(fluid) || GT_ModHandler.isSuperHeatedSteam(fluid);
+        return GTModHandler.isAnySteam(fluid) || GTModHandler.isSuperHeatedSteam(fluid);
     }
 }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java b/src/main/java/gregtech/common/covers/CoverVent.java
index e2be64b475..02907da4c2 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java
+++ b/src/main/java/gregtech/common/covers/CoverVent.java
@@ -13,16 +13,16 @@ import net.minecraftforge.fluids.IFluidHandler;
 
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 
-public class GT_Cover_Vent extends GT_CoverBehavior {
+public class CoverVent extends CoverBehavior {
 
     private final int mEfficiency;
     private final Fluid IC2_HOT_COOLANT = FluidRegistry.getFluid("ic2hotcoolant");
     private final Fluid IC2_COOLANT = FluidRegistry.getFluid("ic2coolant");
 
-    public GT_Cover_Vent(int aEfficiency) {
+    public CoverVent(int aEfficiency) {
         this.mEfficiency = aEfficiency;
     }
 
@@ -63,7 +63,7 @@ public class GT_Cover_Vent extends GT_CoverBehavior {
         final int offsetZ = aTileEntity.getOffsetZ(side, 1);
         final World world = aTileEntity.getWorld();
         if (aTileEntity.hasThingsToDo() && aCoverVariable != aTileEntity.getProgress()
-            && !GT_Utility.hasBlockHitBox(world, offsetX, offsetY, offsetZ)) {
+            && !GTUtility.hasBlockHitBox(world, offsetX, offsetY, offsetZ)) {
             aTileEntity.increaseProgress(this.mEfficiency);
         }
         return aTileEntity.getProgress();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java
deleted file mode 100644
index e67e8b05d1..0000000000
--- a/src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gregtech.common.covers;
-
-import net.minecraftforge.fluids.FluidStack;
-
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.util.GT_ModHandler;
-
-public class GT_Cover_SteamRegulator extends GT_Cover_FluidRegulator {
-
-    public GT_Cover_SteamRegulator(int aTransferRate, ITexture coverTexture) {
-        super(aTransferRate, coverTexture);
-    }
-
-    @Override
-    protected boolean canTransferFluid(FluidStack fluid) {
-        return GT_ModHandler.isAnySteam(fluid) || GT_ModHandler.isSuperHeatedSteam(fluid);
-    }
-}
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverBase.java
index afd0f67b37..68564e33e5 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverBase.java
@@ -13,19 +13,19 @@ import com.google.common.io.ByteArrayDataInput;
 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.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public abstract class GT_Cover_AdvancedRedstoneReceiverBase
-    extends GT_Cover_AdvancedWirelessRedstoneBase<GT_Cover_AdvancedRedstoneReceiverBase.ReceiverData> {
+public abstract class CoverAdvancedRedstoneReceiverBase
+    extends CoverAdvancedWirelessRedstoneBase<CoverAdvancedRedstoneReceiverBase.ReceiverData> {
 
-    public GT_Cover_AdvancedRedstoneReceiverBase(ITexture coverTexture) {
+    public CoverAdvancedRedstoneReceiverBase(ITexture coverTexture) {
         super(ReceiverData.class, coverTexture);
     }
 
@@ -42,13 +42,13 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
     // GUI stuff
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new AdvancedRedstoneReceiverBaseUIFactory(buildContext).createWindow();
     }
 
     private class AdvancedRedstoneReceiverBaseUIFactory extends AdvancedWirelessRedstoneBaseUIFactory {
 
-        public AdvancedRedstoneReceiverBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+        public AdvancedRedstoneReceiverBaseUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -71,7 +71,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
         protected void addUIWidgets(ModularWindow.Builder builder) {
             super.addUIWidgets(builder);
             builder.widget(
-                new TextWidget(GT_Utility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                new TextWidget(GTUtility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
                     .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2));
         }
 
@@ -80,53 +80,53 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
         protected void addUIForDataController(CoverDataControllerWidget<ReceiverData> controller) {
             super.addUIForDataController(controller);
             controller.addFollower(
-                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                CoverDataFollowerToggleButtonWidget.ofDisableable(),
                 coverData -> coverData.mode == GateMode.AND,
                 (coverData, state) -> {
                     coverData.mode = GateMode.AND;
                     return coverData;
                 },
-                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_AND)
-                    .addTooltip(GT_Utility.trans("331", "AND Gate"))
+                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_AND)
+                    .addTooltip(GTUtility.trans("331", "AND Gate"))
                     .setPos(spaceX * 0, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == GateMode.NAND,
                     (coverData, state) -> {
                         coverData.mode = GateMode.NAND;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NAND)
-                        .addTooltip(GT_Utility.trans("332", "NAND Gate"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_NAND)
+                        .addTooltip(GTUtility.trans("332", "NAND Gate"))
                         .setPos(spaceX * 1, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == GateMode.OR,
                     (coverData, state) -> {
                         coverData.mode = GateMode.OR;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_OR)
-                        .addTooltip(GT_Utility.trans("333", "OR Gate"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_OR)
+                        .addTooltip(GTUtility.trans("333", "OR Gate"))
                         .setPos(spaceX * 2, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == GateMode.NOR,
                     (coverData, state) -> {
                         coverData.mode = GateMode.NOR;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NOR)
-                        .addTooltip(GT_Utility.trans("334", "NOR Gate"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_NOR)
+                        .addTooltip(GTUtility.trans("334", "NOR Gate"))
                         .setPos(spaceX * 3, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == GateMode.SINGLE_SOURCE,
                     (coverData, state) -> {
                         coverData.mode = GateMode.SINGLE_SOURCE;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ANALOG)
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_ANALOG)
                         .addTooltips(
                             Arrays.asList(
                                 "ANALOG Mode",
@@ -144,7 +144,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
         SINGLE_SOURCE
     }
 
-    public static class ReceiverData extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData {
+    public static class ReceiverData extends CoverAdvancedWirelessRedstoneBase.WirelessData {
 
         private GateMode mode;
 
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverExternal.java
index a8a30de9b1..5473ab3fec 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverExternal.java
@@ -5,9 +5,9 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_Cover_AdvancedRedstoneReceiverExternal extends GT_Cover_AdvancedRedstoneReceiverBase {
+public class CoverAdvancedRedstoneReceiverExternal extends CoverAdvancedRedstoneReceiverBase {
 
-    public GT_Cover_AdvancedRedstoneReceiverExternal(ITexture coverTexture) {
+    public CoverAdvancedRedstoneReceiverExternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverInternal.java
index 5553cb7c9c..f22a81bdba 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverInternal.java
@@ -6,9 +6,9 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
 
-public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_AdvancedRedstoneReceiverBase {
+public class CoverAdvancedRedstoneReceiverInternal extends CoverAdvancedRedstoneReceiverBase {
 
-    public GT_Cover_AdvancedRedstoneReceiverInternal(ITexture coverTexture) {
+    public CoverAdvancedRedstoneReceiverInternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterBase.java
index 3417542bec..cfa5461305 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterBase.java
@@ -15,19 +15,19 @@ import com.google.common.io.ByteArrayDataInput;
 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.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData>
-    extends GT_Cover_AdvancedWirelessRedstoneBase<T> {
+public abstract class CoverAdvancedRedstoneTransmitterBase<T extends CoverAdvancedRedstoneTransmitterBase.TransmitterData>
+    extends CoverAdvancedWirelessRedstoneBase<T> {
 
-    public GT_Cover_AdvancedRedstoneTransmitterBase(Class<T> typeToken, ITexture coverTexture) {
+    public CoverAdvancedRedstoneTransmitterBase(Class<T> typeToken, ITexture coverTexture) {
         super(typeToken, coverTexture);
     }
 
@@ -53,9 +53,9 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
     protected T onCoverScrewdriverClickImpl(ForgeDirection side, int aCoverID, T aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         aCoverVariable.invert = !aCoverVariable.invert;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
-            aCoverVariable.invert ? GT_Utility.trans("054", "Inverted") : GT_Utility.trans("055", "Normal"));
+            aCoverVariable.invert ? GTUtility.trans("054", "Inverted") : GTUtility.trans("055", "Normal"));
 
         return aCoverVariable;
     }
@@ -69,7 +69,7 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
         }
     }
 
-    public static class TransmitterData extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData {
+    public static class TransmitterData extends CoverAdvancedWirelessRedstoneBase.WirelessData {
 
         protected boolean invert;
 
@@ -128,13 +128,13 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
     // GUI stuff
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new AdvancedRedstoneTransmitterBaseUIFactory(buildContext).createWindow();
     }
 
     protected class AdvancedRedstoneTransmitterBaseUIFactory extends AdvancedWirelessRedstoneBaseUIFactory {
 
-        public AdvancedRedstoneTransmitterBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+        public AdvancedRedstoneTransmitterBaseUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -159,8 +159,8 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
             builder.widget(TextWidget.dynamicString(() -> {
                 T coverData = getCoverData();
                 if (coverData != null) {
-                    return getCoverData().invert ? GT_Utility.trans("INVERTED", "Inverted")
-                        : GT_Utility.trans("NORMAL", "Normal");
+                    return getCoverData().invert ? GTUtility.trans("INVERTED", "Inverted")
+                        : GTUtility.trans("NORMAL", "Normal");
                 } else {
                     return "";
                 }
@@ -174,14 +174,14 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
         protected void addUIForDataController(CoverDataControllerWidget<T> controller) {
             super.addUIForDataController(controller);
             controller.addFollower(
-                CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                CoverDataFollowerToggleButtonWidget.ofRedstone(),
                 coverData -> coverData.invert,
                 (coverData, state) -> {
                     coverData.invert = state;
                     return coverData;
                 },
-                widget -> widget.addTooltip(0, GT_Utility.trans("NORMAL", "Normal"))
-                    .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted"))
+                widget -> widget.addTooltip(0, GTUtility.trans("NORMAL", "Normal"))
+                    .addTooltip(1, GTUtility.trans("INVERTED", "Inverted"))
                     .setPos(spaceX * 9, spaceY * getButtonRow()));
         }
     }
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterExternal.java
index 139ec64843..71003974c5 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterExternal.java
@@ -5,10 +5,10 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_Cover_AdvancedRedstoneTransmitterExternal
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> {
+public class CoverAdvancedRedstoneTransmitterExternal
+    extends CoverAdvancedRedstoneTransmitterBase<CoverAdvancedRedstoneTransmitterBase.TransmitterData> {
 
-    public GT_Cover_AdvancedRedstoneTransmitterExternal(ITexture coverTexture) {
+    public CoverAdvancedRedstoneTransmitterExternal(ITexture coverTexture) {
         super(TransmitterData.class, coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterInternal.java
index 01a46fcc86..ab368e0c5b 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterInternal.java
@@ -5,10 +5,10 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_Cover_AdvancedRedstoneTransmitterInternal
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> {
+public class CoverAdvancedRedstoneTransmitterInternal
+    extends CoverAdvancedRedstoneTransmitterBase<CoverAdvancedRedstoneTransmitterBase.TransmitterData> {
 
-    public GT_Cover_AdvancedRedstoneTransmitterInternal(ITexture coverTexture) {
+    public CoverAdvancedRedstoneTransmitterInternal(ITexture coverTexture) {
         super(TransmitterData.class, coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedWirelessRedstoneBase.java
index 6ee9e2480f..963678a24c 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedWirelessRedstoneBase.java
@@ -16,27 +16,27 @@ import com.google.common.io.ByteArrayDataInput;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.GregTechAPI;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+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.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData>
-    extends GT_CoverBehaviorBase<T> {
+public abstract class CoverAdvancedWirelessRedstoneBase<T extends CoverAdvancedWirelessRedstoneBase.WirelessData>
+    extends CoverBehaviorBase<T> {
 
-    public GT_Cover_AdvancedWirelessRedstoneBase(Class<T> typeToken, ITexture coverTexture) {
+    public CoverAdvancedWirelessRedstoneBase(Class<T> typeToken, ITexture coverTexture) {
         super(typeToken, coverTexture);
     }
 
-    public static Byte getSignalAt(UUID uuid, int frequency, GT_Cover_AdvancedRedstoneReceiverBase.GateMode mode) {
-        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
+    public static Byte getSignalAt(UUID uuid, int frequency, CoverAdvancedRedstoneReceiverBase.GateMode mode) {
+        Map<Integer, Map<Long, Byte>> frequencies = GregTechAPI.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
         if (frequencies == null) return 0;
 
         Map<Long, Byte> signals = frequencies.get(frequency);
@@ -83,7 +83,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
     }
 
     public static void removeSignalAt(UUID uuid, int frequency, long hash) {
-        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
+        Map<Integer, Map<Long, Byte>> frequencies = GregTechAPI.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
         if (frequencies == null) return;
         frequencies.computeIfPresent(frequency, (freq, longByteMap) -> {
             longByteMap.remove(hash);
@@ -92,7 +92,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
     }
 
     public static void setSignalAt(UUID uuid, int frequency, long hash, byte value) {
-        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone
+        Map<Integer, Map<Long, Byte>> frequencies = GregTechAPI.sAdvancedWirelessRedstone
             .computeIfAbsent(String.valueOf(uuid), k -> new ConcurrentHashMap<>());
         Map<Long, Byte> signals = frequencies.computeIfAbsent(frequency, k -> new ConcurrentHashMap<>());
         signals.put(hash, value);
@@ -143,7 +143,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
 
     @Override
     public String getDescriptionImpl(ForgeDirection side, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {
-        return GT_Utility.trans("081", "Frequency: ") + aCoverVariable.frequency
+        return GTUtility.trans("081", "Frequency: ") + aCoverVariable.frequency
             + ", Transmission: "
             + (aCoverVariable.uuid == null ? "Public" : "Private");
     }
@@ -232,7 +232,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
         protected static final int spaceX = 18;
         protected static final int spaceY = 18;
 
-        public AdvancedWirelessRedstoneBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+        public AdvancedWirelessRedstoneBaseUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -248,23 +248,23 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
             CoverDataControllerWidget<T> dataController = new CoverDataControllerWidget<>(
                 this::getCoverData,
                 this::setCoverData,
-                GT_Cover_AdvancedWirelessRedstoneBase.this);
+                CoverAdvancedWirelessRedstoneBase.this);
             dataController.setPos(startX, startY);
             addUIForDataController(dataController);
 
             builder.widget(dataController)
                 .widget(
-                    new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 5, 4 + startY + spaceY * getFrequencyRow()))
                 .widget(
-                    new TextWidget(GT_Utility.trans("602", "Use Private Frequency"))
+                    new TextWidget(GTUtility.trans("602", "Use Private Frequency"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * privateExtraColumn, 4 + startY + spaceY * getButtonRow()));
         }
 
         protected void addUIForDataController(CoverDataControllerWidget<T> controller) {
             controller.addFollower(
-                new CoverDataFollower_NumericWidget<>(),
+                new CoverDataFollowerNumericWidget<>(),
                 coverData -> (double) coverData.frequency,
                 (coverData, state) -> {
                     coverData.frequency = state.intValue();
@@ -275,7 +275,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
                     .setPos(1, 2 + spaceY * getFrequencyRow())
                     .setSize(spaceX * 5 - 4, 12))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                     coverData -> coverData.uuid != null,
                     (coverData, state) -> {
                         if (state) {
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessDoesWorkDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java
index 724f12b8f8..ed55280b7f 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessDoesWorkDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java
@@ -13,22 +13,21 @@ import com.google.common.io.ByteArrayDataInput;
 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.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.covers.redstone.GT_Cover_WirelessDoesWorkDetector.ActivityMode;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_WirelessDoesWorkDetector
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessDoesWorkDetector.ActivityTransmitterData> {
+public class CoverWirelessDoesWorkDetector
+    extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessDoesWorkDetector.ActivityTransmitterData> {
 
-    public GT_Cover_WirelessDoesWorkDetector(ITexture coverTexture) {
+    public CoverWirelessDoesWorkDetector(ITexture coverTexture) {
         super(ActivityTransmitterData.class, coverTexture);
     }
 
@@ -105,7 +104,7 @@ public class GT_Cover_WirelessDoesWorkDetector
         MACHINE_ENABLED,
     }
 
-    public static class ActivityTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData {
+    public static class ActivityTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData {
 
         private ActivityMode mode;
 
@@ -159,13 +158,13 @@ public class GT_Cover_WirelessDoesWorkDetector
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new WirelessActivityDetectorUIFactory(buildContext).createWindow();
     }
 
     private class WirelessActivityDetectorUIFactory extends AdvancedRedstoneTransmitterBaseUIFactory {
 
-        public WirelessActivityDetectorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public WirelessActivityDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -192,11 +191,11 @@ public class GT_Cover_WirelessDoesWorkDetector
                 ActivityMode mode = getCoverData().mode;
 
                 if (mode == ActivityMode.MACHINE_ENABLED) {
-                    return GT_Utility.trans("271", "Machine enabled");
+                    return GTUtility.trans("271", "Machine enabled");
                 } else if (mode == ActivityMode.MACHINE_IDLE) {
-                    return GT_Utility.trans("242", "Machine idle");
+                    return GTUtility.trans("242", "Machine idle");
                 } else {
-                    return GT_Utility.trans("241", "Recipe progress");
+                    return GTUtility.trans("241", "Recipe progress");
                 }
 
             })
@@ -210,34 +209,34 @@ public class GT_Cover_WirelessDoesWorkDetector
             super.addUIForDataController(controller);
 
             controller.addFollower(
-                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                CoverDataFollowerToggleButtonWidget.ofDisableable(),
                 coverData -> coverData.mode == ActivityMode.RECIPE_PROGRESS,
                 (coverData, state) -> {
                     coverData.mode = ActivityMode.RECIPE_PROGRESS;
                     return coverData;
                 },
-                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_PROGRESS)
-                    .addTooltip(GT_Utility.trans("241", "Recipe progress"))
+                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_PROGRESS)
+                    .addTooltip(GTUtility.trans("241", "Recipe progress"))
                     .setPos(spaceX * 0, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == ActivityMode.MACHINE_IDLE,
                     (coverData, state) -> {
                         coverData.mode = ActivityMode.MACHINE_IDLE;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
-                        .addTooltip(GT_Utility.trans("242", "Machine idle"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK)
+                        .addTooltip(GTUtility.trans("242", "Machine idle"))
                         .setPos(spaceX * 1, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == ActivityMode.MACHINE_ENABLED,
                     (coverData, state) -> {
                         coverData.mode = ActivityMode.MACHINE_ENABLED;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON)
-                        .addTooltip(GT_Utility.trans("271", "Machine enabled"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON)
+                        .addTooltip(GTUtility.trans("271", "Machine enabled"))
                         .setPos(spaceX * 2, spaceY * 2));
         }
     }
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessFluidDetector.java
index 9a9d419be6..cfea9b7b28 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessFluidDetector.java
@@ -16,20 +16,20 @@ import com.google.common.io.ByteArrayDataInput;
 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.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.covers.GT_Cover_LiquidMeter;
+import gregtech.common.covers.CoverLiquidMeter;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_WirelessFluidDetector
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessFluidDetector.FluidTransmitterData> {
+public class CoverWirelessFluidDetector
+    extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessFluidDetector.FluidTransmitterData> {
 
-    public GT_Cover_WirelessFluidDetector(ITexture coverTexture) {
+    public CoverWirelessFluidDetector(ITexture coverTexture) {
         super(FluidTransmitterData.class, coverTexture);
     }
 
@@ -46,7 +46,7 @@ public class GT_Cover_WirelessFluidDetector
     @Override
     public FluidTransmitterData doCoverThingsImpl(ForgeDirection side, byte aInputRedstone, int aCoverID,
         FluidTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
-        final byte signal = GT_Cover_LiquidMeter
+        final byte signal = CoverLiquidMeter
             .computeSignalBasedOnFluid(aTileEntity, aCoverVariable.invert, aCoverVariable.threshold);
         final long hash = hashCoverCoords(aTileEntity, side);
         setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal);
@@ -66,7 +66,7 @@ public class GT_Cover_WirelessFluidDetector
         return true;
     }
 
-    public static class FluidTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData {
+    public static class FluidTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData {
 
         /** The special value {@code 0} means threshold check is disabled. */
         private int threshold;
@@ -123,7 +123,7 @@ public class GT_Cover_WirelessFluidDetector
     // GUI stuff
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new WirelessFluidDetectorUIFactory(buildContext).createWindow();
     }
 
@@ -131,7 +131,7 @@ public class GT_Cover_WirelessFluidDetector
 
         private int maxCapacity;
 
-        public WirelessFluidDetectorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public WirelessFluidDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -150,7 +150,7 @@ public class GT_Cover_WirelessFluidDetector
             setMaxCapacity();
             super.addUIWidgets(builder);
             builder.widget(
-                new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                new TextWidget(GTUtility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
                     .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2));
         }
 
@@ -158,7 +158,7 @@ public class GT_Cover_WirelessFluidDetector
         protected void addUIForDataController(CoverDataControllerWidget<FluidTransmitterData> controller) {
             super.addUIForDataController(controller);
             controller.addFollower(
-                new CoverDataFollower_NumericWidget<>(),
+                new CoverDataFollowerNumericWidget<>(),
                 coverData -> (double) coverData.threshold,
                 (coverData, state) -> {
                     coverData.threshold = state.intValue();
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessItemDetector.java
index 3cc7f60984..19cefdabcf 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessItemDetector.java
@@ -17,23 +17,23 @@ import com.gtnewhorizons.modularui.api.NumberFormatMUI;
 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.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.covers.GT_Cover_ItemMeter;
+import gregtech.common.covers.CoverItemMeter;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
 import gregtech.common.gui.modularui.widget.ItemWatcherSlotWidget;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
+import gregtech.common.tileentities.storage.MTEDigitalChestBase;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_WirelessItemDetector
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessItemDetector.ItemTransmitterData> {
+public class CoverWirelessItemDetector
+    extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessItemDetector.ItemTransmitterData> {
 
-    public GT_Cover_WirelessItemDetector(ITexture coverTexture) {
+    public CoverWirelessItemDetector(ITexture coverTexture) {
         super(ItemTransmitterData.class, coverTexture);
     }
 
@@ -50,7 +50,7 @@ public class GT_Cover_WirelessItemDetector
     @Override
     public ItemTransmitterData doCoverThingsImpl(ForgeDirection side, byte aInputRedstone, int aCoverID,
         ItemTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
-        byte signal = GT_Cover_ItemMeter.computeSignalBasedOnItems(
+        byte signal = CoverItemMeter.computeSignalBasedOnItems(
             aTileEntity,
             aCoverVariable.invert,
             aCoverVariable.threshold,
@@ -74,7 +74,7 @@ public class GT_Cover_WirelessItemDetector
         return true;
     }
 
-    public static class ItemTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData {
+    public static class ItemTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData {
 
         /**
          * The special value {@code -1} means all slots.
@@ -143,7 +143,7 @@ public class GT_Cover_WirelessItemDetector
     // GUI stuff
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new WirelessItemDetectorUIFactory(buildContext).createWindow();
     }
 
@@ -159,14 +159,14 @@ public class GT_Cover_WirelessItemDetector
             @Override
             public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) {
                 if (number < 0) {
-                    return toAppendTo.append(GT_Utility.trans("ALL", "All"));
+                    return toAppendTo.append(GTUtility.trans("ALL", "All"));
                 } else {
                     return super.format(number, toAppendTo, pos);
                 }
             }
         };
 
-        public WirelessItemDetectorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public WirelessItemDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -189,10 +189,10 @@ public class GT_Cover_WirelessItemDetector
                 new ItemWatcherSlotWidget().setGetter(this::getTargetItem)
                     .setPos(startX + spaceX * 4 - 1, startY + spaceY * 3))
                 .widget(
-                    new TextWidget(GT_Utility.trans("221", "Item threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("221", "Item threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("254", "Detect Slot #")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("254", "Detect Slot #")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 5, 4 + startY + spaceY * 3));
         }
 
@@ -200,7 +200,7 @@ public class GT_Cover_WirelessItemDetector
         protected void addUIForDataController(CoverDataControllerWidget<ItemTransmitterData> controller) {
             super.addUIForDataController(controller);
             controller.addFollower(
-                new CoverDataFollower_NumericWidget<>(),
+                new CoverDataFollowerNumericWidget<>(),
                 coverData -> (double) coverData.threshold,
                 (coverData, state) -> {
                     coverData.threshold = state.intValue();
@@ -212,7 +212,7 @@ public class GT_Cover_WirelessItemDetector
                     .setPos(1, 2 + spaceY * 2)
                     .setSize(spaceX * 5 - 4, 12))
                 .addFollower(
-                    new CoverDataFollower_NumericWidget<>(),
+                    new CoverDataFollowerNumericWidget<>(),
                     coverData -> (double) coverData.slot,
                     (coverData, state) -> {
                         coverData.slot = state.intValue();
@@ -229,7 +229,7 @@ public class GT_Cover_WirelessItemDetector
         private void setMaxSlot() {
             final ICoverable tile = getUIBuildContext().getTile();
             if (!tile.isDead() && tile instanceof IGregTechTileEntity gtTile
-                && !(gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) {
+                && !(gtTile.getMetaTileEntity() instanceof MTEDigitalChestBase)) {
                 maxSlot = tile.getSizeInventory() - 1;
             } else {
                 maxSlot = -1;
@@ -239,7 +239,7 @@ public class GT_Cover_WirelessItemDetector
         private void setMaxThreshold() {
             final ICoverable tile = getUIBuildContext().getTile();
             if (!tile.isDead() && tile instanceof IGregTechTileEntity gtTile
-                && gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase) {
+                && gtTile.getMetaTileEntity() instanceof MTEDigitalChestBase) {
                 maxThreshold = gtTile.getMaxItemCount();
             } else {
                 maxThreshold = maxSlot > 0 ? maxSlot * 64 : Integer.MAX_VALUE;
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessMaintenanceDetector.java
index f6c76591df..f3d62f2c81 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessMaintenanceDetector.java
@@ -14,24 +14,24 @@ import com.google.common.io.ByteArrayDataInput;
 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.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.covers.GT_Cover_NeedMaintainance;
+import gregtech.common.covers.CoverNeedMaintainance;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_WirelessMaintenanceDetector
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessMaintenanceDetector.MaintenanceTransmitterData> {
+public class CoverWirelessMaintenanceDetector
+    extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessMaintenanceDetector.MaintenanceTransmitterData> {
 
-    public GT_Cover_WirelessMaintenanceDetector(ITexture coverTexture) {
+    public CoverWirelessMaintenanceDetector(ITexture coverTexture) {
         super(MaintenanceTransmitterData.class, coverTexture);
     }
 
@@ -51,7 +51,7 @@ public class GT_Cover_WirelessMaintenanceDetector
 
         if (tileEntity instanceof IGregTechTileEntity) {
             IMetaTileEntity metaTE = ((IGregTechTileEntity) tileEntity).getMetaTileEntity();
-            if (metaTE instanceof GT_MetaTileEntity_MultiBlockBase multiTE) {
+            if (metaTE instanceof MTEMultiBlockBase multiTE) {
                 int ideal = multiTE.getIdealStatus();
                 int real = multiTE.getRepairStatus();
 
@@ -61,9 +61,9 @@ public class GT_Cover_WirelessMaintenanceDetector
                         >= coverVariable.mode.ordinal();
                     case ROTOR_80, ROTOR_100 -> {
                         ItemStack rotor = multiTE.getRealInventory()[1];
-                        if (GT_Cover_NeedMaintainance.isRotor(rotor)) {
-                            long max = GT_MetaGenerated_Tool.getToolMaxDamage(rotor);
-                            long current = GT_MetaGenerated_Tool.getToolDamage(rotor);
+                        if (CoverNeedMaintainance.isRotor(rotor)) {
+                            long max = MetaGeneratedTool.getToolMaxDamage(rotor);
+                            long current = MetaGeneratedTool.getToolDamage(rotor);
 
                             if (coverVariable.mode == MaintenanceMode.ROTOR_80) {
                                 signal = current >= max * 8 / 10;
@@ -128,7 +128,7 @@ public class GT_Cover_WirelessMaintenanceDetector
         ROTOR_100
     }
 
-    public static class MaintenanceTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData {
+    public static class MaintenanceTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData {
 
         private MaintenanceMode mode;
 
@@ -187,13 +187,13 @@ public class GT_Cover_WirelessMaintenanceDetector
         ">= 4 Issues", ">= 5 Issues", "Rotor < 20%", "Rotor ≈ 0%" };
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new WirelessMaintenanceDetectorUIFactory(buildContext).createWindow();
     }
 
     private class WirelessMaintenanceDetectorUIFactory extends AdvancedRedstoneTransmitterBaseUIFactory {
 
-        public WirelessMaintenanceDetectorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public WirelessMaintenanceDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -228,13 +228,13 @@ public class GT_Cover_WirelessMaintenanceDetector
             for (int i = 0; i < 8; i++) {
                 final int index = i;
                 controller.addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == MaintenanceMode.values()[index],
                     (coverData, state) -> {
                         coverData.mode = MaintenanceMode.values()[index];
                         return coverData;
                     },
-                    widget -> widget.setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.TRANSPARENT)
+                    widget -> widget.setToggleTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK, GTUITextures.TRANSPARENT)
                         .setPos(spaceX * (index % 2 == 0 ? 0 : 6), spaceY * (2 + index / 2)));
             }
         }
diff --git a/src/main/java/gregtech/common/entities/GT_EntityFXPollution.java b/src/main/java/gregtech/common/entities/EntityFXPollution.java
index d5121a38ad..facd3d3364 100644
--- a/src/main/java/gregtech/common/entities/GT_EntityFXPollution.java
+++ b/src/main/java/gregtech/common/entities/EntityFXPollution.java
@@ -5,9 +5,9 @@ import java.util.Random;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.world.World;
 
-public class GT_EntityFXPollution extends EntityFX {
+public class EntityFXPollution extends EntityFX {
 
-    public GT_EntityFXPollution(World world, double x, double y, double z) {
+    public EntityFXPollution(World world, double x, double y, double z) {
         super(world, x, y, z, 0, 0, 0);
 
         this.particleRed = 0.25F;
diff --git a/src/main/java/gregtech/common/fluid/GT_Fluid.java b/src/main/java/gregtech/common/fluid/GTFluid.java
index 6ba8d7d23a..3969817ee9 100644
--- a/src/main/java/gregtech/common/fluid/GT_Fluid.java
+++ b/src/main/java/gregtech/common/fluid/GTFluid.java
@@ -11,16 +11,16 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.FluidState;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.fluid.IGT_Fluid;
-import gregtech.api.interfaces.fluid.IGT_RegisteredFluid;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.interfaces.fluid.IGTFluid;
+import gregtech.api.interfaces.fluid.IGTRegisteredFluid;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 
-public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, Runnable {
+public class GTFluid extends Fluid implements IGTFluid, IGTRegisteredFluid, Runnable {
 
     private final String localizedName;
     private final ResourceLocation stillIconResourceLocation;
@@ -31,11 +31,11 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
     private Fluid registeredFluid;
 
     /**
-     * Constructs this {@link IGT_Fluid} implementation from an {@link GT_FluidBuilder} instance
+     * Constructs this {@link IGTFluid} implementation from an {@link GTFluidBuilder} instance
      *
-     * @param builder The {@link GT_FluidBuilder} instance to construct this {@link IGT_Fluid} implementation
+     * @param builder The {@link GTFluidBuilder} instance to construct this {@link IGTFluid} implementation
      */
-    protected GT_Fluid(@Nonnull final GT_FluidBuilder builder) {
+    protected GTFluid(@Nonnull final GTFluidBuilder builder) {
         super(builder.fluidName);
         this.localizedName = builder.localizedName;
         this.stillIconResourceLocation = builder.stillIconResourceLocation;
@@ -49,7 +49,7 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
     }
 
     /**
-     * Adjusts this {@link Fluid}'s settings based on this {@link IGT_Fluid}'s state
+     * Adjusts this {@link Fluid}'s settings based on this {@link IGTFluid}'s state
      */
     protected void configureFromStateTemperature() {
         switch (fluidState) {
@@ -91,24 +91,24 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
             | Math.max(0, Math.min(255, colorRGBA[2]));
     }
 
-    // ----- IGT_Fluid interface implementations -----
+    // ----- IGTFluid interface implementations -----
 
-    public IGT_RegisteredFluid addFluid() {
-        if (FluidRegistry.registerFluid(GT_Fluid.this)) {
+    public IGTRegisteredFluid addFluid() {
+        if (FluidRegistry.registerFluid(GTFluid.this)) {
             // Registered as a new Fluid
             registeredFluid = this;
             // Adds a server-side localized-name
-            GT_LanguageManager.addStringLocalization(getUnlocalizedName(), localizedName);
+            GTLanguageManager.addStringLocalization(getUnlocalizedName(), localizedName);
         } else {
             // Fluid already registered, get it from the registry
-            registeredFluid = FluidRegistry.getFluid(GT_Fluid.this.fluidName);
+            registeredFluid = FluidRegistry.getFluid(GTFluid.this.fluidName);
             // Sets temperature of already registered fluids if they use the default (temperature = 300)
             if (registeredFluid.getTemperature() == new Fluid("test").getTemperature()) {
-                registeredFluid.setTemperature(GT_Fluid.this.temperature);
+                registeredFluid.setTemperature(GTFluid.this.temperature);
             }
         }
         // Schedules the fluid for the block icons loader run() tasks
-        GregTech_API.sGTBlockIconload.add(this);
+        GregTechAPI.sGTBlockIconload.add(this);
         return this;
     }
 
@@ -118,14 +118,14 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
      * @inheritDoc
      */
     @Override
-    public IGT_RegisteredFluid registerContainers(final ItemStack fullContainer, final ItemStack emptyContainer,
+    public IGTRegisteredFluid registerContainers(final ItemStack fullContainer, final ItemStack emptyContainer,
         final int containerSize) {
         if (fullContainer != null && emptyContainer != null) {
             final FluidStack fluidStack = new FluidStack(registeredFluid, containerSize);
             if (!FluidContainerRegistry.registerFluidContainer(fluidStack, fullContainer, emptyContainer)) {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(fullContainer)
-                    .itemOutputs(GT_Utility.getContainerItem(fullContainer, false))
+                    .itemOutputs(GTUtility.getContainerItem(fullContainer, false))
                     .fluidOutputs(fluidStack)
                     .duration(fluidStack.amount / 62)
                     .eut(1)
@@ -139,7 +139,7 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
      * @inheritDoc
      */
     @Override
-    public IGT_RegisteredFluid registerBContainers(final ItemStack fullContainer, final ItemStack emptyContainer) {
+    public IGTRegisteredFluid registerBContainers(final ItemStack fullContainer, final ItemStack emptyContainer) {
         return registerContainers(fullContainer, emptyContainer, 1000);
     }
 
@@ -147,7 +147,7 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
      * @inheritDoc
      */
     @Override
-    public IGT_RegisteredFluid registerPContainers(final ItemStack fullContainer, final ItemStack emptyContainer) {
+    public IGTRegisteredFluid registerPContainers(final ItemStack fullContainer, final ItemStack emptyContainer) {
         return registerContainers(fullContainer, emptyContainer, 250);
     }
 
@@ -155,7 +155,7 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
      * @inheritDoc
      */
     @Override
-    public IGT_RegisteredFluid configureMaterials(final Materials material) {
+    public IGTRegisteredFluid configureMaterials(final Materials material) {
         if (material != null) {
             switch (fluidState) {
                 case SLURRY -> material.mSolid = registeredFluid;
@@ -180,30 +180,30 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
     // ----- Runnable interface implementations -----
 
     /**
-     * This {@link Runnable#run()} implementation is scheduled within the {@link GregTech_API#sGTBlockIconload} to load
-     * this {@link IGT_Fluid}'s texture icons.
+     * This {@link Runnable#run()} implementation is scheduled within the {@link GregTechAPI#sGTBlockIconload} to load
+     * this {@link IGTFluid}'s texture icons.
      *
      * @see Runnable#run()
      */
     @Override
     public void run() {
-        if (iconsFrom instanceof GT_Fluid) {
-            // Needs the GT_Fluid to have registered its icons
-            ((GT_Fluid) iconsFrom).run();
+        if (iconsFrom instanceof GTFluid) {
+            // Needs the GTFluid to have registered its icons
+            ((GTFluid) iconsFrom).run();
             stillIcon = iconsFrom.getStillIcon();
             flowingIcon = iconsFrom.getFlowingIcon();
         } else {
             if (stillIconResourceLocation != null) {
-                stillIcon = GregTech_API.sBlockIcons.registerIcon(stillIconResourceLocation.toString());
+                stillIcon = GregTechAPI.sBlockIcons.registerIcon(stillIconResourceLocation.toString());
             }
             if (flowingIconResourceLocation != null) {
-                flowingIcon = GregTech_API.sBlockIcons.registerIcon(flowingIconResourceLocation.toString());
+                flowingIcon = GregTechAPI.sBlockIcons.registerIcon(flowingIconResourceLocation.toString());
             }
         }
     }
 
     @Override
     public String toString() {
-        return "GT_Fluid{" + "fluidName='" + fluidName + '\'' + '}';
+        return "GTFluid{" + "fluidName='" + fluidName + '\'' + '}';
     }
 }
diff --git a/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java b/src/main/java/gregtech/common/fluid/GTFluidBuilder.java
index 9a18b8d812..e1532f0dbf 100644
--- a/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java
+++ b/src/main/java/gregtech/common/fluid/GTFluidBuilder.java
@@ -13,11 +13,11 @@ import net.minecraftforge.fluids.Fluid;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.FluidState;
-import gregtech.api.interfaces.fluid.IGT_Fluid;
-import gregtech.api.interfaces.fluid.IGT_FluidBuilder;
-import gregtech.api.interfaces.fluid.IGT_RegisteredFluid;
+import gregtech.api.interfaces.fluid.IGTFluid;
+import gregtech.api.interfaces.fluid.IGTFluidBuilder;
+import gregtech.api.interfaces.fluid.IGTRegisteredFluid;
 
-public class GT_FluidBuilder implements IGT_FluidBuilder {
+public class GTFluidBuilder implements IGTFluidBuilder {
 
     final String fluidName;
     String localizedName;
@@ -30,7 +30,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
     IIcon flowingIcon;
     Fluid iconsFrom;
 
-    public GT_FluidBuilder(final String fluidName) {
+    public GTFluidBuilder(final String fluidName) {
         this.fluidName = fluidName.toLowerCase(Locale.ENGLISH);
     }
 
@@ -38,7 +38,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
      * @inheritDoc
      */
     @Override
-    public IGT_FluidBuilder withColorRGBA(final short[] colorRGBA) {
+    public IGTFluidBuilder withColorRGBA(final short[] colorRGBA) {
         this.colorRGBA = colorRGBA;
         return this;
     }
@@ -47,7 +47,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
      * @inheritDoc
      */
     @Override
-    public IGT_FluidBuilder withLocalizedName(final String localizedName) {
+    public IGTFluidBuilder withLocalizedName(final String localizedName) {
         this.localizedName = localizedName;
         return this;
     }
@@ -56,7 +56,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
      * @inheritDoc
      */
     @Override
-    public IGT_FluidBuilder withStateAndTemperature(final FluidState fluidState, final int temperature) {
+    public IGTFluidBuilder withStateAndTemperature(final FluidState fluidState, final int temperature) {
         this.fluidState = fluidState;
         this.temperature = temperature;
         return this;
@@ -66,7 +66,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
      * @inheritDoc
      */
     @Override
-    public IGT_FluidBuilder withStillIconResourceLocation(final ResourceLocation stillIconResourceLocation) {
+    public IGTFluidBuilder withStillIconResourceLocation(final ResourceLocation stillIconResourceLocation) {
         this.stillIconResourceLocation = stillIconResourceLocation;
         return this;
     }
@@ -75,7 +75,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
      * @inheritDoc
      */
     @Override
-    public IGT_FluidBuilder withFlowingIconResourceLocation(final ResourceLocation flowingIconResourceLocation) {
+    public IGTFluidBuilder withFlowingIconResourceLocation(final ResourceLocation flowingIconResourceLocation) {
         this.flowingIconResourceLocation = flowingIconResourceLocation;
         return this;
     }
@@ -84,7 +84,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
      * @inheritDoc
      */
     @Override
-    public IGT_FluidBuilder withTextureName(final String textureName) {
+    public IGTFluidBuilder withTextureName(final String textureName) {
         this.stillIconResourceLocation = new ResourceLocation(GregTech.ID, "fluids/fluid." + textureName);
         this.flowingIconResourceLocation = null;
         return this;
@@ -94,7 +94,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
      * @inheritDoc
      */
     @Override
-    public IGT_FluidBuilder withIconsFrom(@Nonnull final Fluid fromFluid) {
+    public IGTFluidBuilder withIconsFrom(@Nonnull final Fluid fromFluid) {
         this.iconsFrom = fromFluid;
         return this;
     }
@@ -103,7 +103,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
      * @inheritDoc
      */
     @Override
-    public IGT_FluidBuilder withFluidBlock(final Block fluidBlock) {
+    public IGTFluidBuilder withFluidBlock(final Block fluidBlock) {
         this.fluidBlock = fluidBlock;
         return this;
     }
@@ -112,7 +112,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
      * @inheritDoc
      */
     @Override
-    public IGT_FluidBuilder withTextures(final ResourceLocation stillIconResourceLocation,
+    public IGTFluidBuilder withTextures(final ResourceLocation stillIconResourceLocation,
         final ResourceLocation flowingIconResourceLocation) {
         this.stillIconResourceLocation = stillIconResourceLocation;
         this.flowingIconResourceLocation = flowingIconResourceLocation;
@@ -123,7 +123,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
      * @inheritDoc
      */
     @Override
-    public IGT_Fluid build() {
+    public IGTFluid build() {
         if (colorRGBA == null) {
             colorRGBA = Dyes._NULL.getRGBA();
         }
@@ -133,14 +133,14 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
         if (localizedName == null) {
             localizedName = fluidName;
         }
-        return new GT_Fluid(this);
+        return new GTFluid(this);
     }
 
     /**
      * @inheritDoc
      */
     @Override
-    public IGT_RegisteredFluid buildAndRegister() {
+    public IGTRegisteredFluid buildAndRegister() {
         return build().addFluid();
     }
 }
diff --git a/src/main/java/gregtech/common/gui/MachineGUIProvider.java b/src/main/java/gregtech/common/gui/MachineGUIProvider.java
index 3cc889f000..a8d8804ebe 100644
--- a/src/main/java/gregtech/common/gui/MachineGUIProvider.java
+++ b/src/main/java/gregtech/common/gui/MachineGUIProvider.java
@@ -35,7 +35,7 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.VoidingMode;
 import gregtech.api.gui.GUIHost;
 import gregtech.api.gui.GUIProvider;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.logic.MuTEProcessingLogic;
 import gregtech.api.logic.PowerLogic;
@@ -74,7 +74,7 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
     @Override
     protected void addWidgets(@Nonnull Builder builder, @Nonnull UIBuildContext uiContext) {
         int page = 0;
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         MultiChildWidget mainTab = new MultiChildWidget();
         mainTab.setSize(host.getWidth(), host.getHeight());
         createMainTab(mainTab, builder, uiContext);
@@ -103,12 +103,12 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
                     .setBackground(
                         false,
                         ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0, 1f, 0.5f),
-                        GT_UITextures.PICTURE_ITEM_IN.withFixedSize(16, 16)
+                        GTUITextures.PICTURE_ITEM_IN.withFixedSize(16, 16)
                             .withOffset(2, 4))
                     .setBackground(
                         true,
                         ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0.5f, 1f, 1f),
-                        GT_UITextures.PICTURE_ITEM_IN.withFixedSize(16, 16)
+                        GTUITextures.PICTURE_ITEM_IN.withFixedSize(16, 16)
                             .withOffset(2, 4))
                     .addTooltip("Item Input Inventory")
                     .setPos(20 * (page - 1), -20))
@@ -124,12 +124,12 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
                     .setBackground(
                         false,
                         ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0, 1f, 0.5f),
-                        GT_UITextures.PICTURE_ITEM_OUT.withFixedSize(16, 16)
+                        GTUITextures.PICTURE_ITEM_OUT.withFixedSize(16, 16)
                             .withOffset(2, 4))
                     .setBackground(
                         true,
                         ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0.5f, 1f, 1f),
-                        GT_UITextures.PICTURE_ITEM_OUT.withFixedSize(16, 16)
+                        GTUITextures.PICTURE_ITEM_OUT.withFixedSize(16, 16)
                             .withOffset(2, 4))
                     .addTooltip("Item Output Inventory")
                     .setPos(20 * (page - 1), -20))
@@ -145,12 +145,12 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
                     .setBackground(
                         false,
                         ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0, 1f, 0.5f),
-                        GT_UITextures.PICTURE_FLUID_IN.withFixedSize(16, 16)
+                        GTUITextures.PICTURE_FLUID_IN.withFixedSize(16, 16)
                             .withOffset(2, 4))
                     .setBackground(
                         true,
                         ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0.5f, 1f, 1f),
-                        GT_UITextures.PICTURE_FLUID_IN.withFixedSize(16, 16)
+                        GTUITextures.PICTURE_FLUID_IN.withFixedSize(16, 16)
                             .withOffset(2, 4))
                     .addTooltip("Fluid Input Tanks")
                     .setPos(20 * (page - 1), -20))
@@ -166,12 +166,12 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
                     .setBackground(
                         false,
                         ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0, 1f, 0.5f),
-                        GT_UITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16)
+                        GTUITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16)
                             .withOffset(2, 4))
                     .setBackground(
                         true,
                         ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0.5f, 1f, 1f),
-                        GT_UITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16)
+                        GTUITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16)
                             .withOffset(2, 4))
                     .addTooltip("Fluid Output Tanks")
                     .setPos(20 * (page - 1), -20))
@@ -185,12 +185,12 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
                 .setBackground(
                     false,
                     ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0, 1f, 0.5f),
-                    GT_UITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16)
+                    GTUITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16)
                         .withOffset(2, 4))
                 .setBackground(
                     true,
                     ModularUITextures.VANILLA_TAB_TOP_MIDDLE.getSubArea(0, 0.5f, 1f, 1f),
-                    GT_UITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16)
+                    GTUITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16)
                         .withOffset(2, 4))
                 .addTooltip("Power Information")
                 .setPos(20 * (page - 1), -20))
@@ -209,7 +209,7 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
             .addChild(createBatchModeButton(builder))
             .addChild(createLockToSingleRecipeButton(builder));
         tab.addChild(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setPos(7, 4)
                 .setSize(160, 75))
             .addChild(buttons);
@@ -300,11 +300,11 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
                     : SoundResource.GUI_BUTTON_DOWN.resourceLocation)
             .setBackground(() -> {
                 if (host.isAllowedToWork()) {
-                    return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED,
-                        GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON };
+                    return new IDrawable[] { GTUITextures.BUTTON_STANDARD_PRESSED,
+                        GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON };
                 } else {
-                    return new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
-                        GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF };
+                    return new IDrawable[] { GTUITextures.BUTTON_STANDARD,
+                        GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF };
                 }
             })
             .attachSyncer(new FakeSyncWidget.BooleanSyncer(host::isAllowedToWork, host::setAllowedToWork), builder)
@@ -343,7 +343,7 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
                 ret.add(host.getVoidingMode().buttonTexture);
                 ret.add(host.getVoidingMode().buttonOverlay);
                 if (!host.supportsVoidProtection()) {
-                    ret.add(GT_UITextures.OVERLAY_BUTTON_FORBIDDEN);
+                    ret.add(GTUITextures.OVERLAY_BUTTON_FORBIDDEN);
                 }
                 return ret.toArray(new IDrawable[0]);
             })
@@ -384,22 +384,22 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
                 if (host.isInputSeparated()) {
-                    ret.add(GT_UITextures.BUTTON_STANDARD_PRESSED);
+                    ret.add(GTUITextures.BUTTON_STANDARD_PRESSED);
                     if (host.supportsInputSeparation()) {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON);
                     } else {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON_DISABLED);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON_DISABLED);
                     }
                 } else {
-                    ret.add(GT_UITextures.BUTTON_STANDARD);
+                    ret.add(GTUITextures.BUTTON_STANDARD);
                     if (host.supportsInputSeparation()) {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF);
                     } else {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF_DISABLED);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF_DISABLED);
                     }
                 }
                 if (!host.supportsInputSeparation()) {
-                    ret.add(GT_UITextures.OVERLAY_BUTTON_FORBIDDEN);
+                    ret.add(GTUITextures.OVERLAY_BUTTON_FORBIDDEN);
                 }
                 return ret.toArray(new IDrawable[0]);
             })
@@ -430,22 +430,22 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
                 if (host.isBatchModeEnabled()) {
-                    ret.add(GT_UITextures.BUTTON_STANDARD_PRESSED);
+                    ret.add(GTUITextures.BUTTON_STANDARD_PRESSED);
                     if (host.supportsBatchMode()) {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_BATCH_MODE_ON);
                     } else {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON_DISABLED);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_BATCH_MODE_ON_DISABLED);
                     }
                 } else {
-                    ret.add(GT_UITextures.BUTTON_STANDARD);
+                    ret.add(GTUITextures.BUTTON_STANDARD);
                     if (host.supportsBatchMode()) {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_OFF);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_BATCH_MODE_OFF);
                     } else {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_OFF_DISABLED);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_BATCH_MODE_OFF_DISABLED);
                     }
                 }
                 if (!host.supportsBatchMode()) {
-                    ret.add(GT_UITextures.OVERLAY_BUTTON_FORBIDDEN);
+                    ret.add(GTUITextures.OVERLAY_BUTTON_FORBIDDEN);
                 }
                 return ret.toArray(new IDrawable[0]);
             })
@@ -476,22 +476,22 @@ public class MachineGUIProvider<T extends GUIHost & ProcessingLogicHost<? extend
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
                 if (host.isRecipeLockingEnabled()) {
-                    ret.add(GT_UITextures.BUTTON_STANDARD_PRESSED);
+                    ret.add(GTUITextures.BUTTON_STANDARD_PRESSED);
                     if (host.supportsSingleRecipeLocking()) {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_LOCKED);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_RECIPE_LOCKED);
                     } else {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_LOCKED_DISABLED);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_RECIPE_LOCKED_DISABLED);
                     }
                 } else {
-                    ret.add(GT_UITextures.BUTTON_STANDARD);
+                    ret.add(GTUITextures.BUTTON_STANDARD);
                     if (host.supportsSingleRecipeLocking()) {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED);
                     } else {
-                        ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED_DISABLED);
+                        ret.add(GTUITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED_DISABLED);
                     }
                 }
                 if (!host.supportsSingleRecipeLocking()) {
-                    ret.add(GT_UITextures.OVERLAY_BUTTON_FORBIDDEN);
+                    ret.add(GTUITextures.OVERLAY_BUTTON_FORBIDDEN);
                 }
                 return ret.toArray(new IDrawable[0]);
             })
diff --git a/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java b/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java
index 452ca36c0c..0163c6fb7b 100644
--- a/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java
+++ b/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java
@@ -23,10 +23,10 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import gregtech.api.enums.Dyes;
-import gregtech.api.gui.GT_GUIColorOverride;
-import gregtech.api.gui.modularui.GT_UITextures;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.gui.GUIColorOverride;
+import gregtech.api.gui.modularui.GTUITextures;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 
 /**
  * Creates UI for selecting item from given list. This is client-only UI to allow using client-preferred settings.
@@ -44,10 +44,10 @@ public class SelectItemUIFactory {
     private int selected;
     private boolean anotherWindow = false;
     private AtomicBoolean dialogOpened;
-    private int guiTint = GT_Util.getRGBInt(Dyes.MACHINE_METAL.getRGBA());
+    private int guiTint = GTUtil.getRGBInt(Dyes.MACHINE_METAL.getRGBA());
     private Supplier<ItemStack> currentGetter;
 
-    private final GT_GUIColorOverride colorOverride = GT_GUIColorOverride.get("SelectItemUIFactory");
+    private final GUIColorOverride colorOverride = GUIColorOverride.get("SelectItemUIFactory");
 
     private int getTextColorOrDefault(String textType, int defaultColor) {
         return colorOverride.getTextColorOrDefault(textType, defaultColor);
@@ -139,10 +139,10 @@ public class SelectItemUIFactory {
                 super.onScreenUpdate();
                 if (currentGetter != null) {
                     ItemStack current = currentGetter.get();
-                    selected = GT_Utility.findMatchingStackInList(stacks, current);
+                    selected = GTUtility.findMatchingStackInList(stacks, current);
                 }
             }
-        }.setDrawable(GT_UITextures.SLOT_DARK_GRAY)
+        }.setDrawable(GTUITextures.SLOT_DARK_GRAY)
             .setPos(currentSlotX, currentSlotY)
             .setSize(18, 18))
             .widget(
@@ -178,7 +178,7 @@ public class SelectItemUIFactory {
                 .setUpdateTooltipEveryTick(true)
                 .setBackground(
                     () -> new IDrawable[] {
-                        index == selected ? GT_UITextures.SLOT_DARK_GRAY : ModularUITextures.ITEM_SLOT, })
+                        index == selected ? GTUITextures.SLOT_DARK_GRAY : ModularUITextures.ITEM_SLOT, })
                 .setPos(7 + 18 * (index % cols), 43 + 18 * (index / cols))
                 .setSize(18, 18));
         }
@@ -209,7 +209,7 @@ public class SelectItemUIFactory {
 
     public void setSelected(int selected) {
         if (selected == this.selected) return;
-        int newSelected = GT_Utility.clamp(selected, UNSELECTED, stacks.size() - 1);
+        int newSelected = GTUtility.clamp(selected, UNSELECTED, stacks.size() - 1);
         if (noDeselect && newSelected == UNSELECTED) return;
 
         this.selected = newSelected;
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java
index 4d1c6649ae..e244fcf5e5 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java
@@ -8,7 +8,7 @@ import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 
 /**
  * Fires click action on mouse release, not on press. Draws different backgrounds depending on whether the mouse is
@@ -16,12 +16,12 @@ import gregtech.api.gui.modularui.GT_UITextures;
  */
 public class CoverCycleButtonWidget extends CycleButtonWidget {
 
-    private static final UITexture BUTTON_NORMAL_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL
+    private static final UITexture BUTTON_NORMAL_NOT_PRESSED = GTUITextures.BUTTON_COVER_NORMAL
         .getSubArea(0, 0, 1, 0.5f);
-    private static final UITexture BUTTON_NORMAL_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL.getSubArea(0, 0.5f, 1, 1);
-    private static final UITexture BUTTON_HOVERED_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED
+    private static final UITexture BUTTON_NORMAL_PRESSED = GTUITextures.BUTTON_COVER_NORMAL.getSubArea(0, 0.5f, 1, 1);
+    private static final UITexture BUTTON_HOVERED_NOT_PRESSED = GTUITextures.BUTTON_COVER_NORMAL_HOVERED
         .getSubArea(0, 0, 1, 0.5f);
-    private static final UITexture BUTTON_HOVERED_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED
+    private static final UITexture BUTTON_HOVERED_PRESSED = GTUITextures.BUTTON_COVER_NORMAL_HOVERED
         .getSubArea(0, 0.5f, 1, 1);
 
     private boolean clickPressed;
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java
index 4543980ce1..c89c541273 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java
@@ -12,12 +12,12 @@ import com.gtnewhorizons.modularui.api.widget.Widget;
 import com.gtnewhorizons.modularui.common.internal.network.NetworkUtils;
 
 import gregtech.api.gui.modularui.IDataFollowerWidget;
-import gregtech.api.util.GT_CoverBehaviorBase;
+import gregtech.api.util.CoverBehaviorBase;
 import gregtech.api.util.ISerializableObject;
 
 public class CoverDataControllerWidget<T extends ISerializableObject> extends DataControllerWidget<T> {
 
-    protected final GT_CoverBehaviorBase<T> coverBehavior;
+    protected final CoverBehaviorBase<T> coverBehavior;
 
     /**
      * @param dataGetter    () -> cover data this widget handles
@@ -25,7 +25,7 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
      * @param coverBehavior cover this widget handles data update
      */
     public CoverDataControllerWidget(Supplier<T> dataGetter, Function<T, Boolean> dataSetter,
-        GT_CoverBehaviorBase<T> coverBehavior) {
+        CoverBehaviorBase<T> coverBehavior) {
         super(dataGetter, dataSetter);
         this.coverBehavior = coverBehavior;
     }
@@ -68,7 +68,7 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
          * @param dataUpdater       (index of button, current cover data) -> new cover data
          */
         public CoverDataIndexedControllerWidget_ToggleButtons(Supplier<T> coverDataGetter,
-            Function<T, Boolean> coverDataSetter, GT_CoverBehaviorBase<T> coverBehavior,
+            Function<T, Boolean> coverDataSetter, CoverBehaviorBase<T> coverBehavior,
             BiFunction<Integer, T, Boolean> dataToStateGetter, BiFunction<Integer, T, T> dataUpdater) {
             super(coverDataGetter, coverDataSetter, coverBehavior);
             this.dataToStateGetter = dataToStateGetter;
@@ -80,8 +80,8 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
          * @param widget         widget to add
          * @param applyForWidget methods to call for widget to add
          */
-        public <W extends CoverDataFollower_ToggleButtonWidget<T>> CoverDataIndexedControllerWidget_ToggleButtons<T> addToggleButton(
-            int index, W widget, Consumer<CoverDataFollower_ToggleButtonWidget<T>> applyForWidget) {
+        public <W extends CoverDataFollowerToggleButtonWidget<T>> CoverDataIndexedControllerWidget_ToggleButtons<T> addToggleButton(
+            int index, W widget, Consumer<CoverDataFollowerToggleButtonWidget<T>> applyForWidget) {
             addFollower(
                 widget,
                 data -> dataToStateGetter.apply(index, data),
@@ -108,7 +108,7 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
          * @param dataUpdater       (index of button, current cover data) -> new cover data
          */
         public CoverDataIndexedControllerWidget_CycleButtons(Supplier<T> coverDataGetter,
-            Function<T, Boolean> coverDataSetter, GT_CoverBehaviorBase<T> coverBehavior,
+            Function<T, Boolean> coverDataSetter, CoverBehaviorBase<T> coverBehavior,
             BiFunction<Integer, T, Integer> dataToStateGetter, BiFunction<Integer, T, T> dataUpdater) {
             super(coverDataGetter, coverDataSetter, coverBehavior);
             this.dataToStateGetter = dataToStateGetter;
@@ -120,8 +120,8 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
          * @param widget         widget to add
          * @param applyForWidget methods to call for the widget to add
          */
-        public <W extends CoverDataFollower_CycleButtonWidget<T>> CoverDataIndexedControllerWidget_CycleButtons<T> addCycleButton(
-            int index, W widget, Consumer<CoverDataFollower_CycleButtonWidget<T>> applyForWidget) {
+        public <W extends CoverDataFollowerCycleButtonWidget<T>> CoverDataIndexedControllerWidget_CycleButtons<T> addCycleButton(
+            int index, W widget, Consumer<CoverDataFollowerCycleButtonWidget<T>> applyForWidget) {
             addFollower(
                 widget,
                 data -> dataToStateGetter.apply(index, data),
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_CycleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerCycleButtonWidget.java
index ec7d31ca7e..4408dbd54e 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_CycleButtonWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerCycleButtonWidget.java
@@ -9,25 +9,25 @@ import gregtech.api.util.ISerializableObject;
 /**
  * Determines button state with cover data.
  */
-public class CoverDataFollower_CycleButtonWidget<T extends ISerializableObject> extends CoverCycleButtonWidget
+public class CoverDataFollowerCycleButtonWidget<T extends ISerializableObject> extends CoverCycleButtonWidget
     implements IDataFollowerWidget<T, Integer> {
 
     private Function<T, Integer> dataToStateGetter;
 
-    public CoverDataFollower_CycleButtonWidget() {
+    public CoverDataFollowerCycleButtonWidget() {
         super();
         setGetter(() -> 0); // fake getter; used only for init
         setSynced(false, false);
     }
 
     @Override
-    public CoverDataFollower_CycleButtonWidget<T> setDataToStateGetter(Function<T, Integer> dataToStateGetter) {
+    public CoverDataFollowerCycleButtonWidget<T> setDataToStateGetter(Function<T, Integer> dataToStateGetter) {
         this.dataToStateGetter = dataToStateGetter;
         return this;
     }
 
     @Override
-    public CoverDataFollower_CycleButtonWidget<T> setStateSetter(Consumer<Integer> setter) {
+    public CoverDataFollowerCycleButtonWidget<T> setStateSetter(Consumer<Integer> setter) {
         super.setSetter(setter);
         return this;
     }
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_NumericWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerNumericWidget.java
index f641ed090b..316109ed64 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_NumericWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerNumericWidget.java
@@ -7,22 +7,22 @@ import com.gtnewhorizons.modularui.api.math.Alignment;
 import com.gtnewhorizons.modularui.api.math.Color;
 import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.IDataFollowerWidget;
 import gregtech.api.util.ISerializableObject;
 
-public class CoverDataFollower_NumericWidget<T extends ISerializableObject> extends NumericWidget
+public class CoverDataFollowerNumericWidget<T extends ISerializableObject> extends NumericWidget
     implements IDataFollowerWidget<T, Double> {
 
     private Function<T, Double> dataToStateGetter;
 
-    public CoverDataFollower_NumericWidget() {
+    public CoverDataFollowerNumericWidget() {
         super();
         setGetter(() -> 0); // fake getter; used only for init
         setSynced(false, false);
         setTextColor(Color.WHITE.dark(1));
         setTextAlignment(Alignment.CenterLeft);
-        setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2));
+        setBackground(GTUITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2));
     }
 
     @Override
@@ -41,13 +41,13 @@ public class CoverDataFollower_NumericWidget<T extends ISerializableObject> exte
     }
 
     @Override
-    public CoverDataFollower_NumericWidget<T> setDataToStateGetter(Function<T, Double> dataToStateGetter) {
+    public CoverDataFollowerNumericWidget<T> setDataToStateGetter(Function<T, Double> dataToStateGetter) {
         this.dataToStateGetter = dataToStateGetter;
         return this;
     }
 
     @Override
-    public CoverDataFollower_NumericWidget<T> setStateSetter(Consumer<Double> setter) {
+    public CoverDataFollowerNumericWidget<T> setStateSetter(Consumer<Double> setter) {
         super.setSetter(setter::accept);
         return this;
     }
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerSlotWidget.java
index 0b827bfbc6..a3995deda0 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerSlotWidget.java
@@ -14,32 +14,32 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import gregtech.api.gui.modularui.IDataFollowerWidget;
 import gregtech.api.util.ISerializableObject;
 
-public class CoverDataFollower_SlotWidget<T extends ISerializableObject> extends SlotWidget
+public class CoverDataFollowerSlotWidget<T extends ISerializableObject> extends SlotWidget
     implements IDataFollowerWidget<T, ItemStack> {
 
     private Function<T, ItemStack> dataToStateGetter;
     private Consumer<ItemStack> dataSetter;
 
-    public CoverDataFollower_SlotWidget(BaseSlot slot) {
+    public CoverDataFollowerSlotWidget(BaseSlot slot) {
         super(slot);
     }
 
-    public CoverDataFollower_SlotWidget(IItemHandlerModifiable handler, int index, boolean phantom) {
+    public CoverDataFollowerSlotWidget(IItemHandlerModifiable handler, int index, boolean phantom) {
         this(new BaseSlot(handler, index, phantom));
     }
 
-    public CoverDataFollower_SlotWidget(IItemHandlerModifiable handler, int index) {
+    public CoverDataFollowerSlotWidget(IItemHandlerModifiable handler, int index) {
         this(handler, index, false);
     }
 
     @Override
-    public CoverDataFollower_SlotWidget<T> setDataToStateGetter(Function<T, ItemStack> dataToStateGetter) {
+    public CoverDataFollowerSlotWidget<T> setDataToStateGetter(Function<T, ItemStack> dataToStateGetter) {
         this.dataToStateGetter = dataToStateGetter;
         return this;
     }
 
     @Override
-    public CoverDataFollower_SlotWidget<T> setStateSetter(Consumer<ItemStack> setter) {
+    public CoverDataFollowerSlotWidget<T> setStateSetter(Consumer<ItemStack> setter) {
         this.dataSetter = setter;
         return this;
     }
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerTextFieldWidget.java
index 1907aaf22f..95ceafaadd 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerTextFieldWidget.java
@@ -10,22 +10,22 @@ import com.gtnewhorizons.modularui.api.math.Alignment;
 import com.gtnewhorizons.modularui.api.math.Color;
 import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.IDataFollowerWidget;
 import gregtech.api.util.ISerializableObject;
 
-public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> extends TextFieldWidget
+public class CoverDataFollowerTextFieldWidget<T extends ISerializableObject> extends TextFieldWidget
     implements IDataFollowerWidget<T, String> {
 
     private Function<T, String> dataToStateGetter;
 
-    public CoverDataFollower_TextFieldWidget() {
+    public CoverDataFollowerTextFieldWidget() {
         super();
         setGetter(() -> ""); // fake getter; used only for init
         setSynced(false, false);
         setTextColor(Color.WHITE.dark(1));
         setTextAlignment(Alignment.CenterLeft);
-        setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2));
+        setBackground(GTUITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2));
     }
 
     @Override
@@ -44,13 +44,13 @@ public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> ex
     }
 
     @Override
-    public CoverDataFollower_TextFieldWidget<T> setDataToStateGetter(Function<T, String> dataToStateGetter) {
+    public CoverDataFollowerTextFieldWidget<T> setDataToStateGetter(Function<T, String> dataToStateGetter) {
         this.dataToStateGetter = dataToStateGetter;
         return this;
     }
 
     @Override
-    public CoverDataFollower_TextFieldWidget<T> setStateSetter(Consumer<String> setter) {
+    public CoverDataFollowerTextFieldWidget<T> setStateSetter(Consumer<String> setter) {
         super.setSetter(setter);
         return this;
     }
@@ -61,10 +61,10 @@ public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> ex
     }
 
     /**
-     * @deprecated Use {@link CoverDataFollower_NumericWidget}
+     * @deprecated Use {@link CoverDataFollowerNumericWidget}
      */
     @Deprecated
-    public CoverDataFollower_TextFieldWidget<T> setOnScrollNumbers(int baseStep, int ctrlStep, int shiftStep) {
+    public CoverDataFollowerTextFieldWidget<T> setOnScrollNumbers(int baseStep, int ctrlStep, int shiftStep) {
         setOnScrollNumbers((val, direction) -> {
             int step = (GuiScreen.isShiftKeyDown() ? shiftStep : GuiScreen.isCtrlKeyDown() ? ctrlStep : baseStep)
                 * direction;
@@ -79,18 +79,18 @@ public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> ex
     }
 
     /**
-     * @deprecated Use {@link CoverDataFollower_NumericWidget}
+     * @deprecated Use {@link CoverDataFollowerNumericWidget}
      */
     @Deprecated
-    public CoverDataFollower_TextFieldWidget<T> setOnScrollNumbers() {
+    public CoverDataFollowerTextFieldWidget<T> setOnScrollNumbers() {
         return setOnScrollNumbers(1, 50, 1000);
     }
 
     /**
-     * @deprecated Use {@link CoverDataFollower_NumericWidget}
+     * @deprecated Use {@link CoverDataFollowerNumericWidget}
      */
     @Deprecated
-    public CoverDataFollower_TextFieldWidget<T> setOnScrollText(int baseStep, int ctrlStep, int shiftStep) {
+    public CoverDataFollowerTextFieldWidget<T> setOnScrollText(int baseStep, int ctrlStep, int shiftStep) {
         setOnScroll((text, direction) -> {
             int val = (int) MathExpressionParser.parse(text);
             int step = (GuiScreen.isShiftKeyDown() ? shiftStep : GuiScreen.isCtrlKeyDown() ? ctrlStep : baseStep)
@@ -107,18 +107,18 @@ public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> ex
     }
 
     /**
-     * @deprecated Use {@link CoverDataFollower_NumericWidget}
+     * @deprecated Use {@link CoverDataFollowerNumericWidget}
      */
     @Deprecated
-    public CoverDataFollower_TextFieldWidget<T> setOnScrollText() {
+    public CoverDataFollowerTextFieldWidget<T> setOnScrollText() {
         return setOnScrollText(1, 5, 50);
     }
 
     /**
-     * @deprecated Use {@link CoverDataFollower_NumericWidget}
+     * @deprecated Use {@link CoverDataFollowerNumericWidget}
      */
     @Deprecated
-    public CoverDataFollower_TextFieldWidget<T> setOnScrollNumbersLong(long baseStep, long ctrlStep, long shiftStep) {
+    public CoverDataFollowerTextFieldWidget<T> setOnScrollNumbersLong(long baseStep, long ctrlStep, long shiftStep) {
         setOnScrollNumbersLong((val, direction) -> {
             long step = (GuiScreen.isShiftKeyDown() ? shiftStep : GuiScreen.isCtrlKeyDown() ? ctrlStep : baseStep)
                 * direction;
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerToggleButtonWidget.java
index 6f798a93d5..0fcac5009c 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerToggleButtonWidget.java
@@ -5,16 +5,16 @@ import java.util.function.Function;
 
 import com.gtnewhorizons.modularui.api.drawable.IDrawable;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.IDataFollowerWidget;
 import gregtech.api.util.ISerializableObject;
 
-public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject> extends CoverCycleButtonWidget
+public class CoverDataFollowerToggleButtonWidget<T extends ISerializableObject> extends CoverCycleButtonWidget
     implements IDataFollowerWidget<T, Boolean> {
 
     private Function<T, Boolean> dataToStateGetter;
 
-    public CoverDataFollower_ToggleButtonWidget() {
+    public CoverDataFollowerToggleButtonWidget() {
         super();
         setGetter(() -> 0); // fake getter; used only for init
         setSynced(false, false);
@@ -22,13 +22,13 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject>
     }
 
     @Override
-    public CoverDataFollower_ToggleButtonWidget<T> setDataToStateGetter(Function<T, Boolean> dataToStateGetter) {
+    public CoverDataFollowerToggleButtonWidget<T> setDataToStateGetter(Function<T, Boolean> dataToStateGetter) {
         this.dataToStateGetter = dataToStateGetter;
         return this;
     }
 
     @Override
-    public CoverDataFollower_ToggleButtonWidget<T> setStateSetter(Consumer<Boolean> setter) {
+    public CoverDataFollowerToggleButtonWidget<T> setStateSetter(Consumer<Boolean> setter) {
         super.setSetter(val -> setter.accept(val == 1));
         return this;
     }
@@ -38,27 +38,27 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject>
         setState(dataToStateGetter.apply(data) ? 1 : 0, false, false);
     }
 
-    public CoverDataFollower_ToggleButtonWidget<T> setToggleTexture(IDrawable active, IDrawable inactive) {
+    public CoverDataFollowerToggleButtonWidget<T> setToggleTexture(IDrawable active, IDrawable inactive) {
         setTextureGetter(state -> state == 1 ? active : inactive);
         return this;
     }
 
-    public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofCheckAndCross() {
-        return new CoverDataFollower_ToggleButtonWidget<T>()
-            .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.OVERLAY_BUTTON_CROSS);
+    public static <T extends ISerializableObject> CoverDataFollowerToggleButtonWidget<T> ofCheckAndCross() {
+        return new CoverDataFollowerToggleButtonWidget<T>()
+            .setToggleTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK, GTUITextures.OVERLAY_BUTTON_CROSS);
     }
 
-    public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofCheck() {
-        return new CoverDataFollower_ToggleButtonWidget<T>()
-            .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.TRANSPARENT);
+    public static <T extends ISerializableObject> CoverDataFollowerToggleButtonWidget<T> ofCheck() {
+        return new CoverDataFollowerToggleButtonWidget<T>()
+            .setToggleTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK, GTUITextures.TRANSPARENT);
     }
 
-    public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofRedstone() {
-        return new CoverDataFollower_ToggleButtonWidget<T>()
-            .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON, GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF);
+    public static <T extends ISerializableObject> CoverDataFollowerToggleButtonWidget<T> ofRedstone() {
+        return new CoverDataFollowerToggleButtonWidget<T>()
+            .setToggleTexture(GTUITextures.OVERLAY_BUTTON_REDSTONE_ON, GTUITextures.OVERLAY_BUTTON_REDSTONE_OFF);
     }
 
-    public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofDisableable() {
+    public static <T extends ISerializableObject> CoverDataFollowerToggleButtonWidget<T> ofDisableable() {
         return new CoverDataFollower_DisableableToggleButtonWidget<>();
     }
 
@@ -66,7 +66,7 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject>
      * Disables clicking if button is already pressed.
      */
     public static class CoverDataFollower_DisableableToggleButtonWidget<T extends ISerializableObject>
-        extends CoverDataFollower_ToggleButtonWidget<T> {
+        extends CoverDataFollowerToggleButtonWidget<T> {
 
         public CoverDataFollower_DisableableToggleButtonWidget() {
             super();
@@ -79,7 +79,7 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject>
 
         @Override
         public IDrawable[] getBackground() {
-            if (!canClick()) return new IDrawable[] { GT_UITextures.BUTTON_COVER_NORMAL_DISABLED };
+            if (!canClick()) return new IDrawable[] { GTUITextures.BUTTON_COVER_NORMAL_DISABLED };
             return super.getBackground();
         }
     }
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/ItemWatcherSlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/ItemWatcherSlotWidget.java
index 5200c1a416..9e458af6a5 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/ItemWatcherSlotWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/ItemWatcherSlotWidget.java
@@ -9,7 +9,7 @@ import com.gtnewhorizons.modularui.api.forge.ItemStackHandler;
 import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 /**
  * Watches specific ItemStack and pulls changes from it. Player cannot interact with slot, other than viewing NEI recipe
@@ -33,7 +33,7 @@ public class ItemWatcherSlotWidget extends SlotWidget {
     @Override
     public void detectAndSendChanges(boolean init) {
         ItemStack target = getter.get();
-        if (init || !GT_Utility.areStacksEqual(lastItem, target)) {
+        if (init || !GTUtility.areStacksEqual(lastItem, target)) {
             ItemStack toPut;
             if (target != null) {
                 toPut = target.copy();
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 84ca2fa493..0a659f0684 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -5,7 +5,7 @@ import java.util.Arrays;
 import org.apache.commons.lang3.text.WordUtils;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 public enum CombType {
 
@@ -243,7 +243,7 @@ public enum CombType {
         this.chance = chance;
         this.showInList = show;
         this.color = new int[] { color1, color2 };
-        this.localizedName = GT_LanguageManager
+        this.localizedName = GTLanguageManager
             .addStringLocalization("comb." + pName, WordUtils.capitalize(pName.replaceAll("_", " ")) + " Comb");
     }
 
diff --git a/src/main/java/gregtech/common/items/DropType.java b/src/main/java/gregtech/common/items/DropType.java
index 1f9523a5b7..00525a0da6 100644
--- a/src/main/java/gregtech/common/items/DropType.java
+++ b/src/main/java/gregtech/common/items/DropType.java
@@ -3,7 +3,7 @@ package gregtech.common.items;
 import org.apache.commons.lang3.text.WordUtils;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 public enum DropType {
 
@@ -36,7 +36,7 @@ public enum DropType {
 
     public String getName() {
 
-        return GT_LanguageManager.addStringLocalization("drop." + this.name, WordUtils.capitalize(this.name) + " Drop");
+        return GTLanguageManager.addStringLocalization("drop." + this.name, WordUtils.capitalize(this.name) + " Drop");
     }
 
     public int[] getColours() {
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
deleted file mode 100644
index f8777dcf58..0000000000
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
+++ /dev/null
@@ -1,746 +0,0 @@
-package gregtech.common.items;
-
-import static gregtech.common.items.ID_MetaTool_01.AXE;
-import static gregtech.common.items.ID_MetaTool_01.BRANCHCUTTER;
-import static gregtech.common.items.ID_MetaTool_01.BUTCHERYKNIFE;
-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.CROWBAR;
-import static gregtech.common.items.ID_MetaTool_01.DRILL_HV;
-import static gregtech.common.items.ID_MetaTool_01.DRILL_LV;
-import static gregtech.common.items.ID_MetaTool_01.DRILL_MV;
-import static gregtech.common.items.ID_MetaTool_01.FILE;
-import static gregtech.common.items.ID_MetaTool_01.HARDHAMMER;
-import static gregtech.common.items.ID_MetaTool_01.HOE;
-import static gregtech.common.items.ID_MetaTool_01.JACKHAMMER;
-import static gregtech.common.items.ID_MetaTool_01.KNIFE;
-import static gregtech.common.items.ID_MetaTool_01.MORTAR;
-import static gregtech.common.items.ID_MetaTool_01.PICKAXE;
-import static gregtech.common.items.ID_MetaTool_01.PLOW;
-import static gregtech.common.items.ID_MetaTool_01.PLUNGER;
-import static gregtech.common.items.ID_MetaTool_01.POCKET_BRANCHCUTTER;
-import static gregtech.common.items.ID_MetaTool_01.POCKET_FILE;
-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_SCREWDRIVER;
-import static gregtech.common.items.ID_MetaTool_01.POCKET_WIRECUTTER;
-import static gregtech.common.items.ID_MetaTool_01.ROLLING_PIN;
-import static gregtech.common.items.ID_MetaTool_01.SAW;
-import static gregtech.common.items.ID_MetaTool_01.SCOOP;
-import static gregtech.common.items.ID_MetaTool_01.SCREWDRIVER;
-import static gregtech.common.items.ID_MetaTool_01.SCREWDRIVER_HV;
-import static gregtech.common.items.ID_MetaTool_01.SCREWDRIVER_LV;
-import static gregtech.common.items.ID_MetaTool_01.SCREWDRIVER_MV;
-import static gregtech.common.items.ID_MetaTool_01.SENSE;
-import static gregtech.common.items.ID_MetaTool_01.SHOVEL;
-import static gregtech.common.items.ID_MetaTool_01.SOFTMALLET;
-import static gregtech.common.items.ID_MetaTool_01.SOLDERING_IRON_HV;
-import static gregtech.common.items.ID_MetaTool_01.SOLDERING_IRON_LV;
-import static gregtech.common.items.ID_MetaTool_01.SOLDERING_IRON_MV;
-import static gregtech.common.items.ID_MetaTool_01.SWORD;
-import static gregtech.common.items.ID_MetaTool_01.TURBINE;
-import static gregtech.common.items.ID_MetaTool_01.TURBINE_HUGE;
-import static gregtech.common.items.ID_MetaTool_01.TURBINE_LARGE;
-import static gregtech.common.items.ID_MetaTool_01.TURBINE_SMALL;
-import static gregtech.common.items.ID_MetaTool_01.UNIVERSALSPADE;
-import static gregtech.common.items.ID_MetaTool_01.WIRECUTTER;
-import static gregtech.common.items.ID_MetaTool_01.WRENCH;
-import static gregtech.common.items.ID_MetaTool_01.WRENCH_HV;
-import static gregtech.common.items.ID_MetaTool_01.WRENCH_LV;
-import static gregtech.common.items.ID_MetaTool_01.WRENCH_MV;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.enums.ToolDictNames;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.tools.GT_Tool_Axe;
-import gregtech.common.tools.GT_Tool_BranchCutter;
-import gregtech.common.tools.GT_Tool_ButcheryKnife;
-import gregtech.common.tools.GT_Tool_BuzzSaw;
-import gregtech.common.tools.GT_Tool_Chainsaw_HV;
-import gregtech.common.tools.GT_Tool_Chainsaw_LV;
-import gregtech.common.tools.GT_Tool_Chainsaw_MV;
-import gregtech.common.tools.GT_Tool_Crowbar;
-import gregtech.common.tools.GT_Tool_Drill_HV;
-import gregtech.common.tools.GT_Tool_Drill_LV;
-import gregtech.common.tools.GT_Tool_Drill_MV;
-import gregtech.common.tools.GT_Tool_File;
-import gregtech.common.tools.GT_Tool_HardHammer;
-import gregtech.common.tools.GT_Tool_Hoe;
-import gregtech.common.tools.GT_Tool_JackHammer;
-import gregtech.common.tools.GT_Tool_Knife;
-import gregtech.common.tools.GT_Tool_Mortar;
-import gregtech.common.tools.GT_Tool_Pickaxe;
-import gregtech.common.tools.GT_Tool_Plow;
-import gregtech.common.tools.GT_Tool_Plunger;
-import gregtech.common.tools.GT_Tool_RollingPin;
-import gregtech.common.tools.GT_Tool_Saw;
-import gregtech.common.tools.GT_Tool_Scoop;
-import gregtech.common.tools.GT_Tool_Screwdriver;
-import gregtech.common.tools.GT_Tool_Screwdriver_LV;
-import gregtech.common.tools.GT_Tool_Sense;
-import gregtech.common.tools.GT_Tool_Shovel;
-import gregtech.common.tools.GT_Tool_SoftHammer;
-import gregtech.common.tools.GT_Tool_Soldering_Iron;
-import gregtech.common.tools.GT_Tool_Sword;
-import gregtech.common.tools.GT_Tool_Turbine_Huge;
-import gregtech.common.tools.GT_Tool_Turbine_Large;
-import gregtech.common.tools.GT_Tool_Turbine_Normal;
-import gregtech.common.tools.GT_Tool_Turbine_Small;
-import gregtech.common.tools.GT_Tool_UniversalSpade;
-import gregtech.common.tools.GT_Tool_WireCutter;
-import gregtech.common.tools.GT_Tool_Wrench;
-import gregtech.common.tools.GT_Tool_Wrench_HV;
-import gregtech.common.tools.GT_Tool_Wrench_LV;
-import gregtech.common.tools.GT_Tool_Wrench_MV;
-import gregtech.common.tools.pocket.GT_Tool_Pocket_BranchCutter;
-import gregtech.common.tools.pocket.GT_Tool_Pocket_File;
-import gregtech.common.tools.pocket.GT_Tool_Pocket_Knife;
-import gregtech.common.tools.pocket.GT_Tool_Pocket_Multitool;
-import gregtech.common.tools.pocket.GT_Tool_Pocket_Saw;
-import gregtech.common.tools.pocket.GT_Tool_Pocket_Screwdriver;
-import gregtech.common.tools.pocket.GT_Tool_Pocket_WireCutter;
-
-public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool {
-
-    public static GT_MetaGenerated_Tool_01 INSTANCE;
-
-    public GT_MetaGenerated_Tool_01() {
-        super("metatool.01");
-        INSTANCE = this;
-        addTool(
-            SWORD.ID,
-            "Sword",
-            "",
-            new GT_Tool_Sword(),
-            ToolDictNames.craftingToolSword,
-            ToolDictNames.craftingToolBlade,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 4L));
-        addTool(
-            PICKAXE.ID,
-            "Pickaxe",
-            "",
-            new GT_Tool_Pickaxe(),
-            ToolDictNames.craftingToolPickaxe,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L));
-        addTool(
-            SHOVEL.ID,
-            "Shovel",
-            "",
-            new GT_Tool_Shovel(),
-            ToolDictNames.craftingToolShovel,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L));
-        addTool(
-            AXE.ID,
-            "Axe",
-            "",
-            new GT_Tool_Axe(),
-            ToolDictNames.craftingToolAxe,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L));
-        addTool(
-            HOE.ID,
-            "Hoe",
-            "",
-            new GT_Tool_Hoe(),
-            ToolDictNames.craftingToolHoe,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 4L));
-        addTool(
-            SAW.ID,
-            "Saw",
-            "Can also harvest Ice",
-            new GT_Tool_Saw(),
-            ToolDictNames.craftingToolSaw,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L));
-        GregTech_API.registerTool(
-            addTool(
-                HARDHAMMER.ID,
-                "Hammer",
-                "Crushes Ores instead of harvesting them",
-                new GT_Tool_HardHammer(),
-                ToolDictNames.craftingToolHardHammer,
-                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)),
-            GregTech_API.sHardHammerList);
-        GregTech_API.registerTool(
-            addTool(
-                SOFTMALLET.ID,
-                "Soft Mallet",
-                "",
-                new GT_Tool_SoftHammer(),
-                ToolDictNames.craftingToolSoftHammer,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 4L)),
-            GregTech_API.sSoftHammerList);
-        GregTech_API.registerTool(
-            addTool(
-                WRENCH.ID,
-                "Wrench",
-                "Hold Leftclick to dismantle Machines",
-                new GT_Tool_Wrench(),
-                ToolDictNames.craftingToolWrench,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)),
-            GregTech_API.sWrenchList);
-        addTool(
-            FILE.ID,
-            "File",
-            "",
-            new GT_Tool_File(),
-            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));
-        GregTech_API.registerTool(
-            addTool(
-                CROWBAR.ID,
-                "Crowbar",
-                "Dismounts Covers and Rotates Rails",
-                new GT_Tool_Crowbar(),
-                ToolDictNames.craftingToolCrowbar,
-                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.TELUM, 2L)),
-            GregTech_API.sCrowbarList);
-        GregTech_API.registerTool(
-            addTool(
-                SCREWDRIVER.ID,
-                "Screwdriver",
-                "Adjusts Covers and Machines",
-                new GT_Tool_Screwdriver(),
-                ToolDictNames.craftingToolScrewdriver,
-                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)),
-            GregTech_API.sScrewdriverList);
-        addTool(
-            MORTAR.ID,
-            "Mortar",
-            "",
-            new GT_Tool_Mortar(),
-            ToolDictNames.craftingToolMortar,
-            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.PERDITIO, 2L));
-        GregTech_API.registerTool(
-            addTool(
-                WIRECUTTER.ID,
-                "Wire Cutter",
-                "",
-                new GT_Tool_WireCutter(),
-                ToolDictNames.craftingToolWireCutter,
-                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)),
-            GregTech_API.sWireCutterList);
-        addTool(
-            SCOOP.ID,
-            "Scoop",
-            "",
-            new GT_Tool_Scoop(),
-            ToolDictNames.craftingToolScoop,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.BESTIA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.PANNUS, 2L));
-        addTool(
-            BRANCHCUTTER.ID,
-            "Branch Cutter",
-            "",
-            new GT_Tool_BranchCutter(),
-            ToolDictNames.craftingToolBranchCutter,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L));
-        GregTech_API.registerTool(
-            addTool(
-                UNIVERSALSPADE.ID,
-                "Universal Spade",
-                "",
-                new GT_Tool_UniversalSpade(),
-                ToolDictNames.craftingToolBlade,
-                ToolDictNames.craftingToolShovel,
-                ToolDictNames.craftingToolCrowbar,
-                ToolDictNames.craftingToolSaw,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)),
-            GregTech_API.sCrowbarList);
-        addTool(
-            KNIFE.ID,
-            "Knife",
-            "",
-            new GT_Tool_Knife(),
-            ToolDictNames.craftingToolBlade,
-            ToolDictNames.craftingToolKnife,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2L));
-        addTool(
-            BUTCHERYKNIFE.ID,
-            "Butchery Knife",
-            "Has a slow Attack Rate",
-            new GT_Tool_ButcheryKnife(),
-            ToolDictNames.craftingToolBlade,
-            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.CORPUS, 4L));
-
-        addTool(
-            SENSE.ID,
-            "Sense",
-            "Because a Scythe doesn't make Sense",
-            new GT_Tool_Sense(),
-            ToolDictNames.craftingToolBlade,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 2L));
-        addTool(
-            PLOW.ID,
-            "Plow",
-            "Used to get rid of Snow",
-            new GT_Tool_Plow(),
-            ToolDictNames.craftingToolPlow,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 2L));
-        addTool(
-            PLUNGER.ID,
-            "Plunger",
-            "",
-            new GT_Tool_Plunger(),
-            ToolDictNames.craftingToolPlunger,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 2L));
-        addTool(
-            ROLLING_PIN.ID,
-            "Rolling Pin",
-            "",
-            new GT_Tool_RollingPin(),
-            ToolDictNames.craftingToolRollingPin,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 4L));
-
-        addTool(
-            DRILL_LV.ID,
-            "Drill (LV)",
-            "",
-            new GT_Tool_Drill_LV(),
-            ToolDictNames.craftingToolMiningDrill,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L));
-        addTool(
-            DRILL_MV.ID,
-            "Drill (MV)",
-            "",
-            new GT_Tool_Drill_MV(),
-            ToolDictNames.craftingToolMiningDrill,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L));
-        addTool(
-            DRILL_HV.ID,
-            "Drill (HV)",
-            "",
-            new GT_Tool_Drill_HV(),
-            ToolDictNames.craftingToolMiningDrill,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L));
-        addTool(
-            CHAINSAW_LV.ID,
-            "Chainsaw (LV)",
-            "Can also harvest Ice",
-            new GT_Tool_Chainsaw_LV(),
-            ToolDictNames.craftingToolSaw,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L));
-        addTool(
-            CHAINSAW_MV.ID,
-            "Chainsaw (MV)",
-            "Can also harvest Ice",
-            new GT_Tool_Chainsaw_MV(),
-            ToolDictNames.craftingToolSaw,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L));
-        addTool(
-            CHAINSAW_HV.ID,
-            "Chainsaw (HV)",
-            "Can also harvest Ice",
-            new GT_Tool_Chainsaw_HV(),
-            ToolDictNames.craftingToolSaw,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L));
-        GregTech_API.registerTool(
-            addTool(
-                WRENCH_LV.ID,
-                "Wrench (LV)",
-                "Hold Left Button to dismantle Machines",
-                new GT_Tool_Wrench_LV(),
-                ToolDictNames.craftingToolWrench,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)),
-            GregTech_API.sWrenchList);
-        GregTech_API.registerTool(
-            addTool(
-                WRENCH_MV.ID,
-                "Wrench (MV)",
-                "Hold Left Button to dismantle Machines",
-                new GT_Tool_Wrench_MV(),
-                ToolDictNames.craftingToolWrench,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)),
-            GregTech_API.sWrenchList);
-        GregTech_API.registerTool(
-            addTool(
-                WRENCH_HV.ID,
-                "Wrench (HV)",
-                "Hold Left Button to dismantle Machines",
-                new GT_Tool_Wrench_HV(),
-                ToolDictNames.craftingToolWrench,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)),
-            GregTech_API.sWrenchList);
-        GregTech_API.registerTool(
-            addTool(
-                JACKHAMMER.ID,
-                "JackHammer (HV)",
-                "Breaks Rocks into pieces",
-                new GT_Tool_JackHammer(),
-                ToolDictNames.craftingToolJackHammer,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L)),
-            GregTech_API.sJackhammerList);
-        addTool(
-            BUZZSAW_LV.ID,
-            "Buzzsaw (LV)",
-            "Not suitable for harvesting Blocks",
-            new GT_Tool_BuzzSaw(),
-            ToolDictNames.craftingToolSaw,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L));
-        addTool(
-            BUZZSAW_MV.ID,
-            "Buzzsaw (MV)",
-            "Not suitable for harvesting Blocks",
-            new GT_Tool_BuzzSaw(),
-            ToolDictNames.craftingToolSaw,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L));
-        addTool(
-            BUZZSAW_HV.ID,
-            "Buzzsaw (HV)",
-            "Not suitable for harvesting Blocks",
-            new GT_Tool_BuzzSaw(),
-            ToolDictNames.craftingToolSaw,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L));
-        GregTech_API.registerTool(
-            addTool(
-                SCREWDRIVER_LV.ID,
-                "Screwdriver (LV)",
-                "Adjusts Covers and Machines",
-                new GT_Tool_Screwdriver_LV(),
-                ToolDictNames.craftingToolScrewdriver,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)),
-            GregTech_API.sScrewdriverList);
-        GregTech_API.registerTool(
-            addTool(
-                SCREWDRIVER_MV.ID,
-                "Screwdriver (MV)",
-                "Adjusts Covers and Machines",
-                new GT_Tool_Screwdriver_LV(),
-                ToolDictNames.craftingToolScrewdriver,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)),
-            GregTech_API.sScrewdriverList);
-        GregTech_API.registerTool(
-            addTool(
-                SCREWDRIVER_HV.ID,
-                "Screwdriver (HV)",
-                "Adjusts Covers and Machines",
-                new GT_Tool_Screwdriver_LV(),
-                ToolDictNames.craftingToolScrewdriver,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)),
-            GregTech_API.sScrewdriverList);
-        GregTech_API.registerTool(
-            addTool(
-                SOLDERING_IRON_LV.ID,
-                "Soldering Iron (LV)",
-                "Fixes burned out Circuits. Needs soldering materials in inventory.",
-                new GT_Tool_Soldering_Iron(),
-                ToolDictNames.craftingToolSolderingIron,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)),
-            GregTech_API.sSolderingToolList);
-        GregTech_API.registerTool(
-            addTool(
-                SOLDERING_IRON_MV.ID,
-                "Soldering Iron (MV)",
-                "Fixes burned out Circuits. Needs soldering materials in inventory.",
-                new GT_Tool_Soldering_Iron(),
-                ToolDictNames.craftingToolSolderingIron,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)),
-            GregTech_API.sSolderingToolList);
-        GregTech_API.registerTool(
-            addTool(
-                SOLDERING_IRON_HV.ID,
-                "Soldering Iron (HV)",
-                "Fixes burned out Circuits. Needs soldering materials in inventory.",
-                new GT_Tool_Soldering_Iron(),
-                ToolDictNames.craftingToolSolderingIron,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)),
-            GregTech_API.sSolderingToolList);
-
-        addTool(
-            TURBINE_SMALL.ID,
-            "Small Turbine",
-            "Turbine Rotors for your power station",
-            new GT_Tool_Turbine_Small());
-        addTool(TURBINE.ID, "Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Normal());
-        addTool(
-            TURBINE_LARGE.ID,
-            "Large Turbine",
-            "Turbine Rotors for your power station",
-            new GT_Tool_Turbine_Large());
-        addTool(TURBINE_HUGE.ID, "Huge Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Huge());
-
-        addTool(
-            POCKET_MULTITOOL.ID,
-            "Pocket Multitool",
-            "6 useful Tools in one!",
-            new GT_Tool_Pocket_Multitool(POCKET_KNIFE.ID),
-            null,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3));
-        addTool(
-            POCKET_KNIFE.ID,
-            "Pocket Multitool (Knife)",
-            "",
-            new GT_Tool_Pocket_Knife(POCKET_SAW.ID),
-            ToolDictNames.craftingToolKnife,
-            ToolDictNames.craftingToolBlade,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3));
-        addTool(
-            POCKET_SAW.ID,
-            "Pocket Multitool (Saw)",
-            "Can also harvest Ice",
-            new GT_Tool_Pocket_Saw(POCKET_FILE.ID),
-            ToolDictNames.craftingToolSaw,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3));
-        addTool(
-            POCKET_FILE.ID,
-            "Pocket Multitool (File)",
-            "",
-            new GT_Tool_Pocket_File(POCKET_SCREWDRIVER.ID),
-            ToolDictNames.craftingToolFile,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3));
-        GregTech_API.registerTool(
-            addTool(
-                POCKET_SCREWDRIVER.ID,
-                "Pocket Multitool (Screwdriver)",
-                "Adjusts Covers and Machines",
-                new GT_Tool_Pocket_Screwdriver(POCKET_WIRECUTTER.ID),
-                ToolDictNames.craftingToolScrewdriver,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3)),
-            GregTech_API.sScrewdriverList);
-        GregTech_API.registerTool(
-            addTool(
-                POCKET_WIRECUTTER.ID,
-                "Pocket Multitool (Wire Cutter)",
-                "",
-                new GT_Tool_Pocket_WireCutter(POCKET_BRANCHCUTTER.ID),
-                ToolDictNames.craftingToolWireCutter,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3)),
-            GregTech_API.sWireCutterList);
-        addTool(
-            POCKET_BRANCHCUTTER.ID,
-            "Pocket Multitool (Branch Cutter)",
-            "",
-            new GT_Tool_Pocket_BranchCutter(POCKET_MULTITOOL.ID),
-            ToolDictNames.craftingToolBranchCutter,
-            new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3),
-            new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3));
-        initCraftingShapedRecipes();
-        initCraftingShapelessRecipes();
-    }
-
-    private void initCraftingShapelessRecipes() {
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.clay, 1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.wheat, 1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            new ItemStack(Items.flint, 1),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.gravel, 1) });
-        GT_ModHandler.addShapelessCraftingRecipe(
-            new ItemStack(Items.blaze_powder, 2),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.blaze_rod, 1) });
-    }
-
-    private void initCraftingShapedRecipes() {
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Flint, Materials.Stone, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { " I ", "SIS", "SSS", 'I', new ItemStack(Items.flint, 1), 'S', OrePrefixes.stone });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Bronze, Materials.Stone, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Bronze), 'S', OrePrefixes.stone });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Iron, Materials.Stone, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Iron), 'S', OrePrefixes.stone });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Steel, Materials.Stone, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Steel), 'S', OrePrefixes.stone });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.WroughtIron, Materials.Stone, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.WroughtIron), 'S',
-                OrePrefixes.stone });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.RedSteel, Materials.Stone, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.RedSteel), 'S',
-                OrePrefixes.stone });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.BlueSteel, Materials.Stone, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.BlueSteel), 'S',
-                OrePrefixes.stone });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.BlackSteel, Materials.Stone, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.BlackSteel), 'S',
-                OrePrefixes.stone });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.DamascusSteel, Materials.Stone, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.DamascusSteel), 'S',
-                OrePrefixes.stone });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Thaumium, Materials.Stone, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Thaumium), 'S',
-                OrePrefixes.stone });
-
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.Wood, Materials.Wood, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.plank.get(Materials.Wood), 'S',
-                OrePrefixes.stick.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.Plastic, Materials.Plastic, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.Plastic), 'S',
-                OrePrefixes.stick.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.Aluminium, Materials.Aluminium, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.Aluminium), 'S',
-                OrePrefixes.stick.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.StainlessSteel, Materials.StainlessSteel, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.StainlessSteel), 'S',
-                OrePrefixes.stick.get(Materials.StainlessSteel) });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.IronWood, Materials.IronWood, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.IronWood), 'S',
-                OrePrefixes.stick.get(Materials.IronWood) });
-
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(SWORD.ID, 1, Materials.Flint, Materials.Wood, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "F", "F", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
-                new ItemStack(Items.flint, 1) });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(PICKAXE.ID, 1, Materials.Flint, Materials.Wood, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "FFF", " S ", " S ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
-                new ItemStack(Items.flint, 1) });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(SHOVEL.ID, 1, Materials.Flint, Materials.Wood, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "F", "S", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
-                new ItemStack(Items.flint, 1) });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(AXE.ID, 1, Materials.Flint, Materials.Wood, null),
-            GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "FF", "FS", " S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
-                new ItemStack(Items.flint, 1) });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(HOE.ID, 1, Materials.Flint, Materials.Wood, null),
-            GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "FF", " S", " S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
-                new ItemStack(Items.flint, 1) });
-        GT_ModHandler.addCraftingRecipe(
-            INSTANCE.getToolWithStats(KNIFE.ID, 1, Materials.Flint, Materials.Wood, null),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-            new Object[] { "F", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', new ItemStack(Items.flint, 1) });
-    }
-}
diff --git a/src/main/java/gregtech/common/items/ID_MetaItem_01.java b/src/main/java/gregtech/common/items/IDMetaItem01.java
index 5748442f86..47f34ab4b8 100644
--- a/src/main/java/gregtech/common/items/ID_MetaItem_01.java
+++ b/src/main/java/gregtech/common/items/IDMetaItem01.java
@@ -1,6 +1,6 @@
 package gregtech.common.items;
 
-public enum ID_MetaItem_01 {
+public enum IDMetaItem01 {
     // Please pretty please, add your entries while conserving the order
 
     Credit_Greg_Copper(0),
@@ -427,7 +427,7 @@ public enum ID_MetaItem_01 {
 
     public final int ID;
 
-    ID_MetaItem_01(int ID) {
+    IDMetaItem01(int ID) {
         this.ID = ID;
     }
 }
diff --git a/src/main/java/gregtech/common/items/ID_MetaItem_02.java b/src/main/java/gregtech/common/items/IDMetaItem02.java
index a13b858bd7..a67e22545c 100644
--- a/src/main/java/gregtech/common/items/ID_MetaItem_02.java
+++ b/src/main/java/gregtech/common/items/IDMetaItem02.java
@@ -1,6 +1,6 @@
 package gregtech.common.items;
 
-public enum ID_MetaItem_02 {
+public enum IDMetaItem02 {
 
     // Please pretty please, add your entries while conserving the order
     ThermosCan_Dark_Coffee(0),
@@ -202,7 +202,7 @@ public enum ID_MetaItem_02 {
 
     public final int ID;
 
-    ID_MetaItem_02(int ID) {
+    IDMetaItem02(int ID) {
         this.ID = ID;
     }
 }
diff --git a/src/main/java/gregtech/common/items/ID_MetaItem_03.java b/src/main/java/gregtech/common/items/IDMetaItem03.java
index 64b3f07249..b0e4f35943 100644
--- a/src/main/java/gregtech/common/items/ID_MetaItem_03.java
+++ b/src/main/java/gregtech/common/items/IDMetaItem03.java
@@ -1,6 +1,6 @@
 package gregtech.common.items;
 
-public enum ID_MetaItem_03 {
+public enum IDMetaItem03 {
 
     // Please pretty please, add your entries while conserving the order
     Circuit_Board_Wetware(6),
@@ -236,7 +236,7 @@ public enum ID_MetaItem_03 {
 
     public final int ID;
 
-    ID_MetaItem_03(int ID) {
+    IDMetaItem03(int ID) {
         this.ID = ID;
     }
 }
diff --git a/src/main/java/gregtech/common/items/ID_MetaTool_01.java b/src/main/java/gregtech/common/items/IDMetaTool01.java
index 195bd1aef8..684636100b 100644
--- a/src/main/java/gregtech/common/items/ID_MetaTool_01.java
+++ b/src/main/java/gregtech/common/items/IDMetaTool01.java
@@ -1,6 +1,6 @@
 package gregtech.common.items;
 
-public enum ID_MetaTool_01 {
+public enum IDMetaTool01 {
 
     // Please pretty please, add your entries while conserving the order
     SWORD(0),
@@ -67,7 +67,7 @@ public enum ID_MetaTool_01 {
 
     public final int ID;
 
-    ID_MetaTool_01(int ID) {
+    IDMetaTool01(int ID) {
         this.ID = ID;
     }
 }
diff --git a/src/main/java/gregtech/common/items/GT_AdvancedSensorCard_Item.java b/src/main/java/gregtech/common/items/ItemAdvancedSensorCard.java
index 723a7ffad5..8c68951bb7 100644
--- a/src/main/java/gregtech/common/items/GT_AdvancedSensorCard_Item.java
+++ b/src/main/java/gregtech/common/items/ItemAdvancedSensorCard.java
@@ -1,10 +1,10 @@
 package gregtech.common.items;
 
 import static gregtech.api.enums.Mods.GregTech;
-import static gregtech.common.covers.GT_Cover_Metrics_Transmitter.CARD_STATE_KEY;
-import static gregtech.common.covers.GT_Cover_Metrics_Transmitter.FREQUENCY_LSB_KEY;
-import static gregtech.common.covers.GT_Cover_Metrics_Transmitter.FREQUENCY_MSB_KEY;
-import static gregtech.common.covers.GT_Cover_Metrics_Transmitter.MACHINE_KEY;
+import static gregtech.common.covers.CoverMetricsTransmitter.CARD_STATE_KEY;
+import static gregtech.common.covers.CoverMetricsTransmitter.FREQUENCY_LSB_KEY;
+import static gregtech.common.covers.CoverMetricsTransmitter.FREQUENCY_MSB_KEY;
+import static gregtech.common.covers.CoverMetricsTransmitter.MACHINE_KEY;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +42,7 @@ import shedar.mods.ic2.nuclearcontrol.api.PanelSetting;
 import shedar.mods.ic2.nuclearcontrol.api.PanelString;
 
 @SuppressWarnings("unused")
-public class GT_AdvancedSensorCard_Item extends Item implements IPanelDataSource {
+public class ItemAdvancedSensorCard extends Item implements IPanelDataSource {
 
     public static final UUID CARD_TYPE_ID = UUID.fromString("ff952e84-7608-4c4a-85af-dd6e1aa27fc7");
 
@@ -68,7 +68,7 @@ public class GT_AdvancedSensorCard_Item extends Item implements IPanelDataSource
     private IIcon selfDestructedIcon;
 
     @SuppressWarnings("unused")
-    public GT_AdvancedSensorCard_Item() {
+    public ItemAdvancedSensorCard() {
         super();
 
         GameRegistry.registerItem(this, "gt.advancedsensorcard", GregTech.ID);
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index eaecd19f73..68cd902d86 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -1,9 +1,9 @@
 package gregtech.common.items;
 
-import static gregtech.api.enums.GT_Values.L;
-import static gregtech.api.enums.GT_Values.NF;
-import static gregtech.api.enums.GT_Values.NI;
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.L;
+import static gregtech.api.enums.GTValues.NF;
+import static gregtech.api.enums.GTValues.NI;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Mods.AE2FluidCraft;
 import static gregtech.api.enums.Mods.ExtraBees;
 import static gregtech.api.enums.Mods.ExtraUtilities;
@@ -17,9 +17,9 @@ import static gregtech.api.enums.Mods.ThaumicBases;
 import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.CLEANROOM;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.CLEANROOM;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 
 import java.util.Arrays;
 import java.util.List;
@@ -43,17 +43,17 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
 import forestry.api.recipes.RecipeManagers;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.items.GT_GeneratedMaterial_Renderer;
-import gregtech.loaders.misc.GT_Bees;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.items.GeneratedMaterialRenderer;
+import gregtech.loaders.misc.GTBees;
 
 public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
 
@@ -113,7 +113,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
     @SideOnly(Side.CLIENT)
     public int getColorFromItemStack(ItemStack stack, int pass) {
         CombType type = CombType.valueOf(stack.getItemDamage());
-        return type.getColours()[GT_Utility.clamp(pass, 0, 1)];
+        return type.getColours()[GTUtility.clamp(pass, 0, 1)];
     }
 
     @Override
@@ -133,7 +133,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
     }
 
     @Override
-    public GT_GeneratedMaterial_Renderer getMaterialRenderer(int aMetaData) {
+    public GeneratedMaterialRenderer getMaterialRenderer(int aMetaData) {
         return CombType.valueOf(aMetaData).material.renderer;
     }
 
@@ -191,17 +191,17 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
 
         addCentrifugeToItemStack(
             CombType.LIGNIE,
-            new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), ItemList.FR_Wax.get(1) },
+            new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), ItemList.FR_Wax.get(1) },
             new int[] { 90 * 100, 50 * 100 },
             Voltage.ULV);
         addCentrifugeToItemStack(
             CombType.COAL,
-            new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), ItemList.FR_Wax.get(1) },
+            new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), ItemList.FR_Wax.get(1) },
             new int[] { 5 * 100, 50 * 100 },
             Voltage.ULV);
         addCentrifugeToItemStack(
             CombType.OIL,
-            new ItemStack[] { ItemList.Crop_Drop_OilBerry.get(6), GT_Bees.drop.getStackForType(DropType.OIL),
+            new ItemStack[] { ItemList.Crop_Drop_OilBerry.get(6), GTBees.drop.getStackForType(DropType.OIL),
                 ItemList.FR_Wax.get(1) },
             new int[] { 100 * 100, 100 * 100, 50 * 100 },
             Voltage.ULV);
@@ -209,22 +209,22 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         // ic2
         addCentrifugeToItemStack(
             CombType.COOLANT,
-            new ItemStack[] { GT_Bees.drop.getStackForType(DropType.COOLANT), ItemList.FR_Wax.get(1) },
+            new ItemStack[] { GTBees.drop.getStackForType(DropType.COOLANT), ItemList.FR_Wax.get(1) },
             new int[] { 100 * 100, 100 * 100 },
             Voltage.HV,
             196);
         addCentrifugeToItemStack(
             CombType.ENERGY,
-            new ItemStack[] { GT_Bees.drop.getStackForType(DropType.HOT_COOLANT), ItemList.IC2_Energium_Dust.get(1L),
+            new ItemStack[] { GTBees.drop.getStackForType(DropType.HOT_COOLANT), ItemList.IC2_Energium_Dust.get(1L),
                 ItemList.FR_RefractoryWax.get(1) },
             new int[] { 20 * 100, 20 * 100, 50 * 100 },
             Voltage.HV,
             196);
         addCentrifugeToItemStack(
             CombType.LAPOTRON,
-            new ItemStack[] { GT_Bees.drop.getStackForType(DropType.LAPIS),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LapotronDust", 1, 0),
-                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 2) },
+            new ItemStack[] { GTBees.drop.getStackForType(DropType.LAPIS),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LapotronDust", 1, 0),
+                GTModHandler.getModItem(MagicBees.ID, "wax", 1, 2) },
             new int[] { 20 * 100, 100 * 100, 40 * 100 },
             Voltage.HV,
             240);
@@ -260,8 +260,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         addCentrifugeToItemStack(
             CombType.ENDERIUM,
             new ItemStack[] { ItemList.FR_RefractoryWax.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.EnderiumBase, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Enderium, 1) },
+                GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.EnderiumBase, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Enderium, 1) },
             new int[] { 50 * 100, 30 * 100, 50 * 100 },
             Voltage.HV);
 
@@ -350,31 +350,31 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         addProcessGT(CombType.THAUMIUMDUST, new Materials[] { Materials.Thaumium }, Voltage.MV);
         addCentrifugeToItemStack(
             CombType.THAUMIUMSHARD,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 1),
-                GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 2),
-                GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 3),
-                GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 4),
-                GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 5),
-                GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 6),
-                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1, 1),
+                GTModHandler.getModItem(MagicBees.ID, "propolis", 1, 2),
+                GTModHandler.getModItem(MagicBees.ID, "propolis", 1, 3),
+                GTModHandler.getModItem(MagicBees.ID, "propolis", 1, 4),
+                GTModHandler.getModItem(MagicBees.ID, "propolis", 1, 5),
+                GTModHandler.getModItem(MagicBees.ID, "propolis", 1, 6),
+                GTModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
             new int[] { 20 * 100, 20 * 100, 20 * 100, 20 * 100, 20 * 100, 20 * 100, 50 * 100 },
             Voltage.ULV);
         addProcessGT(CombType.AMBER, new Materials[] { Materials.Amber }, Voltage.LV);
         addProcessGT(CombType.QUICKSILVER, new Materials[] { Materials.Cinnabar }, Voltage.LV);
         addCentrifugeToItemStack(
             CombType.SALISMUNDUS,
-            new ItemStack[] { GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 14),
-                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
+            new ItemStack[] { GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 14),
+                GTModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
             new int[] { 100 * 100, 50 * 100 },
             Voltage.MV);
         addCentrifugeToItemStack(
             CombType.TAINTED,
-            new ItemStack[] { GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 11),
-                GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 12),
-                GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 0),
-                GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 1),
-                GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 2),
-                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
+            new ItemStack[] { GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 11),
+                GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 12),
+                GTModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 0),
+                GTModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 1),
+                GTModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 2),
+                GTModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
             new int[] { 15 * 100, 15 * 100, 15 * 100, 15 * 100, 15 * 100, 50 * 100 },
             Voltage.ULV);
         addProcessGT(CombType.MITHRIL, new Materials[] { Materials.Mithril }, Voltage.HV);
@@ -385,13 +385,13 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
             new int[] { 20 * 100, 10 * 100 },
             new int[] {},
             Voltage.HV,
-            GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
+            GTModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
             50 * 100);
         addCentrifugeToItemStack(
             CombType.THAUMINITE,
-            new ItemStack[] { GT_ModHandler.getModItem(ThaumicBases.ID, "resource", 1, 0),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Thaumium, 1),
-                GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
+            new ItemStack[] { GTModHandler.getModItem(ThaumicBases.ID, "resource", 1, 0),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Thaumium, 1),
+                GTModHandler.getModItem(MagicBees.ID, "wax", 1, 0) },
             new int[] { 20 * 100, 10 * 100, 50 * 100 },
             Voltage.HV);
         addProcessGT(CombType.SHADOWMETAL, new Materials[] { Materials.Shadow }, Voltage.HV);
@@ -401,23 +401,23 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
             new int[] { 20 * 100, 10 * 100 },
             new int[] {},
             Voltage.HV,
-            GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
+            GTModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
             50 * 100);
         addProcessGT(CombType.DIVIDED, new Materials[] { Materials.Diamond }, Voltage.HV);
         addCentrifugeToItemStack(
             CombType.DIVIDED,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
-                GT_ModHandler.getModItem(ExtraUtilities.ID, "unstableingot", 1, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
+                GTModHandler.getModItem(ExtraUtilities.ID, "unstableingot", 1, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1) },
             new int[] { 50 * 100, 20 * 100, 10 * 100, 5 * 100 },
             Voltage.HV);
         addProcessGT(CombType.SPARKLING, new Materials[] { Materials.NetherStar }, Voltage.EV);
         addCentrifugeToItemStack(
             CombType.SPARKLING,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
-                GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 2, 5),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 1) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
+                GTModHandler.getModItem(MagicBees.ID, "miscResources", 2, 5),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 1) },
             new int[] { 50 * 100, 10 * 100, 10 * 100 },
             Voltage.EV);
 
@@ -427,12 +427,12 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
             new int[] { 100 * 100 },
             new int[] {},
             Voltage.MV,
-            GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
+            GTModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
             50 * 100);
         addCentrifugeToItemStack(
             CombType.QUICKSILVER,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
-                GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1, 0),
+                GTModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5) },
             new int[] { 50 * 100, 100 * 100 },
             Voltage.ULV);
 
@@ -591,9 +591,9 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
 
         addCentrifugeToItemStack(
             CombType.SALT,
-            new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 6),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RockSalt, 6), ItemList.FR_Wax.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 6) },
+            new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 6),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.RockSalt, 6), ItemList.FR_Wax.get(1),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 6) },
             new int[] { 100 * 100, 100 * 100, 50 * 100, 25 * 100 },
             Voltage.MV,
             160);
@@ -612,141 +612,141 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         // Twilight
         addCentrifugeToItemStack(
             CombType.NAGA,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 4),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleChip", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleFragment", 1L, 0),
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 4),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleChip", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleFragment", 1L, 0),
                 ItemList.FR_Wax.get(1) },
             new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
             Voltage.MV);
         addCentrifugeToItemStack(
             CombType.LICH,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 5),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LichBoneChip", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LichBoneFragment", 1L, 0),
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 5),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LichBoneChip", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LichBoneFragment", 1L, 0),
                 ItemList.FR_Wax.get(1) },
             new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
             Voltage.HV);
         addCentrifugeToItemStack(
             CombType.HYDRA,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 1),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.FieryBloodDrop", 1L, 0),
-                GT_Bees.drop.getStackForType(DropType.HYDRA), ItemList.FR_Wax.get(1) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 1),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.FieryBloodDrop", 1L, 0),
+                GTBees.drop.getStackForType(DropType.HYDRA), ItemList.FR_Wax.get(1) },
             new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
             Voltage.HV);
         addCentrifugeToItemStack(
             CombType.URGHAST,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CarminiteChip", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CarminiteFragment", 1L, 0),
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CarminiteChip", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CarminiteFragment", 1L, 0),
                 ItemList.FR_Wax.get(1) },
             new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
             Voltage.EV);
         addCentrifugeToItemStack(
             CombType.SNOWQUEEN,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SnowQueenBloodDrop", 1L, 0),
-                GT_Bees.drop.getStackForType(DropType.SNOW_QUEEN), ItemList.FR_Wax.get(1) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SnowQueenBloodDrop", 1L, 0),
+                GTBees.drop.getStackForType(DropType.SNOW_QUEEN), ItemList.FR_Wax.get(1) },
             new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 },
             Voltage.EV);
 
         // HEE
         addCentrifugeToItemStack(
             CombType.ENDDUST,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
-                GT_Bees.propolis.getStackForType(PropolisType.End), GT_Bees.drop.getStackForType(DropType.ENDERGOO),
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
+                GTBees.propolis.getStackForType(PropolisType.End), GTBees.drop.getStackForType(DropType.ENDERGOO),
                 Materials.Endstone.getBlocks(4) },
             new int[] { 20 * 100, 15 * 100, 10 * 100, 100 * 100 },
             Voltage.HV);
         addCentrifugeToItemStack(
             CombType.STARDUST,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
-                GT_Bees.propolis.getStackForType(PropolisType.Stardust),
-                GT_Bees.drop.getStackForType(DropType.ENDERGOO) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
+                GTBees.propolis.getStackForType(PropolisType.Stardust),
+                GTBees.drop.getStackForType(DropType.ENDERGOO) },
             new int[] { 20 * 100, 15 * 100, 10 * 100 },
             Voltage.HV);
         addCentrifugeToItemStack(
             CombType.ECTOPLASMA,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
-                GT_Bees.propolis.getStackForType(PropolisType.Ectoplasma),
-                GT_Bees.drop.getStackForType(DropType.ENDERGOO) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
+                GTBees.propolis.getStackForType(PropolisType.Ectoplasma),
+                GTBees.drop.getStackForType(DropType.ENDERGOO) },
             new int[] { 25 * 100, 10 * 100, 15 * 100 },
             Voltage.EV);
         addCentrifugeToItemStack(
             CombType.ARCANESHARD,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
-                GT_Bees.propolis.getStackForType(PropolisType.Arcaneshard),
-                GT_Bees.drop.getStackForType(DropType.ENDERGOO) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
+                GTBees.propolis.getStackForType(PropolisType.Arcaneshard),
+                GTBees.drop.getStackForType(DropType.ENDERGOO) },
             new int[] { 25 * 100, 10 * 100, 15 * 100 },
             Voltage.EV);
         addCentrifugeToItemStack(
             CombType.DRAGONESSENCE,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
-                GT_Bees.propolis.getStackForType(PropolisType.Dragonessence),
-                GT_Bees.drop.getStackForType(DropType.ENDERGOO) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
+                GTBees.propolis.getStackForType(PropolisType.Dragonessence),
+                GTBees.drop.getStackForType(DropType.ENDERGOO) },
             new int[] { 30 * 100, (int) (7.5 * 100), 20 * 100 },
             Voltage.IV);
         addCentrifugeToItemStack(
             CombType.ENDERMAN,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
-                GT_Bees.propolis.getStackForType(PropolisType.Enderman),
-                GT_Bees.drop.getStackForType(DropType.ENDERGOO) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
+                GTBees.propolis.getStackForType(PropolisType.Enderman),
+                GTBees.drop.getStackForType(DropType.ENDERGOO) },
             new int[] { 3000, 750, 2000 },
             Voltage.IV);
         addCentrifugeToItemStack(
             CombType.SILVERFISH,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
-                GT_Bees.propolis.getStackForType(PropolisType.Silverfish),
-                GT_Bees.drop.getStackForType(DropType.ENDERGOO), new ItemStack(Items.spawn_egg, 1, 60) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
+                GTBees.propolis.getStackForType(PropolisType.Silverfish),
+                GTBees.drop.getStackForType(DropType.ENDERGOO), new ItemStack(Items.spawn_egg, 1, 60) },
             new int[] { 25 * 100, 10 * 100, 20 * 100, 15 * 100 },
             Voltage.EV);
         addProcessGT(CombType.ENDIUM, new Materials[] { Materials.HeeEndium }, Voltage.HV);
 
         addCentrifugeToItemStack(
             CombType.RUNEI,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfPowerFragment", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfAgilityFragment", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfVigorFragment", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfDefenseFragment", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfMagicFragment", 1L, 0) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfPowerFragment", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfAgilityFragment", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfVigorFragment", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfDefenseFragment", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfMagicFragment", 1L, 0) },
             new int[] { 25 * 100, 5 * 100, 5 * 100, 5 * 100, 5 * 100, 5 * 100 },
             Voltage.IV);
         addCentrifugeToItemStack(
             CombType.RUNEII,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfVoidFragment", 1L, 0) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfVoidFragment", 1L, 0) },
             new int[] { 50 * 100, (int) (2.5 * 100) },
             Voltage.IV);
         addCentrifugeToItemStack(
             CombType.FIREESSENSE,
-            new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
-                GT_Bees.propolis.getStackForType(PropolisType.Fireessence),
-                GT_Bees.drop.getStackForType(DropType.ENDERGOO) },
+            new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
+                GTBees.propolis.getStackForType(PropolisType.Fireessence),
+                GTBees.drop.getStackForType(DropType.ENDERGOO) },
             new int[] { 30 * 100, (int) (7.5 * 100), 20 * 100 },
             Voltage.IV);
         // Walrus Recipe
         if (AE2FluidCraft.isModLoaded()) {
             addCentrifugeToItemStack(
                 CombType.WALRUS,
-                new ItemStack[] { GT_ModHandler.getModItem(AE2FluidCraft.ID, "walrus", 1L, 0) },
+                new ItemStack[] { GTModHandler.getModItem(AE2FluidCraft.ID, "walrus", 1L, 0) },
                 new int[] { 100 * 100 },
                 Voltage.LV);
         }
         addCentrifugeToItemStack(
             CombType.MACHINIST,
-            new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "royalJelly", 1L, 0),
-                GT_ModHandler.getModItem(Forestry.ID, "pollen", 1L, 0),
-                GT_ModHandler.getModItem(Forestry.ID, "honeyDrop", 1L, 0),
-                GT_ModHandler.getModItem(ExtraBees.ID, "honeyDrop", 1L, 6),
-                GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0), ItemList.ElectronicsLump.get(1) },
+            new ItemStack[] { GTModHandler.getModItem(Forestry.ID, "royalJelly", 1L, 0),
+                GTModHandler.getModItem(Forestry.ID, "pollen", 1L, 0),
+                GTModHandler.getModItem(Forestry.ID, "honeyDrop", 1L, 0),
+                GTModHandler.getModItem(ExtraBees.ID, "honeyDrop", 1L, 6),
+                GTModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0), ItemList.ElectronicsLump.get(1) },
             new int[] { 10 * 100, 10 * 100, 20 * 100, 10 * 100, 20 * 100, 5 * 100 },
             Voltage.ULV);
         // Space Line
         addCentrifugeToItemStack(
             CombType.SPACE,
             new ItemStack[] { ItemList.FR_Wax.get(1L), ItemList.FR_RefractoryWax.get(1L),
-                GT_Bees.drop.getStackForType(DropType.OXYGEN),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CoinSpace", 1L, 0) },
+                GTBees.drop.getStackForType(DropType.OXYGEN),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CoinSpace", 1L, 0) },
             new int[] { 50 * 100, 30 * 100, 15 * 100, 5 * 100 },
             Voltage.HV);
         addProcessGT(CombType.METEORICIRON, new Materials[] { Materials.MeteoricIron }, Voltage.HV);
@@ -783,116 +783,116 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
         addCentrifugeToItemStack(
             CombType.MOON,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100 },
             Voltage.MV,
             300);
         addCentrifugeToItemStack(
             CombType.MARS,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100 },
             Voltage.HV,
             300);
         addCentrifugeToItemStack(
             CombType.JUPITER,
-            new ItemStack[] { GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1L, 0),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.CallistoIce, 1L), ItemList.FR_Wax.get(1L) },
+            new ItemStack[] { GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1L, 0),
+                GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.CallistoIce, 1L), ItemList.FR_Wax.get(1L) },
             new int[] { 30 * 100, 30 * 100, 30 * 100, 30 * 100, 30 * 100, 5 * 100, 50 * 100 },
             Voltage.HV,
             300);
         addCentrifugeToItemStack(
             CombType.MERCURY,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MercuryCoreDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MercuryStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MercuryCoreDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MercuryStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100, 30 * 100 },
             Voltage.EV,
             300);
         addCentrifugeToItemStack(
             CombType.VENUS,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VenusStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VenusStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100 },
             Voltage.EV,
             300);
         addCentrifugeToItemStack(
             CombType.SATURN,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100, 30 * 100 },
             Voltage.IV,
             300);
         addCentrifugeToItemStack(
             CombType.URANUS,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100, 30 * 100 },
             Voltage.IV,
             300);
         addCentrifugeToItemStack(
             CombType.NEPTUNE,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100, 30 * 100 },
             Voltage.IV,
             300);
         addCentrifugeToItemStack(
             CombType.PLUTO,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoIceDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoIceDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100, 30 * 100 },
             Voltage.LuV,
             300);
         addCentrifugeToItemStack(
             CombType.HAUMEA,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100 },
             Voltage.LuV,
             300);
         addCentrifugeToItemStack(
             CombType.MAKEMAKE,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100 },
             Voltage.LuV,
             300);
         addCentrifugeToItemStack(
             CombType.CENTAURI,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriAStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriAStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100, 30 * 100 },
             Voltage.ZPM,
             300);
         addCentrifugeToItemStack(
             CombType.TCETI,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100 },
             Voltage.ZPM,
             300);
         addCentrifugeToItemStack(
             CombType.BARNARDA,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1L, 0),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1L, 0),
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100, 30 * 100 },
             Voltage.ZPM,
             300);
         addCentrifugeToItemStack(
             CombType.VEGA,
             new ItemStack[] { ItemList.FR_Wax.get(1L),
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1L, 0) },
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1L, 0) },
             new int[] { 50 * 100, 30 * 100 },
             Voltage.ZPM,
             300);
@@ -900,7 +900,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
             addCentrifugeToItemStack(
                 CombType.SEAWEED,
                 new ItemStack[] { ItemList.FR_Wax.get(1L),
-                    GT_ModHandler.getModItem(GalaxySpace.ID, "tcetiedandelions", 1L, 0) },
+                    GTModHandler.getModItem(GalaxySpace.ID, "tcetiedandelions", 1L, 0) },
                 new int[] { 50 * 100, 100 * 100 },
                 Voltage.UV,
                 100);
@@ -940,13 +940,13 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
      *
      **/
     public void addAutoclaveProcess(CombType comb, Materials aMaterial, Voltage volt, int circuitNumber) {
-        if (GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4) == NI) {
+        if (GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4) == NI) {
             return;
         }
-        GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+        GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
         recipeBuilder
-            .itemInputs(GT_Utility.copyAmount(9, getStackForType(comb)), GT_Utility.getIntegratedCircuit(circuitNumber))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4))
+            .itemInputs(GTUtility.copyAmount(9, getStackForType(comb)), GTUtility.getIntegratedCircuit(circuitNumber))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4))
             .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + volt.getUUAmplifier()) / 10))))
             .duration(((int) (aMaterial.getMass() * 128)) * TICKS)
             .eut(volt.getAutoClaveEnergy());
@@ -968,8 +968,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                 : 128);
         int eut = volt.getSimpleEnergy() / 2;
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, getStackForType(comb)))
+        GTValues.RA.stdBuilder()
+            .itemInputs(GTUtility.copyAmount(1, getStackForType(comb)))
             .fluidOutputs(fluid)
             .duration(duration)
             .eut(eut)
@@ -988,7 +988,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
     public void addProcessGT(CombType comb, Materials[] aMaterial, Voltage volt) {
         ItemStack tComb = getStackForType(comb);
         for (Materials materials : aMaterial) {
-            if (GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4) != null) {
+            if (GTOreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4) != null) {
                 ItemStack combInput;
                 ItemStack combOutput;
                 FluidStack fluidInput;
@@ -998,7 +998,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                 boolean requiresCleanroom;
                 switch (comb) {
                     case NEUTRONIUM -> {
-                        combInput = GT_Utility.copyAmount(4, tComb);
+                        combInput = GTUtility.copyAmount(4, tComb);
                         combOutput = Materials.Neutronium.getNuggets(1);
                         fluidInput = volt.getFluidAccordingToCombTier();
                         fluidOutput = Materials.Neutronium.getMolten(576);
@@ -1007,7 +1007,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                         requiresCleanroom = volt.compareTo(Voltage.IV) > 0;
                     }
                     case OSMIUM -> {
-                        combInput = GT_Utility.copyAmount(4, tComb);
+                        combInput = GTUtility.copyAmount(4, tComb);
                         combOutput = Materials.Osmium.getNuggets(1);
                         fluidInput = volt.getFluidAccordingToCombTier();
                         fluidOutput = Materials.Osmium.getMolten(288);
@@ -1016,7 +1016,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                         requiresCleanroom = volt.compareTo(Voltage.IV) > 0;
                     }
                     case PLATINUM -> {
-                        combInput = GT_Utility.copyAmount(4, tComb);
+                        combInput = GTUtility.copyAmount(4, tComb);
                         combOutput = Materials.Platinum.getNuggets(1);
                         fluidInput = volt.getFluidAccordingToCombTier();
                         fluidOutput = Materials.Platinum.getMolten(288);
@@ -1025,7 +1025,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                         requiresCleanroom = volt.compareTo(Voltage.HV) > 0;
                     }
                     case IRIDIUM -> {
-                        combInput = GT_Utility.copyAmount(4, tComb);
+                        combInput = GTUtility.copyAmount(4, tComb);
                         combOutput = Materials.Iridium.getNuggets(1);
                         fluidInput = volt.getFluidAccordingToCombTier();
                         fluidOutput = Materials.Iridium.getMolten(288);
@@ -1034,8 +1034,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                         requiresCleanroom = volt.compareTo(Voltage.EV) > 0;
                     }
                     default -> {
-                        combInput = GT_Utility.copyAmount(4, tComb);
-                        combOutput = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4);
+                        combInput = GTUtility.copyAmount(4, tComb);
+                        combOutput = GTOreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4);
                         fluidInput = volt.getFluidAccordingToCombTier();
                         fluidOutput = null;
                         durationTicks = volt.getComplexTime();
@@ -1043,7 +1043,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                         requiresCleanroom = volt.compareTo(Voltage.IV) > 0;
                     }
                 }
-                GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+                GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
                 recipeBuilder.itemInputs(combInput)
                     .itemOutputs(combOutput)
                     .fluidInputs(fluidInput);
@@ -1092,11 +1092,11 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                 continue;
             }
             if (Math.max(1, stackSize[i]) % 9 == 0) {
-                aOutPut[i] = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial[i], (Math.max(1, stackSize[i]) / 9));
+                aOutPut[i] = GTOreDictUnificator.get(OrePrefixes.dust, aMaterial[i], (Math.max(1, stackSize[i]) / 9));
             } else if (Math.max(1, stackSize[i]) % 4 == 0) {
-                aOutPut[i] = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial[i], (Math.max(1, stackSize[i]) / 4));
+                aOutPut[i] = GTOreDictUnificator.get(OrePrefixes.dust, aMaterial[i], (Math.max(1, stackSize[i]) / 4));
             } else {
-                aOutPut[i] = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial[i], Math.max(1, stackSize[i]));
+                aOutPut[i] = GTOreDictUnificator.get(OrePrefixes.dust, aMaterial[i], Math.max(1, stackSize[i]));
             }
         }
         if (beeWax != NI) {
@@ -1130,7 +1130,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
             RecipeManagers.centrifugeManager.addRecipe(40, tComb, Product.build());
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(tComb)
             .itemOutputs(aItem)
             .outputChances(chance)
@@ -1142,9 +1142,9 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
     public void registerOreDict() {
         for (CombType comb : CombType.values()) {
             ItemStack tComb = getStackForType(comb);
-            GT_OreDictUnificator.registerOre(OrePrefixes.beeComb.name(), tComb);
+            GTOreDictUnificator.registerOre(OrePrefixes.beeComb.name(), tComb);
             OrePrefixes.beeComb.add(tComb);
-            if (comb.voltage != null) GT_OreDictUnificator.registerOre("comb" + comb.voltage.name(), tComb);
+            if (comb.voltage != null) GTOreDictUnificator.registerOre("comb" + comb.voltage.name(), tComb);
         }
     }
 
@@ -1189,7 +1189,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
             if (this.compareTo(Voltage.MV) < 0) {
                 return Materials.HydrofluoricAcid.getFluid((this.compareTo(Voltage.ULV) > 0) ? 1000 : 500);
             } else if (this.compareTo(Voltage.HV) < 0) {
-                return GT_ModHandler.getDistilledWater(1000L);
+                return GTModHandler.getDistilledWater(1000L);
             } else if (this.compareTo(Voltage.LuV) < 0) {
                 return Materials.HydrofluoricAcid.getFluid((long) (Math.pow(2, this.compareTo(Voltage.HV)) * L));
             } else if (this.compareTo(Voltage.UHV) < 0) {
diff --git a/src/main/java/gregtech/common/items/GT_DepletetCell_Item.java b/src/main/java/gregtech/common/items/ItemDepletedCell.java
index df14adc39b..094dd76dbb 100644
--- a/src/main/java/gregtech/common/items/GT_DepletetCell_Item.java
+++ b/src/main/java/gregtech/common/items/ItemDepletedCell.java
@@ -2,12 +2,12 @@ package gregtech.common.items;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.items.GT_RadioactiveCellIC_Item;
+import gregtech.api.items.ItemRadioactiveCellIC;
 import ic2.api.reactor.IReactor;
 
-public class GT_DepletetCell_Item extends GT_RadioactiveCellIC_Item {
+public class ItemDepletedCell extends ItemRadioactiveCellIC {
 
-    public GT_DepletetCell_Item(String aUnlocalized, String aEnglish, int aRadiation) {
+    public ItemDepletedCell(String aUnlocalized, String aEnglish, int aRadiation) {
         super(aUnlocalized, aEnglish, 1, 1, 0, aRadiation, 0, null, false);
     }
 
diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java
index 5aab9dff48..1f56b79242 100644
--- a/src/main/java/gregtech/common/items/ItemDrop.java
+++ b/src/main/java/gregtech/common/items/ItemDrop.java
@@ -7,8 +7,8 @@ import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
 import static gregtech.api.enums.Mods.MagicBees;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import java.util.List;
 
@@ -25,11 +25,11 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
 import forestry.api.recipes.RecipeManagers;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_RecipeBuilder;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipeBuilder;
 
 public class ItemDrop extends Item {
 
@@ -110,53 +110,53 @@ public class ItemDrop extends Item {
         addProcessLV(
             tDrop,
             Materials.OilHeavy.getFluid(100L),
-            GT_ModHandler.getModItem(Forestry.ID, "propolis", 1L, 0),
+            GTModHandler.getModItem(Forestry.ID, "propolis", 1L, 0),
             3000,
             8);
         RecipeManagers.squeezerManager.addRecipe(
             40,
             new ItemStack[] { tDrop },
             Materials.OilHeavy.getFluid(100L),
-            GT_ModHandler.getModItem(Forestry.ID, "propolis", 1L, 0),
+            GTModHandler.getModItem(Forestry.ID, "propolis", 1L, 0),
             30);
         tDrop = getStackForType(DropType.COOLANT);
         addProcessLV(
             tDrop,
             new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100),
-            GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 0),
+            GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 0),
             3000,
             8);
         RecipeManagers.squeezerManager.addRecipe(
             40,
             new ItemStack[] { tDrop },
             new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100),
-            GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 0),
+            GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 0),
             30);
         tDrop = getStackForType(DropType.HOT_COOLANT);
         addProcessLV(
             tDrop,
             new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 100),
-            GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2),
+            GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2),
             3000,
             8);
         RecipeManagers.squeezerManager.addRecipe(
             40,
             new ItemStack[] { tDrop },
             new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 100),
-            GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2),
+            GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2),
             30);
         tDrop = getStackForType(DropType.SNOW_QUEEN);
         addProcessMV(
             tDrop,
             Materials.FierySteel.getFluid(200L),
-            GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SnowQueenBloodDrop", 1L, 0),
+            GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SnowQueenBloodDrop", 1L, 0),
             1500,
             48);
         tDrop = getStackForType(DropType.LAPIS);
         addProcessLV(
             tDrop,
             new FluidStack(FluidRegistry.getFluid("ic2coolant"), 200),
-            GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3),
+            GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3),
             5000,
             1200,
             2);
@@ -164,20 +164,20 @@ public class ItemDrop extends Item {
             400,
             new ItemStack[] { tDrop },
             new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100),
-            GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3),
+            GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3),
             30);
         tDrop = getStackForType(DropType.HYDRA);
         addProcessMV(
             tDrop,
             Materials.FierySteel.getFluid(50L),
-            GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2),
+            GTModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2),
             3000,
             8);
         tDrop = getStackForType(DropType.OXYGEN);
         addProcessLV(
             tDrop,
             new FluidStack(FluidRegistry.getFluid("liquidoxygen"), 100),
-            GT_ModHandler.getModItem(ExtraBees.ID, "propolis", 1L, 2),
+            GTModHandler.getModItem(ExtraBees.ID, "propolis", 1L, 2),
             250,
             1200,
             8);
@@ -185,15 +185,15 @@ public class ItemDrop extends Item {
             400,
             new ItemStack[] { tDrop },
             new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100),
-            GT_ModHandler.getModItem(ExtraBees.ID, "propolis", 1L, 2),
+            GTModHandler.getModItem(ExtraBees.ID, "propolis", 1L, 2),
             30);
         tDrop = getStackForType(DropType.ENDERGOO);
         if (HardcoreEnderExpansion.isModLoaded())
-            addProcessHV(tDrop, new FluidStack(FluidRegistry.getFluid("endergoo"), 500), GT_Values.NI, 1000);
+            addProcessHV(tDrop, new FluidStack(FluidRegistry.getFluid("endergoo"), 500), GTValues.NI, 1000);
     }
 
     public void addProcessLV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(tDrop)
             .itemOutputs(aOutput2)
             .outputChances(aChance)
@@ -205,7 +205,7 @@ public class ItemDrop extends Item {
 
     public void addProcessLV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aDuration,
         int aEUt) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(tDrop)
             .itemOutputs(aOutput2)
             .outputChances(aChance)
@@ -216,7 +216,7 @@ public class ItemDrop extends Item {
     }
 
     public void addProcessMV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(tDrop)
             .itemOutputs(aOutput2)
             .outputChances(aChance)
@@ -227,9 +227,9 @@ public class ItemDrop extends Item {
     }
 
     public void addProcessHV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance) {
-        GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+        GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder();
         recipeBuilder.itemInputs(tDrop);
-        if (aOutput2 != GT_Values.NI) {
+        if (aOutput2 != GTValues.NI) {
             recipeBuilder.itemOutputs(aOutput2)
                 .outputChances(aChance);
         }
diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/ItemFluidDisplay.java
index 850fe21811..7063a7e1f3 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/ItemFluidDisplay.java
@@ -22,17 +22,17 @@ import net.minecraftforge.oredict.OreDictionary;
 
 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.ItemList;
 import gregtech.api.enums.Materials;
-import gregtech.api.items.GT_Generic_Item;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.GTGenericItem;
+import gregtech.api.util.GTUtility;
 
-public class GT_FluidDisplayItem extends GT_Generic_Item {
+public class ItemFluidDisplay extends GTGenericItem {
 
     private static final Map<Fluid, String> sFluidTooltips = new HashMap<>();
 
-    public GT_FluidDisplayItem() {
+    public ItemFluidDisplay() {
         super("GregTech_FluidDisplay", "Fluid Display", null);
         ItemList.Display_Fluid.set(this);
     }
@@ -46,7 +46,7 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
                 aList.add(EnumChatFormatting.YELLOW + tChemicalFormula + EnumChatFormatting.RESET);
         }
         NBTTagCompound aNBT = aStack.getTagCompound();
-        if (GT_Values.D1 || Minecraft.getMinecraft().gameSettings.advancedItemTooltips) {
+        if (GTValues.D1 || Minecraft.getMinecraft().gameSettings.advancedItemTooltips) {
             Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());
             if (tFluid != null) {
                 aList.add("Registry: " + tFluid.getName());
@@ -57,13 +57,13 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
             if (tToolTipAmount > 0L) {
                 aList.add(
                     EnumChatFormatting.BLUE + "Amount: "
-                        + GT_Utility.formatNumbers(tToolTipAmount)
+                        + GTUtility.formatNumbers(tToolTipAmount)
                         + " L"
                         + EnumChatFormatting.GRAY);
             }
             aList.add(
                 EnumChatFormatting.RED + "Temperature: "
-                    + GT_Utility.formatNumbers(aNBT.getLong("mFluidDisplayHeat"))
+                    + GTUtility.formatNumbers(aNBT.getLong("mFluidDisplayHeat"))
                     + " K"
                     + EnumChatFormatting.GRAY);
             aList.add(
@@ -102,7 +102,7 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
     @Override
     public String getUnlocalizedName(ItemStack aStack) {
         if (aStack != null) {
-            return GT_Utility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), false);
+            return GTUtility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), false);
         }
         return "";
     }
@@ -110,7 +110,7 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
     @Override
     public String getItemStackDisplayName(ItemStack aStack) {
         if (aStack != null) {
-            return GT_Utility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), true);
+            return GTUtility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), true);
         }
         return "";
     }
@@ -118,7 +118,7 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
     @SideOnly(Side.CLIENT)
     public static String getChemicalFormula(FluidStack aRealFluid) {
         return sFluidTooltips.computeIfAbsent(aRealFluid.getFluid(), fluid -> {
-            for (ItemStack tContainer : GT_Utility.getContainersFromFluid(aRealFluid)) {
+            for (ItemStack tContainer : GTUtility.getContainersFromFluid(aRealFluid)) {
                 if (isCell(tContainer)) {
                     Materials tMaterial = getMaterialFromCell(tContainer);
                     if (!tMaterial.equals(Materials._NULL)) {
@@ -147,10 +147,10 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item aItem, CreativeTabs aTab, List<ItemStack> aList) {
-        if (GT_Values.D1) {
+        if (GTValues.D1) {
             int i = 0;
             for (int j = FluidRegistry.getMaxID(); i < j; i++) {
-                ItemStack tStack = GT_Utility.getFluidDisplayStack(FluidRegistry.getFluid(i));
+                ItemStack tStack = GTUtility.getFluidDisplayStack(FluidRegistry.getFluid(i));
                 if (tStack != null) {
                     aList.add(tStack);
                 }
diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/ItemIntegratedCircuit.java
index d0ef03a1ae..b6dfa079a2 100644
--- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
+++ b/src/main/java/gregtech/common/items/ItemIntegratedCircuit.java
@@ -1,6 +1,6 @@
 package gregtech.common.items;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 import static gregtech.api.enums.Mods.GregTech;
 
 import java.util.ArrayList;
@@ -30,29 +30,29 @@ import com.gtnewhorizons.modularui.api.UIInfos;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.INetworkUpdatableItem;
-import gregtech.api.items.GT_Generic_Item;
-import gregtech.api.net.GT_Packet_UpdateItem;
+import gregtech.api.items.GTGenericItem;
+import gregtech.api.net.GTPacketUpdateItem;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTConfig;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory;
 
-public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetworkUpdatableItem {
+public class ItemIntegratedCircuit extends GTGenericItem implements INetworkUpdatableItem {
 
     private static final String aTextEmptyRow = "   ";
     private static final List<ItemStack> ALL_VARIANTS = new ArrayList<>();
     protected final IIcon[] mIconDamage = new IIcon[25];
 
-    public GT_IntegratedCircuit_Item() {
+    public ItemIntegratedCircuit() {
         super("integrated_circuit", "Programmed Circuit", "");
         setHasSubtypes(true);
         setMaxDamage(0);
@@ -62,109 +62,109 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
         ALL_VARIANTS.add(new ItemStack(this, 0, 0));
         for (int i = 1; i <= 24; i++) {
             ItemStack aStack = new ItemStack(this, 0, i);
-            GregTech_API.registerConfigurationCircuit(aStack, 1);
+            GregTechAPI.registerConfigurationCircuit(aStack, 1);
             ALL_VARIANTS.add(aStack);
         }
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 0L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { OrePrefixes.circuit.get(Materials.LV) });
-        long bits = GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE;
-        GT_ModHandler.addCraftingRecipe(
+        long bits = GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE;
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 1L),
             bits,
             new Object[] { "d  ", " P ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 2L),
             bits,
             new Object[] { " d ", " P ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 3L),
             bits,
             new Object[] { "  d", " P ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 4L),
             bits,
             new Object[] { aTextEmptyRow, " Pd", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 5L),
             bits,
             new Object[] { aTextEmptyRow, " P ", "  d", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 6L),
             bits,
             new Object[] { aTextEmptyRow, " P ", " d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 7L),
             bits,
             new Object[] { aTextEmptyRow, " P ", "d  ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 8L),
             bits,
             new Object[] { aTextEmptyRow, "dP ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 9L),
             bits,
             new Object[] { "P d", aTextEmptyRow, aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 10L),
             bits,
             new Object[] { "P  ", "  d", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 11L),
             bits,
             new Object[] { "P  ", aTextEmptyRow, "  d", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 12L),
             bits,
             new Object[] { "P  ", aTextEmptyRow, " d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 13L),
             bits,
             new Object[] { "  P", aTextEmptyRow, "  d", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 14L),
             bits,
             new Object[] { "  P", aTextEmptyRow, " d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 15L),
             bits,
             new Object[] { "  P", aTextEmptyRow, "d  ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 16L),
             bits,
             new Object[] { "  P", "d  ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 17L),
             bits,
             new Object[] { aTextEmptyRow, aTextEmptyRow, "d P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 18L),
             bits,
             new Object[] { aTextEmptyRow, "d  ", "  P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 19L),
             bits,
             new Object[] { "d  ", aTextEmptyRow, "  P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 20L),
             bits,
             new Object[] { " d ", aTextEmptyRow, "  P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 21L),
             bits,
             new Object[] { "d  ", aTextEmptyRow, "P  ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 22L),
             bits,
             new Object[] { " d ", aTextEmptyRow, "P  ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 23L),
             bits,
             new Object[] { "  d", aTextEmptyRow, "P  ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Circuit_Integrated.getWithDamage(1L, 24L),
             bits,
             new Object[] { aTextEmptyRow, "  d", "P  ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) });
@@ -189,13 +189,12 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
     public void addAdditionalToolTips(List<String> aList, ItemStack aStack, EntityPlayer aPlayer) {
         super.addAdditionalToolTips(aList, aStack, aPlayer);
         aList.add(
-            GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".configuration", "Configuration: ")
+            GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".configuration", "Configuration: ")
                 + getConfigurationString(getDamage(aStack)));
         aList.add(
-            GT_LanguageManager
-                .addStringLocalization(getUnlocalizedName() + ".tooltip.0", "Right click to reconfigure"));
+            GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip.0", "Right click to reconfigure"));
         aList.add(
-            GT_LanguageManager.addStringLocalization(
+            GTLanguageManager.addStringLocalization(
                 getUnlocalizedName() + ".tooltip.1",
                 "Needs a screwdriver or circuit programming tool"));
     }
@@ -217,21 +216,21 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
         super.registerIcons(aIconRegister);
         for (int i = 0; i < mIconDamage.length; i++) {
             mIconDamage[i] = aIconRegister
-                .registerIcon(GregTech.getResourcePath(GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i));
+                .registerIcon(GregTech.getResourcePath(GTConfig.troll ? "troll" : getUnlocalizedName() + "/" + i));
         }
-        if (GregTech_API.sPostloadFinished) {
-            GT_Log.out.println("GT_Mod: Starting Item Icon Load Phase");
-            GT_FML_LOGGER.info("GT_Mod: Starting Item Icon Load Phase");
-            GregTech_API.sItemIcons = aIconRegister;
+        if (GregTechAPI.sPostloadFinished) {
+            GTLog.out.println("GTMod: Starting Item Icon Load Phase");
+            GT_FML_LOGGER.info("GTMod: Starting Item Icon Load Phase");
+            GregTechAPI.sItemIcons = aIconRegister;
             try {
-                for (Runnable tRunnable : GregTech_API.sGTItemIconload) {
+                for (Runnable tRunnable : GregTechAPI.sGTItemIconload) {
                     tRunnable.run();
                 }
             } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
+                e.printStackTrace(GTLog.err);
             }
-            GT_Log.out.println("GT_Mod: Finished Item Icon Load Phase");
-            GT_FML_LOGGER.info("GT_Mod: Finished Item Icon Load Phase");
+            GTLog.out.println("GTMod: Finished Item Icon Load Phase");
+            GT_FML_LOGGER.info("GTMod: Finished Item Icon Load Phase");
         }
     }
 
@@ -298,7 +297,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
             buildContext -> new SelectItemUIFactory(
                 StatCollector.translateToLocal("GT5U.item.programmed_circuit.select.header"),
                 configurator,
-                GT_IntegratedCircuit_Item::onConfigured,
+                ItemIntegratedCircuit::onConfigured,
                 ALL_VARIANTS,
                 meta,
                 true).createWindow(buildContext));
@@ -307,7 +306,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
     private static void onConfigured(ItemStack stack) {
         NBTTagCompound tag = new NBTTagCompound();
         tag.setByte("meta", (byte) stack.getItemDamage());
-        GT_Values.NW.sendToServer(new GT_Packet_UpdateItem(tag));
+        GTValues.NW.sendToServer(new GTPacketUpdateItem(tag));
     }
 
     private static Pair<Integer, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> findConfiguratorInInv(
@@ -316,9 +315,9 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
         for (int j = 0, mainInventoryLength = mainInventory.length; j < mainInventoryLength; j++) {
             ItemStack toolStack = mainInventory[j];
 
-            if (!GT_Utility.isStackValid(toolStack)) continue;
+            if (!GTUtility.isStackValid(toolStack)) continue;
 
-            for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTech_API.sCircuitProgrammerList
+            for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTechAPI.sCircuitProgrammerList
                 .entrySet())
                 if (p.getKey()
                     .test(toolStack)) return Pair.of(j, p.getValue());
diff --git a/src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java b/src/main/java/gregtech/common/items/ItemNeutronReflector.java
index b2fd104917..215bc19c59 100644
--- a/src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java
+++ b/src/main/java/gregtech/common/items/ItemNeutronReflector.java
@@ -2,13 +2,13 @@ package gregtech.common.items;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.items.GT_Generic_Item;
+import gregtech.api.items.GTGenericItem;
 import ic2.api.reactor.IReactor;
 import ic2.api.reactor.IReactorComponent;
 
-public class GT_NeutronReflector_Item extends GT_Generic_Item implements IReactorComponent {
+public class ItemNeutronReflector extends GTGenericItem implements IReactorComponent {
 
-    public GT_NeutronReflector_Item(String aUnlocalized, String aEnglish, int aMaxDamage) {
+    public ItemNeutronReflector(String aUnlocalized, String aEnglish, int aMaxDamage) {
         super(aUnlocalized, aEnglish, "Undestructable");
         this.setMaxStackSize(64);
         this.setMaxDamage(aMaxDamage);
diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java
index 1c0d727bda..2b4f3c3905 100644
--- a/src/main/java/gregtech/common/items/ItemPropolis.java
+++ b/src/main/java/gregtech/common/items/ItemPropolis.java
@@ -4,8 +4,8 @@ import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import java.util.List;
 
@@ -20,12 +20,12 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class ItemPropolis extends Item {
 
@@ -85,29 +85,29 @@ public class ItemPropolis extends Item {
         ItemStack tPropolis;
 
         tPropolis = getStackForType(PropolisType.End);
-        addProcessHV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "end_powder", 1, 0));
+        addProcessHV(tPropolis, GTModHandler.getModItem(HardcoreEnderExpansion.ID, "end_powder", 1, 0));
         tPropolis = getStackForType(PropolisType.Stardust);
-        addProcessHV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "stardust", 1, 0));
+        addProcessHV(tPropolis, GTModHandler.getModItem(HardcoreEnderExpansion.ID, "stardust", 1, 0));
         tPropolis = getStackForType(PropolisType.Ectoplasma);
-        addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EctoplasmaChip", 1, 0));
+        addProcessEV(tPropolis, GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EctoplasmaChip", 1, 0));
         tPropolis = getStackForType(PropolisType.Arcaneshard);
-        addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArcaneShardChip", 1, 0));
+        addProcessEV(tPropolis, GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArcaneShardChip", 1, 0));
         tPropolis = getStackForType(PropolisType.Dragonessence);
-        addProcessIV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 16, 0));
+        addProcessIV(tPropolis, GTModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 16, 0));
         tPropolis = getStackForType(PropolisType.Enderman);
-        addProcessIV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "enderman_head", 1, 0));
+        addProcessIV(tPropolis, GTModHandler.getModItem(HardcoreEnderExpansion.ID, "enderman_head", 1, 0));
         tPropolis = getStackForType(PropolisType.Silverfish);
-        addProcessEV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "silverfish_blood", 1, 0));
+        addProcessEV(tPropolis, GTModHandler.getModItem(HardcoreEnderExpansion.ID, "silverfish_blood", 1, 0));
         tPropolis = getStackForType(PropolisType.Endium);
-        addProcessHV(tPropolis, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.HeeEndium, 1));
+        addProcessHV(tPropolis, GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.HeeEndium, 1));
         tPropolis = getStackForType(PropolisType.Fireessence);
-        addProcessIV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 16, 1));
+        addProcessIV(tPropolis, GTModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 16, 1));
 
         // addRecipe(tDrop, aOutput, aOutput2, aChance, aDuration, aEUt);
     }
 
     public void addProcessHV(ItemStack tPropolis, ItemStack aOutput2) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(tPropolis)
             .itemOutputs(aOutput2)
             .outputChances(5000)
@@ -118,7 +118,7 @@ public class ItemPropolis extends Item {
     }
 
     public void addProcessEV(ItemStack tPropolis, ItemStack aOutput2) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(tPropolis)
             .itemOutputs(aOutput2)
             .outputChances(2500)
@@ -129,7 +129,7 @@ public class ItemPropolis extends Item {
     }
 
     public void addProcessIV(ItemStack tPropolis, ItemStack aOutput2) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(tPropolis)
             .itemOutputs(aOutput2)
             .outputChances(1500)
diff --git a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java b/src/main/java/gregtech/common/items/ItemSensorCard.java
index 67e5b24a70..39e3d48081 100644
--- a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
+++ b/src/main/java/gregtech/common/items/ItemSensorCard.java
@@ -17,8 +17,8 @@ import net.minecraft.world.World;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
-import gregtech.api.items.GT_Generic_Item;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.items.GTGenericItem;
+import gregtech.api.util.GTLanguageManager;
 import shedar.mods.ic2.nuclearcontrol.api.CardState;
 import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper;
 import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource;
@@ -26,13 +26,13 @@ import shedar.mods.ic2.nuclearcontrol.api.IRemoteSensor;
 import shedar.mods.ic2.nuclearcontrol.api.PanelSetting;
 import shedar.mods.ic2.nuclearcontrol.api.PanelString;
 
-public class GT_SensorCard_Item extends GT_Generic_Item implements IRemoteSensor, IPanelDataSource {
+public class ItemSensorCard extends GTGenericItem implements IRemoteSensor, IPanelDataSource {
 
     private static final UUID CARD_TYPE = new UUID(0L, 41L);
 
     private int strCount;
 
-    public GT_SensorCard_Item(String aUnlocalized, String aEnglish) {
+    public ItemSensorCard(String aUnlocalized, String aEnglish) {
         super(aUnlocalized, aEnglish, "Insert into Display Panel");
         setMaxStackSize(1);
     }
@@ -84,7 +84,7 @@ public class GT_SensorCard_Item extends GT_Generic_Item implements IRemoteSensor
         for (int i = 0; i < (strCount = aCard.getInt("mString")); i++) {
             if ((aSettings & 1 << i) != 0) {
                 PanelString line = new PanelString();
-                line.textLeft = GT_LanguageManager.getTranslation(aCard.getString("mString" + i), "\\\\");
+                line.textLeft = GTLanguageManager.getTranslation(aCard.getString("mString" + i), "\\\\");
                 rList.add(line);
             }
         }
diff --git a/src/main/java/gregtech/common/items/GT_TierDrone.java b/src/main/java/gregtech/common/items/ItemTierDrone.java
index 58da852d0e..1df4f0024d 100644
--- a/src/main/java/gregtech/common/items/GT_TierDrone.java
+++ b/src/main/java/gregtech/common/items/ItemTierDrone.java
@@ -1,12 +1,12 @@
 package gregtech.common.items;
 
-import gregtech.api.items.GT_Generic_Item;
+import gregtech.api.items.GTGenericItem;
 
-public class GT_TierDrone extends GT_Generic_Item {
+public class ItemTierDrone extends GTGenericItem {
 
     private final int level;
 
-    public GT_TierDrone(String aUnlocalized, String aEnglish, String aEnglishTooltip, int level) {
+    public ItemTierDrone(String aUnlocalized, String aEnglish, String aEnglishTooltip, int level) {
         super(aUnlocalized, aEnglish, aEnglishTooltip);
         this.level = level;
         this.setMaxStackSize(64);
diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/ItemVolumetricFlask.java
index 5578214e65..a48dce38e0 100644
--- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java
+++ b/src/main/java/gregtech/common/items/ItemVolumetricFlask.java
@@ -1,7 +1,7 @@
 package gregtech.common.items;
 
 import static gregtech.api.enums.Mods.GregTech;
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 import static ic2.core.util.LiquidUtil.drainContainerStack;
 import static ic2.core.util.LiquidUtil.fillContainerStack;
 import static ic2.core.util.LiquidUtil.placeFluid;
@@ -42,13 +42,13 @@ import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
-import gregtech.api.items.GT_Generic_Item;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
+import gregtech.api.items.GTGenericItem;
+import gregtech.api.util.GTUtility;
 import ic2.core.util.LiquidUtil;
 
-public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContainerItem, IItemWithModularUI {
+public class ItemVolumetricFlask extends GTGenericItem implements IFluidContainerItem, IItemWithModularUI {
 
     private final int maxCapacity;
     private final String unlocalFlaskName;
@@ -56,7 +56,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain
     @SideOnly(Side.CLIENT)
     public IIcon iconWindow;
 
-    public GT_VolumetricFlask(String unlocalized, String english, int maxCapacity) {
+    public ItemVolumetricFlask(String unlocalized, String english, int maxCapacity) {
         super(unlocalized, english, null);
         this.maxCapacity = maxCapacity;
         unlocalFlaskName = unlocalized;
@@ -67,7 +67,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain
     @Override
     public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
         if (!world.isRemote && isEmpty(stack) && getMovingObjectPositionFromPlayer(world, player, true) == null)
-            GT_UIInfos.openPlayerHeldItemUI(player);
+            GTUIInfos.openPlayerHeldItemUI(player);
         return super.onItemRightClick(stack, world, player);
     }
 
@@ -213,7 +213,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain
     protected void addAdditionalToolTips(List<String> info, ItemStack stack, EntityPlayer aPlayer) {
         FluidStack fs = getFluid(stack);
         if (fs != null) {
-            info.add(String.format("< %s, %s mB >", GT_Utility.getFluidName(fs, true), formatNumbers(fs.amount)));
+            info.add(String.format("< %s, %s mB >", GTUtility.getFluidName(fs, true), formatNumbers(fs.amount)));
         } else {
             info.add(String.format("< Empty, %s mB >", formatNumbers(getCapacity(stack))));
         }
@@ -304,7 +304,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain
 
     @Override
     public ModularWindow createWindow(UIBuildContext buildContext, ItemStack stack) {
-        if (!(stack.getItem() instanceof GT_VolumetricFlask)) return null;
+        if (!(stack.getItem() instanceof ItemVolumetricFlask)) return null;
         return new VolumetricFlaskUIFactory(buildContext, stack).createWindow();
     }
 
@@ -316,7 +316,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain
 
         public VolumetricFlaskUIFactory(UIBuildContext buildContext, ItemStack flask) {
             this.buildContext = buildContext;
-            GT_VolumetricFlask flaskItem = (GT_VolumetricFlask) flask.getItem();
+            ItemVolumetricFlask flaskItem = (ItemVolumetricFlask) flask.getItem();
             this.capacity = flaskItem.getCapacity(flask);
             this.maxCapacity = flaskItem.getMaxCapacity();
         }
@@ -335,7 +335,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain
                     .setTextColor(Color.WHITE.dark(1))
                     .setTextAlignment(Alignment.CenterLeft)
                     .setFocusOnGuiOpen(true)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2))
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2))
                     .setPos(8, 8)
                     .setSize(77, 12))
                 .widget(new TextWidget("Capacity").setPos(88, 10))
diff --git a/src/main/java/gregtech/common/items/GT_WirelessHeadphones.java b/src/main/java/gregtech/common/items/ItemWirelessHeadphones.java
index 98a6eddb2c..4852b0804d 100644
--- a/src/main/java/gregtech/common/items/GT_WirelessHeadphones.java
+++ b/src/main/java/gregtech/common/items/ItemWirelessHeadphones.java
@@ -16,15 +16,15 @@ import net.minecraftforge.common.util.Constants;
 import baubles.api.BaubleType;
 import baubles.api.IBauble;
 import gregtech.api.enums.ItemList;
-import gregtech.api.items.GT_Generic_Item;
+import gregtech.api.items.GTGenericItem;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_BetterJukebox;
+import gregtech.common.tileentities.machines.basic.MTEBetterJukebox;
 
-public class GT_WirelessHeadphones extends GT_Generic_Item implements IBauble {
+public class ItemWirelessHeadphones extends GTGenericItem implements IBauble {
 
     public static final String NBTKEY_JUKEBOX_COORDINATES = "jukeboxCoords";
 
-    public GT_WirelessHeadphones() {
+    public ItemWirelessHeadphones() {
         super("WirelessHeadphones", "Wireless Headphones", null);
         setMaxStackSize(1);
 
@@ -57,17 +57,17 @@ public class GT_WirelessHeadphones extends GT_Generic_Item implements IBauble {
         if (!(pointedTe instanceof BaseMetaTileEntity mte)) {
             return false;
         }
-        if (!(mte.getMetaTileEntity() instanceof GT_MetaTileEntity_BetterJukebox jukebox)) {
+        if (!(mte.getMetaTileEntity() instanceof MTEBetterJukebox jukebox)) {
             return false;
         }
         final UUID uuid = jukebox.jukeboxUuid;
-        if (uuid == GT_MetaTileEntity_BetterJukebox.UNSET_UUID) {
+        if (uuid == MTEBetterJukebox.UNSET_UUID) {
             return false;
         }
         if (!world.isRemote) {
             final NBTTagCompound tag = (stack.getTagCompound() == null) ? new NBTTagCompound() : stack.getTagCompound();
-            tag.setLong(GT_MetaTileEntity_BetterJukebox.NBTKEY_UUID_LOW, uuid.getLeastSignificantBits());
-            tag.setLong(GT_MetaTileEntity_BetterJukebox.NBTKEY_UUID_HIGH, uuid.getMostSignificantBits());
+            tag.setLong(MTEBetterJukebox.NBTKEY_UUID_LOW, uuid.getLeastSignificantBits());
+            tag.setLong(MTEBetterJukebox.NBTKEY_UUID_HIGH, uuid.getMostSignificantBits());
             tag.setString(
                 NBTKEY_JUKEBOX_COORDINATES,
                 String.format("(%d, %d, %d) @ %d", x, y, z, world.provider.dimensionId));
@@ -83,12 +83,12 @@ public class GT_WirelessHeadphones extends GT_Generic_Item implements IBauble {
             return null;
         }
         final NBTTagCompound tag = stack.getTagCompound();
-        if (!tag.hasKey(GT_MetaTileEntity_BetterJukebox.NBTKEY_UUID_LOW, Constants.NBT.TAG_ANY_NUMERIC)
-            || !tag.hasKey(GT_MetaTileEntity_BetterJukebox.NBTKEY_UUID_HIGH, Constants.NBT.TAG_ANY_NUMERIC)) {
+        if (!tag.hasKey(MTEBetterJukebox.NBTKEY_UUID_LOW, Constants.NBT.TAG_ANY_NUMERIC)
+            || !tag.hasKey(MTEBetterJukebox.NBTKEY_UUID_HIGH, Constants.NBT.TAG_ANY_NUMERIC)) {
             return null;
         }
-        final long idLow = tag.getLong(GT_MetaTileEntity_BetterJukebox.NBTKEY_UUID_LOW);
-        final long idHigh = tag.getLong(GT_MetaTileEntity_BetterJukebox.NBTKEY_UUID_HIGH);
+        final long idLow = tag.getLong(MTEBetterJukebox.NBTKEY_UUID_LOW);
+        final long idHigh = tag.getLong(MTEBetterJukebox.NBTKEY_UUID_HIGH);
         return new UUID(idHigh, idLow);
     }
 
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
index b7380d9eff..ab9917435c 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
@@ -31,427 +31,427 @@ import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_LuV;
 import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_MV;
 import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_UV;
 import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_ZPM;
-import static gregtech.client.GT_TooltipHandler.Tier.ERV;
-import static gregtech.client.GT_TooltipHandler.Tier.EV;
-import static gregtech.client.GT_TooltipHandler.Tier.HV;
-import static gregtech.client.GT_TooltipHandler.Tier.IV;
-import static gregtech.client.GT_TooltipHandler.Tier.LV;
-import static gregtech.client.GT_TooltipHandler.Tier.LuV;
-import static gregtech.client.GT_TooltipHandler.Tier.MAX;
-import static gregtech.client.GT_TooltipHandler.Tier.MV;
-import static gregtech.client.GT_TooltipHandler.Tier.UEV;
-import static gregtech.client.GT_TooltipHandler.Tier.UHV;
-import static gregtech.client.GT_TooltipHandler.Tier.UIV;
-import static gregtech.client.GT_TooltipHandler.Tier.ULV;
-import static gregtech.client.GT_TooltipHandler.Tier.UMV;
-import static gregtech.client.GT_TooltipHandler.Tier.UV;
-import static gregtech.client.GT_TooltipHandler.Tier.UXV;
-import static gregtech.client.GT_TooltipHandler.Tier.ZPM;
-import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_EV;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_EV_Full;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_IV;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_IV_Full;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_LuV;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_LuV_Full;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UEV;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UEV_Full;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UHV;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UHV_Full;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UIV;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UIV_Full;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UMV;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UMV_Full;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UV;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UV_Full;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UxV;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UxV_Full;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.BatteryHull_ZPM_Full;
-import static gregtech.common.items.ID_MetaItem_01.Battery_Hull_HV;
-import static gregtech.common.items.ID_MetaItem_01.Battery_Hull_LV;
-import static gregtech.common.items.ID_MetaItem_01.Battery_Hull_MV;
-import static gregtech.common.items.ID_MetaItem_01.Battery_RE_HV_Cadmium;
-import static gregtech.common.items.ID_MetaItem_01.Battery_RE_HV_Lithium;
-import static gregtech.common.items.ID_MetaItem_01.Battery_RE_HV_Sodium;
-import static gregtech.common.items.ID_MetaItem_01.Battery_RE_LV_Cadmium;
-import static gregtech.common.items.ID_MetaItem_01.Battery_RE_LV_Lithium;
-import static gregtech.common.items.ID_MetaItem_01.Battery_RE_LV_Sodium;
-import static gregtech.common.items.ID_MetaItem_01.Battery_RE_MV_Cadmium;
-import static gregtech.common.items.ID_MetaItem_01.Battery_RE_MV_Lithium;
-import static gregtech.common.items.ID_MetaItem_01.Battery_RE_MV_Sodium;
-import static gregtech.common.items.ID_MetaItem_01.Battery_RE_ULV_Tantalum;
-import static gregtech.common.items.ID_MetaItem_01.Battery_SU_HV_Mercury;
-import static gregtech.common.items.ID_MetaItem_01.Battery_SU_HV_Sulfuric_Acid;
-import static gregtech.common.items.ID_MetaItem_01.Battery_SU_LV_Mercury;
-import static gregtech.common.items.ID_MetaItem_01.Battery_SU_LV_Sulfuric_Acid;
-import static gregtech.common.items.ID_MetaItem_01.Battery_SU_MV_Mercury;
-import static gregtech.common.items.ID_MetaItem_01.Battery_SU_MV_Sulfuric_Acid;
-import static gregtech.common.items.ID_MetaItem_01.Black_Hole_Closer;
-import static gregtech.common.items.ID_MetaItem_01.Black_Hole_Opener;
-import static gregtech.common.items.ID_MetaItem_01.Book_Written_01;
-import static gregtech.common.items.ID_MetaItem_01.Book_Written_02;
-import static gregtech.common.items.ID_MetaItem_01.Book_Written_03;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Advanced;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Basic;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Board_Advanced;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Board_Basic;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Board_Elite;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Data;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Elite;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Good;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Master;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Parts_Advanced;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Parts_Crystal_Chip_Elite;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Parts_Crystal_Chip_Master;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Parts_Crystal_Chip_Wetware;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Parts_Wiring_Advanced;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Parts_Wiring_Basic;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Parts_Wiring_Elite;
-import static gregtech.common.items.ID_MetaItem_01.Circuit_Primitive;
-import static gregtech.common.items.ID_MetaItem_01.Component_Filter;
-import static gregtech.common.items.ID_MetaItem_01.Component_Grinder_Diamond;
-import static gregtech.common.items.ID_MetaItem_01.Component_Grinder_Tungsten;
-import static gregtech.common.items.ID_MetaItem_01.Component_Minecraft_Wheels_Iron;
-import static gregtech.common.items.ID_MetaItem_01.Component_Minecraft_Wheels_Steel;
-import static gregtech.common.items.ID_MetaItem_01.Component_Sawblade_Diamond;
-import static gregtech.common.items.ID_MetaItem_01.Compressed_Fireclay;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_EV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_HV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_IV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_LV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_LuV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_MAX;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_MV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_UEV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_UHV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_UIV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_UMV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_UV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_UXV;
-import static gregtech.common.items.ID_MetaItem_01.Conveyor_Module_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.Cover_ActivityDetector;
-import static gregtech.common.items.ID_MetaItem_01.Cover_Chest_Advanced;
-import static gregtech.common.items.ID_MetaItem_01.Cover_Chest_Basic;
-import static gregtech.common.items.ID_MetaItem_01.Cover_Chest_Good;
-import static gregtech.common.items.ID_MetaItem_01.Cover_Controller;
-import static gregtech.common.items.ID_MetaItem_01.Cover_Crafting;
-import static gregtech.common.items.ID_MetaItem_01.Cover_Drain;
-import static gregtech.common.items.ID_MetaItem_01.Cover_EnergyDetector;
-import static gregtech.common.items.ID_MetaItem_01.Cover_FLuidStorageMonitor;
-import static gregtech.common.items.ID_MetaItem_01.Cover_FluidDetector;
-import static gregtech.common.items.ID_MetaItem_01.Cover_FluidLimiter;
-import static gregtech.common.items.ID_MetaItem_01.Cover_ItemDetector;
-import static gregtech.common.items.ID_MetaItem_01.Cover_NeedsMaintenance;
-import static gregtech.common.items.ID_MetaItem_01.Cover_PlayerDetector;
-import static gregtech.common.items.ID_MetaItem_01.Cover_RedstoneReceiverExternal;
-import static gregtech.common.items.ID_MetaItem_01.Cover_RedstoneReceiverInternal;
-import static gregtech.common.items.ID_MetaItem_01.Cover_RedstoneTransmitterExternal;
-import static gregtech.common.items.ID_MetaItem_01.Cover_RedstoneTransmitterInternal;
-import static gregtech.common.items.ID_MetaItem_01.Cover_Screen;
-import static gregtech.common.items.ID_MetaItem_01.Cover_Shutter;
-import static gregtech.common.items.ID_MetaItem_01.Cover_SolarPanel;
-import static gregtech.common.items.ID_MetaItem_01.Cover_SolarPanel_8V;
-import static gregtech.common.items.ID_MetaItem_01.Cover_SolarPanel_EV;
-import static gregtech.common.items.ID_MetaItem_01.Cover_SolarPanel_HV;
-import static gregtech.common.items.ID_MetaItem_01.Cover_SolarPanel_IV;
-import static gregtech.common.items.ID_MetaItem_01.Cover_SolarPanel_LV;
-import static gregtech.common.items.ID_MetaItem_01.Cover_SolarPanel_LuV;
-import static gregtech.common.items.ID_MetaItem_01.Cover_SolarPanel_MV;
-import static gregtech.common.items.ID_MetaItem_01.Cover_SolarPanel_UV;
-import static gregtech.common.items.ID_MetaItem_01.Cover_SolarPanel_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.Crate_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Duct_Tape;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_EV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_HV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_IV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_LV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_LuV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_MAX;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_MV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_UEV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_UHV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_UIV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_UMV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_UV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_UXV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Motor_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_EV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_HV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_IV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_LV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_LuV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_MAX;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_MV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_UEV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_UHV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_UIV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_UMV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_UV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_UXV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Piston_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_EV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_HV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_IV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_LV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_LuV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_MAX;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_MV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_UEV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_UHV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_UIV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_UMV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_UV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_UXV;
-import static gregtech.common.items.ID_MetaItem_01.Electric_Pump_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.Electromagnet_Iron;
-import static gregtech.common.items.ID_MetaItem_01.Electromagnet_Neodymium;
-import static gregtech.common.items.ID_MetaItem_01.Electromagnet_Samarium;
-import static gregtech.common.items.ID_MetaItem_01.Electromagnet_Steel;
-import static gregtech.common.items.ID_MetaItem_01.Electromagnet_Tengam;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_EV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_HV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_IV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_LV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_LuV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_MAX;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_MV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_UEV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_UHV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_UIV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_UMV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_UV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_UXV;
-import static gregtech.common.items.ID_MetaItem_01.Emitter_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.Empty_Board_Basic;
-import static gregtech.common.items.ID_MetaItem_01.Empty_Board_Elite;
-import static gregtech.common.items.ID_MetaItem_01.EnergisedTesseract;
-import static gregtech.common.items.ID_MetaItem_01.Energy_Cluster;
-import static gregtech.common.items.ID_MetaItem_01.Energy_Lapotronic_Orb;
-import static gregtech.common.items.ID_MetaItem_01.Energy_Lapotronic_orb_2;
-import static gregtech.common.items.ID_MetaItem_01.Energy_Module;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_EV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_HV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_IV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_LV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_LuV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_MAX;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_MV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_UEV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_UHV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_UIV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_UMV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_UV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_UXV;
-import static gregtech.common.items.ID_MetaItem_01.Field_Generator_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.Firebrick;
-import static gregtech.common.items.ID_MetaItem_01.FluidFilter;
-import static gregtech.common.items.ID_MetaItem_01.FluidRegulator_EV;
-import static gregtech.common.items.ID_MetaItem_01.FluidRegulator_HV;
-import static gregtech.common.items.ID_MetaItem_01.FluidRegulator_IV;
-import static gregtech.common.items.ID_MetaItem_01.FluidRegulator_LV;
-import static gregtech.common.items.ID_MetaItem_01.FluidRegulator_LuV;
-import static gregtech.common.items.ID_MetaItem_01.FluidRegulator_MV;
-import static gregtech.common.items.ID_MetaItem_01.FluidRegulator_UV;
-import static gregtech.common.items.ID_MetaItem_01.FluidRegulator_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.Fuel_Can_Plastic_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Fuel_Can_Plastic_Filled;
-import static gregtech.common.items.ID_MetaItem_01.GigaChad;
-import static gregtech.common.items.ID_MetaItem_01.Gravistar;
-import static gregtech.common.items.ID_MetaItem_01.Ingot_Heavy1;
-import static gregtech.common.items.ID_MetaItem_01.Ingot_Heavy2;
-import static gregtech.common.items.ID_MetaItem_01.Ingot_Heavy3;
-import static gregtech.common.items.ID_MetaItem_01.Ingot_Iridium_Alloy;
-import static gregtech.common.items.ID_MetaItem_01.ItemFilter_Export;
-import static gregtech.common.items.ID_MetaItem_01.ItemFilter_Import;
-import static gregtech.common.items.ID_MetaItem_01.Large_Fluid_Cell_Aluminium;
-import static gregtech.common.items.ID_MetaItem_01.Large_Fluid_Cell_Chrome;
-import static gregtech.common.items.ID_MetaItem_01.Large_Fluid_Cell_Iridium;
-import static gregtech.common.items.ID_MetaItem_01.Large_Fluid_Cell_Neutronium;
-import static gregtech.common.items.ID_MetaItem_01.Large_Fluid_Cell_Osmium;
-import static gregtech.common.items.ID_MetaItem_01.Large_Fluid_Cell_StainlessSteel;
-import static gregtech.common.items.ID_MetaItem_01.Large_Fluid_Cell_Steel;
-import static gregtech.common.items.ID_MetaItem_01.Large_Fluid_Cell_Titanium;
-import static gregtech.common.items.ID_MetaItem_01.Large_Fluid_Cell_TungstenSteel;
-import static gregtech.common.items.ID_MetaItem_01.McGuffium_239;
-import static gregtech.common.items.ID_MetaItem_01.NC_SensorKit;
-import static gregtech.common.items.ID_MetaItem_01.NaquadriaSupersolid;
-import static gregtech.common.items.ID_MetaItem_01.Paper_Magic_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Paper_Magic_Page;
-import static gregtech.common.items.ID_MetaItem_01.Paper_Magic_Pages;
-import static gregtech.common.items.ID_MetaItem_01.Paper_Printed_Pages;
-import static gregtech.common.items.ID_MetaItem_01.Paper_Punch_Card_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Paper_Punch_Card_Encoded;
-import static gregtech.common.items.ID_MetaItem_01.QuantumEye;
-import static gregtech.common.items.ID_MetaItem_01.QuantumStar;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_EV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_HV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_IV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_LV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_LuV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_MAX;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_MV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_UEV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_UHV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_UIV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_UMV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_UV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_UXV;
-import static gregtech.common.items.ID_MetaItem_01.Robot_Arm_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.Schematic;
-import static gregtech.common.items.ID_MetaItem_01.Schematic_1by1;
-import static gregtech.common.items.ID_MetaItem_01.Schematic_2by2;
-import static gregtech.common.items.ID_MetaItem_01.Schematic_3by3;
-import static gregtech.common.items.ID_MetaItem_01.Schematic_Crafting;
-import static gregtech.common.items.ID_MetaItem_01.Schematic_Dust;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_EV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_HV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_IV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_LV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_LuV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_MAX;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_MV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_UEV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_UHV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_UIV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_UMV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_UV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_UXV;
-import static gregtech.common.items.ID_MetaItem_01.Sensor_ZPM;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Axe;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Block;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Bolt;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Bottle;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Casing;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Cell;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_File;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Gear;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Hammer;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Hoe;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Ingot;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Pickaxe;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Pipe_Huge;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Pipe_Large;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Pipe_Medium;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Pipe_Small;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Pipe_Tiny;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Plate;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Ring;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Rod;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Rotor;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Saw;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Shovel;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Small_Gear;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Sword;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Tool_Head_Drill;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Turbine_Blade;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Extruder_Wire;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Anvil;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Arrow;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Baguette;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Ball;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Block;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Bolt;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Bottle;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Bread;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Bun;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Casing;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Credit;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Cylinder;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Gear;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Gear_Small;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Ingot;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Name;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Nugget;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Pipe_Huge;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Pipe_Large;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Pipe_Medium;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Pipe_Small;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Pipe_Tiny;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Plate;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Ring;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Rod;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Rod_Long;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Rotor;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Round;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Screw;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Tool_Head_Drill;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Mold_Turbine_Blade;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Slicer_Flat;
-import static gregtech.common.items.ID_MetaItem_01.Shape_Slicer_Stripes;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_0;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_1;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_10;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_11;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_12;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_13;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_14;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_15;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_2;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_3;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_4;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_5;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_6;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_7;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_8;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_9;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Remover;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Remover_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_0;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_1;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_10;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_11;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_12;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_13;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_14;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_15;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_2;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_3;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_4;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_5;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_6;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_7;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_8;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_9;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Color_Used_Remover;
-import static gregtech.common.items.ID_MetaItem_01.Spray_Empty;
-import static gregtech.common.items.ID_MetaItem_01.StableAdhesive;
-import static gregtech.common.items.ID_MetaItem_01.Steam_Regulator_EV;
-import static gregtech.common.items.ID_MetaItem_01.Steam_Regulator_HV;
-import static gregtech.common.items.ID_MetaItem_01.Steam_Regulator_IV;
-import static gregtech.common.items.ID_MetaItem_01.Steam_Regulator_LV;
-import static gregtech.common.items.ID_MetaItem_01.Steam_Regulator_MV;
-import static gregtech.common.items.ID_MetaItem_01.Steam_Valve_EV;
-import static gregtech.common.items.ID_MetaItem_01.Steam_Valve_HV;
-import static gregtech.common.items.ID_MetaItem_01.Steam_Valve_IV;
-import static gregtech.common.items.ID_MetaItem_01.Steam_Valve_LV;
-import static gregtech.common.items.ID_MetaItem_01.Steam_Valve_MV;
-import static gregtech.common.items.ID_MetaItem_01.SuperconductorComposite;
-import static gregtech.common.items.ID_MetaItem_01.Tesseract;
-import static gregtech.common.items.ID_MetaItem_01.Thermos_Can_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Cheat;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Cover_Copy_Paste;
-import static gregtech.common.items.ID_MetaItem_01.Tool_DataOrb;
-import static gregtech.common.items.ID_MetaItem_01.Tool_DataStick;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Lighter_Invar_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Lighter_Invar_Full;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Lighter_Invar_Used;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Lighter_Platinum_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Lighter_Platinum_Full;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Lighter_Platinum_Used;
-import static gregtech.common.items.ID_MetaItem_01.Tool_MatchBox_Full;
-import static gregtech.common.items.ID_MetaItem_01.Tool_MatchBox_Used;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Matches;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Scanner;
-import static gregtech.common.items.ID_MetaItem_01.Tool_Sonictron;
-import static gregtech.common.items.ID_MetaItem_01.Upgrade_Lock;
-import static gregtech.common.items.ID_MetaItem_01.Upgrade_Muffler;
-import static gregtech.common.items.ID_MetaItem_01.ZPM2;
-import static gregtech.common.items.ID_MetaItem_01.ZPM3;
-import static gregtech.common.items.ID_MetaItem_01.ZPM4;
-import static gregtech.common.items.ID_MetaItem_01.ZPM5;
-import static gregtech.common.items.ID_MetaItem_01.ZPM6;
+import static gregtech.client.GTTooltipHandler.Tier.ERV;
+import static gregtech.client.GTTooltipHandler.Tier.EV;
+import static gregtech.client.GTTooltipHandler.Tier.HV;
+import static gregtech.client.GTTooltipHandler.Tier.IV;
+import static gregtech.client.GTTooltipHandler.Tier.LV;
+import static gregtech.client.GTTooltipHandler.Tier.LuV;
+import static gregtech.client.GTTooltipHandler.Tier.MAX;
+import static gregtech.client.GTTooltipHandler.Tier.MV;
+import static gregtech.client.GTTooltipHandler.Tier.UEV;
+import static gregtech.client.GTTooltipHandler.Tier.UHV;
+import static gregtech.client.GTTooltipHandler.Tier.UIV;
+import static gregtech.client.GTTooltipHandler.Tier.ULV;
+import static gregtech.client.GTTooltipHandler.Tier.UMV;
+import static gregtech.client.GTTooltipHandler.Tier.UV;
+import static gregtech.client.GTTooltipHandler.Tier.UXV;
+import static gregtech.client.GTTooltipHandler.Tier.ZPM;
+import static gregtech.client.GTTooltipHandler.registerTieredTooltip;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_EV;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_EV_Full;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_IV;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_IV_Full;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_LuV;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_LuV_Full;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UEV;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UEV_Full;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UHV;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UHV_Full;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UIV;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UIV_Full;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UMV;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UMV_Full;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UV;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UV_Full;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UxV;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_UxV_Full;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_ZPM;
+import static gregtech.common.items.IDMetaItem01.BatteryHull_ZPM_Full;
+import static gregtech.common.items.IDMetaItem01.Battery_Hull_HV;
+import static gregtech.common.items.IDMetaItem01.Battery_Hull_LV;
+import static gregtech.common.items.IDMetaItem01.Battery_Hull_MV;
+import static gregtech.common.items.IDMetaItem01.Battery_RE_HV_Cadmium;
+import static gregtech.common.items.IDMetaItem01.Battery_RE_HV_Lithium;
+import static gregtech.common.items.IDMetaItem01.Battery_RE_HV_Sodium;
+import static gregtech.common.items.IDMetaItem01.Battery_RE_LV_Cadmium;
+import static gregtech.common.items.IDMetaItem01.Battery_RE_LV_Lithium;
+import static gregtech.common.items.IDMetaItem01.Battery_RE_LV_Sodium;
+import static gregtech.common.items.IDMetaItem01.Battery_RE_MV_Cadmium;
+import static gregtech.common.items.IDMetaItem01.Battery_RE_MV_Lithium;
+import static gregtech.common.items.IDMetaItem01.Battery_RE_MV_Sodium;
+import static gregtech.common.items.IDMetaItem01.Battery_RE_ULV_Tantalum;
+import static gregtech.common.items.IDMetaItem01.Battery_SU_HV_Mercury;
+import static gregtech.common.items.IDMetaItem01.Battery_SU_HV_Sulfuric_Acid;
+import static gregtech.common.items.IDMetaItem01.Battery_SU_LV_Mercury;
+import static gregtech.common.items.IDMetaItem01.Battery_SU_LV_Sulfuric_Acid;
+import static gregtech.common.items.IDMetaItem01.Battery_SU_MV_Mercury;
+import static gregtech.common.items.IDMetaItem01.Battery_SU_MV_Sulfuric_Acid;
+import static gregtech.common.items.IDMetaItem01.Black_Hole_Closer;
+import static gregtech.common.items.IDMetaItem01.Black_Hole_Opener;
+import static gregtech.common.items.IDMetaItem01.Book_Written_01;
+import static gregtech.common.items.IDMetaItem01.Book_Written_02;
+import static gregtech.common.items.IDMetaItem01.Book_Written_03;
+import static gregtech.common.items.IDMetaItem01.Circuit_Advanced;
+import static gregtech.common.items.IDMetaItem01.Circuit_Basic;
+import static gregtech.common.items.IDMetaItem01.Circuit_Board_Advanced;
+import static gregtech.common.items.IDMetaItem01.Circuit_Board_Basic;
+import static gregtech.common.items.IDMetaItem01.Circuit_Board_Elite;
+import static gregtech.common.items.IDMetaItem01.Circuit_Data;
+import static gregtech.common.items.IDMetaItem01.Circuit_Elite;
+import static gregtech.common.items.IDMetaItem01.Circuit_Good;
+import static gregtech.common.items.IDMetaItem01.Circuit_Master;
+import static gregtech.common.items.IDMetaItem01.Circuit_Parts_Advanced;
+import static gregtech.common.items.IDMetaItem01.Circuit_Parts_Crystal_Chip_Elite;
+import static gregtech.common.items.IDMetaItem01.Circuit_Parts_Crystal_Chip_Master;
+import static gregtech.common.items.IDMetaItem01.Circuit_Parts_Crystal_Chip_Wetware;
+import static gregtech.common.items.IDMetaItem01.Circuit_Parts_Wiring_Advanced;
+import static gregtech.common.items.IDMetaItem01.Circuit_Parts_Wiring_Basic;
+import static gregtech.common.items.IDMetaItem01.Circuit_Parts_Wiring_Elite;
+import static gregtech.common.items.IDMetaItem01.Circuit_Primitive;
+import static gregtech.common.items.IDMetaItem01.Component_Filter;
+import static gregtech.common.items.IDMetaItem01.Component_Grinder_Diamond;
+import static gregtech.common.items.IDMetaItem01.Component_Grinder_Tungsten;
+import static gregtech.common.items.IDMetaItem01.Component_Minecraft_Wheels_Iron;
+import static gregtech.common.items.IDMetaItem01.Component_Minecraft_Wheels_Steel;
+import static gregtech.common.items.IDMetaItem01.Component_Sawblade_Diamond;
+import static gregtech.common.items.IDMetaItem01.Compressed_Fireclay;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_EV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_HV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_IV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_LV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_LuV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_MAX;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_MV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_UEV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_UHV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_UIV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_UMV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_UV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_UXV;
+import static gregtech.common.items.IDMetaItem01.Conveyor_Module_ZPM;
+import static gregtech.common.items.IDMetaItem01.Cover_ActivityDetector;
+import static gregtech.common.items.IDMetaItem01.Cover_Chest_Advanced;
+import static gregtech.common.items.IDMetaItem01.Cover_Chest_Basic;
+import static gregtech.common.items.IDMetaItem01.Cover_Chest_Good;
+import static gregtech.common.items.IDMetaItem01.Cover_Controller;
+import static gregtech.common.items.IDMetaItem01.Cover_Crafting;
+import static gregtech.common.items.IDMetaItem01.Cover_Drain;
+import static gregtech.common.items.IDMetaItem01.Cover_EnergyDetector;
+import static gregtech.common.items.IDMetaItem01.Cover_FLuidStorageMonitor;
+import static gregtech.common.items.IDMetaItem01.Cover_FluidDetector;
+import static gregtech.common.items.IDMetaItem01.Cover_FluidLimiter;
+import static gregtech.common.items.IDMetaItem01.Cover_ItemDetector;
+import static gregtech.common.items.IDMetaItem01.Cover_NeedsMaintenance;
+import static gregtech.common.items.IDMetaItem01.Cover_PlayerDetector;
+import static gregtech.common.items.IDMetaItem01.Cover_RedstoneReceiverExternal;
+import static gregtech.common.items.IDMetaItem01.Cover_RedstoneReceiverInternal;
+import static gregtech.common.items.IDMetaItem01.Cover_RedstoneTransmitterExternal;
+import static gregtech.common.items.IDMetaItem01.Cover_RedstoneTransmitterInternal;
+import static gregtech.common.items.IDMetaItem01.Cover_Screen;
+import static gregtech.common.items.IDMetaItem01.Cover_Shutter;
+import static gregtech.common.items.IDMetaItem01.Cover_SolarPanel;
+import static gregtech.common.items.IDMetaItem01.Cover_SolarPanel_8V;
+import static gregtech.common.items.IDMetaItem01.Cover_SolarPanel_EV;
+import static gregtech.common.items.IDMetaItem01.Cover_SolarPanel_HV;
+import static gregtech.common.items.IDMetaItem01.Cover_SolarPanel_IV;
+import static gregtech.common.items.IDMetaItem01.Cover_SolarPanel_LV;
+import static gregtech.common.items.IDMetaItem01.Cover_SolarPanel_LuV;
+import static gregtech.common.items.IDMetaItem01.Cover_SolarPanel_MV;
+import static gregtech.common.items.IDMetaItem01.Cover_SolarPanel_UV;
+import static gregtech.common.items.IDMetaItem01.Cover_SolarPanel_ZPM;
+import static gregtech.common.items.IDMetaItem01.Crate_Empty;
+import static gregtech.common.items.IDMetaItem01.Duct_Tape;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_EV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_HV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_IV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_LV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_LuV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_MAX;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_MV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_UEV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_UHV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_UIV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_UMV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_UV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_UXV;
+import static gregtech.common.items.IDMetaItem01.Electric_Motor_ZPM;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_EV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_HV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_IV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_LV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_LuV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_MAX;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_MV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_UEV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_UHV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_UIV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_UMV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_UV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_UXV;
+import static gregtech.common.items.IDMetaItem01.Electric_Piston_ZPM;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_EV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_HV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_IV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_LV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_LuV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_MAX;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_MV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_UEV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_UHV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_UIV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_UMV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_UV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_UXV;
+import static gregtech.common.items.IDMetaItem01.Electric_Pump_ZPM;
+import static gregtech.common.items.IDMetaItem01.Electromagnet_Iron;
+import static gregtech.common.items.IDMetaItem01.Electromagnet_Neodymium;
+import static gregtech.common.items.IDMetaItem01.Electromagnet_Samarium;
+import static gregtech.common.items.IDMetaItem01.Electromagnet_Steel;
+import static gregtech.common.items.IDMetaItem01.Electromagnet_Tengam;
+import static gregtech.common.items.IDMetaItem01.Emitter_EV;
+import static gregtech.common.items.IDMetaItem01.Emitter_HV;
+import static gregtech.common.items.IDMetaItem01.Emitter_IV;
+import static gregtech.common.items.IDMetaItem01.Emitter_LV;
+import static gregtech.common.items.IDMetaItem01.Emitter_LuV;
+import static gregtech.common.items.IDMetaItem01.Emitter_MAX;
+import static gregtech.common.items.IDMetaItem01.Emitter_MV;
+import static gregtech.common.items.IDMetaItem01.Emitter_UEV;
+import static gregtech.common.items.IDMetaItem01.Emitter_UHV;
+import static gregtech.common.items.IDMetaItem01.Emitter_UIV;
+import static gregtech.common.items.IDMetaItem01.Emitter_UMV;
+import static gregtech.common.items.IDMetaItem01.Emitter_UV;
+import static gregtech.common.items.IDMetaItem01.Emitter_UXV;
+import static gregtech.common.items.IDMetaItem01.Emitter_ZPM;
+import static gregtech.common.items.IDMetaItem01.Empty_Board_Basic;
+import static gregtech.common.items.IDMetaItem01.Empty_Board_Elite;
+import static gregtech.common.items.IDMetaItem01.EnergisedTesseract;
+import static gregtech.common.items.IDMetaItem01.Energy_Cluster;
+import static gregtech.common.items.IDMetaItem01.Energy_Lapotronic_Orb;
+import static gregtech.common.items.IDMetaItem01.Energy_Lapotronic_orb_2;
+import static gregtech.common.items.IDMetaItem01.Energy_Module;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_EV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_HV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_IV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_LV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_LuV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_MAX;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_MV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_UEV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_UHV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_UIV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_UMV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_UV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_UXV;
+import static gregtech.common.items.IDMetaItem01.Field_Generator_ZPM;
+import static gregtech.common.items.IDMetaItem01.Firebrick;
+import static gregtech.common.items.IDMetaItem01.FluidFilter;
+import static gregtech.common.items.IDMetaItem01.FluidRegulator_EV;
+import static gregtech.common.items.IDMetaItem01.FluidRegulator_HV;
+import static gregtech.common.items.IDMetaItem01.FluidRegulator_IV;
+import static gregtech.common.items.IDMetaItem01.FluidRegulator_LV;
+import static gregtech.common.items.IDMetaItem01.FluidRegulator_LuV;
+import static gregtech.common.items.IDMetaItem01.FluidRegulator_MV;
+import static gregtech.common.items.IDMetaItem01.FluidRegulator_UV;
+import static gregtech.common.items.IDMetaItem01.FluidRegulator_ZPM;
+import static gregtech.common.items.IDMetaItem01.Fuel_Can_Plastic_Empty;
+import static gregtech.common.items.IDMetaItem01.Fuel_Can_Plastic_Filled;
+import static gregtech.common.items.IDMetaItem01.GigaChad;
+import static gregtech.common.items.IDMetaItem01.Gravistar;
+import static gregtech.common.items.IDMetaItem01.Ingot_Heavy1;
+import static gregtech.common.items.IDMetaItem01.Ingot_Heavy2;
+import static gregtech.common.items.IDMetaItem01.Ingot_Heavy3;
+import static gregtech.common.items.IDMetaItem01.Ingot_Iridium_Alloy;
+import static gregtech.common.items.IDMetaItem01.ItemFilter_Export;
+import static gregtech.common.items.IDMetaItem01.ItemFilter_Import;
+import static gregtech.common.items.IDMetaItem01.Large_Fluid_Cell_Aluminium;
+import static gregtech.common.items.IDMetaItem01.Large_Fluid_Cell_Chrome;
+import static gregtech.common.items.IDMetaItem01.Large_Fluid_Cell_Iridium;
+import static gregtech.common.items.IDMetaItem01.Large_Fluid_Cell_Neutronium;
+import static gregtech.common.items.IDMetaItem01.Large_Fluid_Cell_Osmium;
+import static gregtech.common.items.IDMetaItem01.Large_Fluid_Cell_StainlessSteel;
+import static gregtech.common.items.IDMetaItem01.Large_Fluid_Cell_Steel;
+import static gregtech.common.items.IDMetaItem01.Large_Fluid_Cell_Titanium;
+import static gregtech.common.items.IDMetaItem01.Large_Fluid_Cell_TungstenSteel;
+import static gregtech.common.items.IDMetaItem01.McGuffium_239;
+import static gregtech.common.items.IDMetaItem01.NC_SensorKit;
+import static gregtech.common.items.IDMetaItem01.NaquadriaSupersolid;
+import static gregtech.common.items.IDMetaItem01.Paper_Magic_Empty;
+import static gregtech.common.items.IDMetaItem01.Paper_Magic_Page;
+import static gregtech.common.items.IDMetaItem01.Paper_Magic_Pages;
+import static gregtech.common.items.IDMetaItem01.Paper_Printed_Pages;
+import static gregtech.common.items.IDMetaItem01.Paper_Punch_Card_Empty;
+import static gregtech.common.items.IDMetaItem01.Paper_Punch_Card_Encoded;
+import static gregtech.common.items.IDMetaItem01.QuantumEye;
+import static gregtech.common.items.IDMetaItem01.QuantumStar;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_EV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_HV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_IV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_LV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_LuV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_MAX;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_MV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_UEV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_UHV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_UIV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_UMV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_UV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_UXV;
+import static gregtech.common.items.IDMetaItem01.Robot_Arm_ZPM;
+import static gregtech.common.items.IDMetaItem01.Schematic;
+import static gregtech.common.items.IDMetaItem01.Schematic_1by1;
+import static gregtech.common.items.IDMetaItem01.Schematic_2by2;
+import static gregtech.common.items.IDMetaItem01.Schematic_3by3;
+import static gregtech.common.items.IDMetaItem01.Schematic_Crafting;
+import static gregtech.common.items.IDMetaItem01.Schematic_Dust;
+import static gregtech.common.items.IDMetaItem01.Sensor_EV;
+import static gregtech.common.items.IDMetaItem01.Sensor_HV;
+import static gregtech.common.items.IDMetaItem01.Sensor_IV;
+import static gregtech.common.items.IDMetaItem01.Sensor_LV;
+import static gregtech.common.items.IDMetaItem01.Sensor_LuV;
+import static gregtech.common.items.IDMetaItem01.Sensor_MAX;
+import static gregtech.common.items.IDMetaItem01.Sensor_MV;
+import static gregtech.common.items.IDMetaItem01.Sensor_UEV;
+import static gregtech.common.items.IDMetaItem01.Sensor_UHV;
+import static gregtech.common.items.IDMetaItem01.Sensor_UIV;
+import static gregtech.common.items.IDMetaItem01.Sensor_UMV;
+import static gregtech.common.items.IDMetaItem01.Sensor_UV;
+import static gregtech.common.items.IDMetaItem01.Sensor_UXV;
+import static gregtech.common.items.IDMetaItem01.Sensor_ZPM;
+import static gregtech.common.items.IDMetaItem01.Shape_Empty;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Axe;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Block;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Bolt;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Bottle;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Casing;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Cell;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_File;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Gear;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Hammer;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Hoe;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Ingot;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Pickaxe;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Pipe_Huge;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Pipe_Large;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Pipe_Medium;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Pipe_Small;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Pipe_Tiny;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Plate;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Ring;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Rod;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Rotor;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Saw;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Shovel;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Small_Gear;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Sword;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Tool_Head_Drill;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Turbine_Blade;
+import static gregtech.common.items.IDMetaItem01.Shape_Extruder_Wire;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Anvil;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Arrow;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Baguette;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Ball;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Block;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Bolt;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Bottle;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Bread;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Bun;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Casing;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Credit;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Cylinder;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Gear;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Gear_Small;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Ingot;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Name;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Nugget;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Pipe_Huge;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Pipe_Large;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Pipe_Medium;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Pipe_Small;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Pipe_Tiny;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Plate;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Ring;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Rod;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Rod_Long;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Rotor;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Round;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Screw;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Tool_Head_Drill;
+import static gregtech.common.items.IDMetaItem01.Shape_Mold_Turbine_Blade;
+import static gregtech.common.items.IDMetaItem01.Shape_Slicer_Flat;
+import static gregtech.common.items.IDMetaItem01.Shape_Slicer_Stripes;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_0;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_1;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_10;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_11;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_12;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_13;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_14;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_15;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_2;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_3;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_4;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_5;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_6;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_7;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_8;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_9;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Remover;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Remover_Empty;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_0;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_1;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_10;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_11;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_12;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_13;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_14;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_15;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_2;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_3;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_4;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_5;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_6;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_7;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_8;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_9;
+import static gregtech.common.items.IDMetaItem01.Spray_Color_Used_Remover;
+import static gregtech.common.items.IDMetaItem01.Spray_Empty;
+import static gregtech.common.items.IDMetaItem01.StableAdhesive;
+import static gregtech.common.items.IDMetaItem01.Steam_Regulator_EV;
+import static gregtech.common.items.IDMetaItem01.Steam_Regulator_HV;
+import static gregtech.common.items.IDMetaItem01.Steam_Regulator_IV;
+import static gregtech.common.items.IDMetaItem01.Steam_Regulator_LV;
+import static gregtech.common.items.IDMetaItem01.Steam_Regulator_MV;
+import static gregtech.common.items.IDMetaItem01.Steam_Valve_EV;
+import static gregtech.common.items.IDMetaItem01.Steam_Valve_HV;
+import static gregtech.common.items.IDMetaItem01.Steam_Valve_IV;
+import static gregtech.common.items.IDMetaItem01.Steam_Valve_LV;
+import static gregtech.common.items.IDMetaItem01.Steam_Valve_MV;
+import static gregtech.common.items.IDMetaItem01.SuperconductorComposite;
+import static gregtech.common.items.IDMetaItem01.Tesseract;
+import static gregtech.common.items.IDMetaItem01.Thermos_Can_Empty;
+import static gregtech.common.items.IDMetaItem01.Tool_Cheat;
+import static gregtech.common.items.IDMetaItem01.Tool_Cover_Copy_Paste;
+import static gregtech.common.items.IDMetaItem01.Tool_DataOrb;
+import static gregtech.common.items.IDMetaItem01.Tool_DataStick;
+import static gregtech.common.items.IDMetaItem01.Tool_Lighter_Invar_Empty;
+import static gregtech.common.items.IDMetaItem01.Tool_Lighter_Invar_Full;
+import static gregtech.common.items.IDMetaItem01.Tool_Lighter_Invar_Used;
+import static gregtech.common.items.IDMetaItem01.Tool_Lighter_Platinum_Empty;
+import static gregtech.common.items.IDMetaItem01.Tool_Lighter_Platinum_Full;
+import static gregtech.common.items.IDMetaItem01.Tool_Lighter_Platinum_Used;
+import static gregtech.common.items.IDMetaItem01.Tool_MatchBox_Full;
+import static gregtech.common.items.IDMetaItem01.Tool_MatchBox_Used;
+import static gregtech.common.items.IDMetaItem01.Tool_Matches;
+import static gregtech.common.items.IDMetaItem01.Tool_Scanner;
+import static gregtech.common.items.IDMetaItem01.Tool_Sonictron;
+import static gregtech.common.items.IDMetaItem01.Upgrade_Lock;
+import static gregtech.common.items.IDMetaItem01.Upgrade_Muffler;
+import static gregtech.common.items.IDMetaItem01.ZPM2;
+import static gregtech.common.items.IDMetaItem01.ZPM3;
+import static gregtech.common.items.IDMetaItem01.ZPM4;
+import static gregtech.common.items.IDMetaItem01.ZPM5;
+import static gregtech.common.items.IDMetaItem01.ZPM6;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -469,75 +469,75 @@ import net.minecraft.potion.Potion;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MathHelper;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OreDictNames;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
-import gregtech.api.enums.TC_Aspects;
+import gregtech.api.enums.TCAspects;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IItemBehaviour;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Item_X32;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedItemX32;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_FoodStat;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTFoodStat;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.common.config.other.ConfigGeneral;
-import gregtech.common.covers.GT_Cover_Arm;
-import gregtech.common.covers.GT_Cover_Chest;
-import gregtech.common.covers.GT_Cover_ControlsWork;
-import gregtech.common.covers.GT_Cover_Conveyor;
-import gregtech.common.covers.GT_Cover_Crafting;
-import gregtech.common.covers.GT_Cover_DoesWork;
-import gregtech.common.covers.GT_Cover_Drain;
-import gregtech.common.covers.GT_Cover_EUMeter;
-import gregtech.common.covers.GT_Cover_FluidLimiter;
-import gregtech.common.covers.GT_Cover_FluidRegulator;
-import gregtech.common.covers.GT_Cover_FluidStorageMonitor;
-import gregtech.common.covers.GT_Cover_Fluidfilter;
-import gregtech.common.covers.GT_Cover_ItemFilter;
-import gregtech.common.covers.GT_Cover_ItemMeter;
-import gregtech.common.covers.GT_Cover_LiquidMeter;
-import gregtech.common.covers.GT_Cover_NeedMaintainance;
-import gregtech.common.covers.GT_Cover_PlayerDetector;
-import gregtech.common.covers.GT_Cover_Pump;
-import gregtech.common.covers.GT_Cover_RedstoneReceiverExternal;
-import gregtech.common.covers.GT_Cover_RedstoneReceiverInternal;
-import gregtech.common.covers.GT_Cover_RedstoneTransmitterExternal;
-import gregtech.common.covers.GT_Cover_RedstoneTransmitterInternal;
-import gregtech.common.covers.GT_Cover_Screen;
-import gregtech.common.covers.GT_Cover_Shutter;
-import gregtech.common.covers.GT_Cover_SolarPanel;
-import gregtech.common.covers.GT_Cover_SteamRegulator;
-import gregtech.common.covers.GT_Cover_SteamValve;
-import gregtech.common.items.behaviors.Behaviour_Cover_Tool;
-import gregtech.common.items.behaviors.Behaviour_DataOrb;
-import gregtech.common.items.behaviors.Behaviour_DataStick;
-import gregtech.common.items.behaviors.Behaviour_Lighter;
-import gregtech.common.items.behaviors.Behaviour_PrintedPages;
-import gregtech.common.items.behaviors.Behaviour_Scanner;
-import gregtech.common.items.behaviors.Behaviour_SensorKit;
-import gregtech.common.items.behaviors.Behaviour_Sonictron;
-import gregtech.common.items.behaviors.Behaviour_Spray_Color;
-import gregtech.common.items.behaviors.Behaviour_Spray_Color_Remover;
-import gregtech.common.items.behaviors.Behaviour_WrittenBook;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IndustrialElectromagneticSeparator.MagnetTiers;
-
-public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
-
-    public static GT_MetaGenerated_Item_01 INSTANCE;
-    private final String mToolTipPurify = GT_LanguageManager
+import gregtech.common.covers.CoverArm;
+import gregtech.common.covers.CoverChest;
+import gregtech.common.covers.CoverControlsWork;
+import gregtech.common.covers.CoverConveyor;
+import gregtech.common.covers.CoverCrafting;
+import gregtech.common.covers.CoverDoesWork;
+import gregtech.common.covers.CoverDrain;
+import gregtech.common.covers.CoverEUMeter;
+import gregtech.common.covers.CoverFluidLimiter;
+import gregtech.common.covers.CoverFluidRegulator;
+import gregtech.common.covers.CoverFluidStorageMonitor;
+import gregtech.common.covers.CoverFluidfilter;
+import gregtech.common.covers.CoverItemFilter;
+import gregtech.common.covers.CoverItemMeter;
+import gregtech.common.covers.CoverLiquidMeter;
+import gregtech.common.covers.CoverNeedMaintainance;
+import gregtech.common.covers.CoverPlayerDetector;
+import gregtech.common.covers.CoverPump;
+import gregtech.common.covers.CoverRedstoneReceiverExternal;
+import gregtech.common.covers.CoverRedstoneReceiverInternal;
+import gregtech.common.covers.CoverRedstoneTransmitterExternal;
+import gregtech.common.covers.CoverRedstoneTransmitterInternal;
+import gregtech.common.covers.CoverScreen;
+import gregtech.common.covers.CoverShutter;
+import gregtech.common.covers.CoverSolarPanel;
+import gregtech.common.covers.CoverSteamRegulator;
+import gregtech.common.covers.CoverSteamValve;
+import gregtech.common.items.behaviors.BehaviourCoverTool;
+import gregtech.common.items.behaviors.BehaviourDataOrb;
+import gregtech.common.items.behaviors.BehaviourDataStick;
+import gregtech.common.items.behaviors.BehaviourLighter;
+import gregtech.common.items.behaviors.BehaviourPrintedPages;
+import gregtech.common.items.behaviors.BehaviourScanner;
+import gregtech.common.items.behaviors.BehaviourSensorKit;
+import gregtech.common.items.behaviors.BehaviourSonictron;
+import gregtech.common.items.behaviors.BehaviourSprayColor;
+import gregtech.common.items.behaviors.BehaviourSprayColorRemover;
+import gregtech.common.items.behaviors.BehaviourWrittenBook;
+import gregtech.common.tileentities.machines.multi.MTEIndustrialElectromagneticSeparator.MagnetTiers;
+
+public class MetaGeneratedItem01 extends MetaGeneratedItemX32 {
+
+    public static MetaGeneratedItem01 INSTANCE;
+    private final String mToolTipPurify = GTLanguageManager
         .addStringLocalization("metaitem.01.tooltip.purify", "Throw into Cauldron to get clean Dust");
     private static final String aTextEmptyRow = "   ";
     private static final String aTextShape = " P ";
@@ -558,7 +558,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         Spray_Color_Used_10.ID, Spray_Color_Used_11.ID, Spray_Color_Used_12.ID, Spray_Color_Used_13.ID,
         Spray_Color_Used_14.ID, Spray_Color_Used_15.ID };
 
-    public GT_MetaGenerated_Item_01() {
+    public MetaGeneratedItem01() {
         super(
             "metaitem.01",
             OrePrefixes.dustTiny,
@@ -596,53 +596,53 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         INSTANCE = this;
 
         ItemList.Credit_Greg_Copper
-            .set(addItem(ID_MetaItem_01.Credit_Greg_Copper.ID, "Copper GT Credit", "0.125 Credits"));
+            .set(addItem(IDMetaItem01.Credit_Greg_Copper.ID, "Copper GT Credit", "0.125 Credits"));
         ItemList.Credit_Greg_Cupronickel.set(
             addItem(
-                ID_MetaItem_01.Credit_Greg_Cupronickel.ID,
+                IDMetaItem01.Credit_Greg_Cupronickel.ID,
                 "Cupronickel GT Credit",
                 "1 Credit",
                 new ItemData(Materials.Cupronickel, 907200L)));
         ItemList.Credit_Greg_Silver.set(
             addItem(
-                ID_MetaItem_01.Credit_Greg_Silver.ID,
+                IDMetaItem01.Credit_Greg_Silver.ID,
                 "Silver GT Credit",
                 "8 Credits",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)));
-        ItemList.Credit_Greg_Gold.set(addItem(ID_MetaItem_01.Credit_Greg_Gold.ID, "Gold GT Credit", "64 Credits"));
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1L)));
+        ItemList.Credit_Greg_Gold.set(addItem(IDMetaItem01.Credit_Greg_Gold.ID, "Gold GT Credit", "64 Credits"));
         ItemList.Credit_Greg_Platinum
-            .set(addItem(ID_MetaItem_01.Credit_Greg_Platinum.ID, "Platinum GT Credit", "512 Credits"));
+            .set(addItem(IDMetaItem01.Credit_Greg_Platinum.ID, "Platinum GT Credit", "512 Credits"));
         ItemList.Credit_Greg_Osmium
-            .set(addItem(ID_MetaItem_01.Credit_Greg_Osmium.ID, "Osmium GT Credit", "4,096 Credits"));
+            .set(addItem(IDMetaItem01.Credit_Greg_Osmium.ID, "Osmium GT Credit", "4,096 Credits"));
         ItemList.Credit_Greg_Naquadah
-            .set(addItem(ID_MetaItem_01.Credit_Greg_Naquadah.ID, "Naquadah GT Credit", "32,768 Credits"));
+            .set(addItem(IDMetaItem01.Credit_Greg_Naquadah.ID, "Naquadah GT Credit", "32,768 Credits"));
         ItemList.Credit_Greg_Neutronium
-            .set(addItem(ID_MetaItem_01.Credit_Greg_Neutronium.ID, "Neutronium GT Credit", "262,144 Credits"));
+            .set(addItem(IDMetaItem01.Credit_Greg_Neutronium.ID, "Neutronium GT Credit", "262,144 Credits"));
         ItemList.Coin_Gold_Ancient.set(
             addItem(
-                ID_MetaItem_01.Coin_Gold_Ancient.ID,
+                IDMetaItem01.Coin_Gold_Ancient.ID,
                 "Ancient Gold Coin",
                 "Found in ancient Ruins",
                 new ItemData(Materials.Gold, 907200L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 8L)));
         ItemList.Coin_Doge.set(
             addItem(
-                ID_MetaItem_01.Coin_Doge.ID,
+                IDMetaItem01.Coin_Doge.ID,
                 "Doge Coin",
                 "wow much coin how money so crypto plz mine v rich very currency wow",
                 new ItemData(Materials.Brass, 907200L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1L)));
         ItemList.Coin_Chocolate.set(
             addItem(
-                ID_MetaItem_01.Coin_Chocolate.ID,
+                IDMetaItem01.Coin_Chocolate.ID,
                 "Chocolate Coin",
                 "Wrapped in Gold",
                 new ItemData(Materials.Gold, OrePrefixes.foil.mMaterialAmount),
-                new GT_FoodStat(
+                new GTFoodStat(
                     1,
                     0.1F,
                     EnumAction.eat,
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 1L),
                     true,
                     false,
                     false,
@@ -650,62 +650,60 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     200,
                     1,
                     100)));
-        ItemList.Credit_Copper
-            .set(addItem(ID_MetaItem_01.Credit_Copper.ID, "Industrial Copper Credit", "0.125 Credits"));
+        ItemList.Credit_Copper.set(addItem(IDMetaItem01.Credit_Copper.ID, "Industrial Copper Credit", "0.125 Credits"));
 
         ItemList.Credit_Silver.set(
             addItem(
-                ID_MetaItem_01.Credit_Silver.ID,
+                IDMetaItem01.Credit_Silver.ID,
                 "Industrial Silver Credit",
                 "8 Credits",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)));
-        ItemList.Credit_Gold.set(addItem(ID_MetaItem_01.Credit_Gold.ID, "Industrial Gold Credit", "64 Credits"));
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1L)));
+        ItemList.Credit_Gold.set(addItem(IDMetaItem01.Credit_Gold.ID, "Industrial Gold Credit", "64 Credits"));
         ItemList.Credit_Platinum
-            .set(addItem(ID_MetaItem_01.Credit_Platinum.ID, "Industrial Platinum Credit", "512 Credits"));
-        ItemList.Credit_Osmium
-            .set(addItem(ID_MetaItem_01.Credit_Osmium.ID, "Industrial Osmium Credit", "4096 Credits"));
+            .set(addItem(IDMetaItem01.Credit_Platinum.ID, "Industrial Platinum Credit", "512 Credits"));
+        ItemList.Credit_Osmium.set(addItem(IDMetaItem01.Credit_Osmium.ID, "Industrial Osmium Credit", "4096 Credits"));
 
         ItemList.Component_Minecart_Wheels_Iron.set(
             addItem(
                 Component_Minecraft_Wheels_Iron.ID,
                 "Iron Minecart Wheels",
                 "To get things rolling",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L)));
         ItemList.Component_Minecart_Wheels_Steel.set(
             addItem(
                 Component_Minecraft_Wheels_Steel.ID,
                 "Steel Minecart Wheels",
                 "To get things rolling",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L)));
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Component_Minecart_Wheels_Iron.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { " h ", "RSR", " w ", 'R', OrePrefixes.ring.get(Materials.AnyIron), 'S',
                 OrePrefixes.stick.get(Materials.AnyIron) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Component_Minecart_Wheels_Steel.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { " h ", "RSR", " w ", 'R', OrePrefixes.ring.get(Materials.Steel), 'S',
                 OrePrefixes.stick.get(Materials.Steel) });
 
         ItemList.CompressedFireclay.set(addItem(Compressed_Fireclay.ID, "Compressed Fireclay", "Brick-shaped"));
-        GT_OreDictUnificator.addItemDataFromInputs(ItemList.CompressedFireclay.get(1), Materials.Fireclay.getDust(1));
+        GTOreDictUnificator.addItemDataFromInputs(ItemList.CompressedFireclay.get(1), Materials.Fireclay.getDust(1));
 
         ItemList.Firebrick.set(addItem(Firebrick.ID, "Firebrick", "Heat resistant"));
-        GT_OreDictUnificator.addItemDataFromInputs(ItemList.Firebrick.get(1), Materials.Fireclay.getDust(1));
+        GTOreDictUnificator.addItemDataFromInputs(ItemList.Firebrick.get(1), Materials.Fireclay.getDust(1));
 
         ItemList.Shape_Empty.set(
             addItem(
                 Shape_Empty.ID,
                 "Empty Shape Plate",
                 "Raw Plate to make Molds and Extruder Shapes",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L)));
 
         ItemList.Shape_Mold_Plate.set(addItem(Shape_Mold_Plate.ID, "Mold (Plate)", "Mold for making Plates"));
         ItemList.Shape_Mold_Casing.set(addItem(Shape_Mold_Casing.ID, "Mold (Casing)", "Mold for making Item Casings"));
@@ -838,16 +836,16 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Empty Plastic Fuel Can",
                 "Used to store Fuels",
                 new ItemData(Materials.Plastic, OrePrefixes.plate.mMaterialAmount * 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 1L)));
         ItemList.Fuel_Can_Plastic_Filled.set(
             addItem(
                 Fuel_Can_Plastic_Filled.ID,
                 "Plastic Fuel Can",
                 "Burns well in Diesel Generators",
                 new ItemData(Materials.Plastic, OrePrefixes.plate.mMaterialAmount * 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 1L)));
 
         ItemList.Spray_Empty.set(
             addItem(
@@ -859,8 +857,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     OrePrefixes.plate.mMaterialAmount * 2L,
                     Materials.Redstone,
                     OrePrefixes.dust.mMaterialAmount),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 1L)));
 
         ItemList.Crate_Empty.set(
             addItem(
@@ -868,8 +866,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Empty Crate",
                 "To Package lots of Material",
                 new ItemData(Materials.Wood, 3628800L, Materials.Iron, OrePrefixes.screw.mMaterialAmount),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 2L)));
 
         ItemList.ThermosCan_Empty.set(
             addItem(
@@ -879,9 +877,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 new ItemData(
                     Materials.Aluminium,
                     OrePrefixes.plateDouble.mMaterialAmount * 1L + 2L * OrePrefixes.ring.mMaterialAmount),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L)));
 
         ItemList.Large_Fluid_Cell_Steel.set(
             addItem(
@@ -892,8 +890,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     Materials.Steel,
                     OrePrefixes.plateDouble.mMaterialAmount * 4L,
                     new MaterialStack(Materials.Bronze, OrePrefixes.ring.mMaterialAmount * 4L)),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 2L)));
 
         ItemList.Large_Fluid_Cell_TungstenSteel.set(
             addItem(
@@ -904,8 +902,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     Materials.TungstenSteel,
                     OrePrefixes.plateDouble.mMaterialAmount * 4L,
                     new MaterialStack(Materials.Platinum, OrePrefixes.ring.mMaterialAmount * 4L)),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 9L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 7L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 9L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 7L)));
 
         ItemList.Large_Fluid_Cell_Aluminium.set(
             addItem(
@@ -916,8 +914,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     Materials.Aluminium,
                     OrePrefixes.plateDouble.mMaterialAmount * 4L,
                     new MaterialStack(Materials.Silver, OrePrefixes.ring.mMaterialAmount * 4L)),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 5L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 3L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 5L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 3L)));
 
         ItemList.Large_Fluid_Cell_StainlessSteel.set(
             addItem(
@@ -928,8 +926,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     Materials.StainlessSteel,
                     OrePrefixes.plateDouble.mMaterialAmount * 4L,
                     new MaterialStack(Materials.Electrum, OrePrefixes.ring.mMaterialAmount * 4L)),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 6L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 6L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 4L)));
 
         ItemList.Large_Fluid_Cell_Titanium.set(
             addItem(
@@ -940,8 +938,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     Materials.Titanium,
                     OrePrefixes.plateDouble.mMaterialAmount * 4L,
                     new MaterialStack(Materials.RoseGold, OrePrefixes.ring.mMaterialAmount * 4L)),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 7L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 5L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 7L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 5L)));
 
         ItemList.Large_Fluid_Cell_Chrome.set(
             addItem(
@@ -952,8 +950,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     Materials.Chrome,
                     OrePrefixes.plateDouble.mMaterialAmount * 4L,
                     new MaterialStack(Materials.Palladium, OrePrefixes.ring.mMaterialAmount * 4L)),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 6L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 6L)));
 
         ItemList.Large_Fluid_Cell_Iridium.set(
             addItem(
@@ -964,8 +962,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     Materials.Iridium,
                     OrePrefixes.plateDouble.mMaterialAmount * 4L,
                     new MaterialStack(Materials.Naquadah, OrePrefixes.ring.mMaterialAmount * 4L)),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 8L)));
 
         ItemList.Large_Fluid_Cell_Osmium.set(
             addItem(
@@ -976,8 +974,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     Materials.Osmium,
                     OrePrefixes.plateDouble.mMaterialAmount * 4L,
                     new MaterialStack(Materials.ElectrumFlux, OrePrefixes.ring.mMaterialAmount * 4L)),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 11L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 9L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 11L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 9L)));
 
         ItemList.Large_Fluid_Cell_Neutronium.set(
             addItem(
@@ -988,8 +986,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     Materials.Neutronium,
                     OrePrefixes.plateDouble.mMaterialAmount * 4L,
                     new MaterialStack(Materials.Draconium, OrePrefixes.ring.mMaterialAmount * 4L)),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 12L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 10L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 12L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 10L)));
 
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             ItemList.SPRAY_CAN_DYES[i].set(
@@ -997,13 +995,13 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     Spray_Colors[i],
                     "Spray Can (" + Dyes.get(i).mName + ")",
                     "Full",
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 4L)));
+                    new TCAspects.TC_AspectStack(TCAspects.SENSUS, 4L)));
             ItemList.SPRAY_CAN_DYES_USED[i].set(
                 addItem(
                     Spray_Colors_Used[i],
                     "Spray Can (" + Dyes.get(i).mName + ")",
                     "Used",
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 3L),
+                    new TCAspects.TC_AspectStack(TCAspects.SENSUS, 3L),
                     SubTag.INVISIBLE));
         }
 
@@ -1012,15 +1010,15 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Spray_Color_Remover.ID,
                 "Spray Can Solvent",
                 "Full",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 8L)));
         ItemList.Spray_Color_Used_Remover.set(
             addItem(
                 Spray_Color_Used_Remover.ID,
                 "Spray Can Solvent",
                 "Used",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 6L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 6L),
                 SubTag.INVISIBLE));
 
         ItemList.Spray_Color_Remover_Empty.set(
@@ -1033,24 +1031,24 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     OrePrefixes.plateDouble.mMaterialAmount * 4L,
                     Materials.Redstone,
                     OrePrefixes.dust.mMaterialAmount),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 1L)));
 
         ItemList.Tool_Matches.set(
             addItem(
                 Tool_Matches.ID,
                 "Match",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L)));
 
         ItemList.Tool_MatchBox_Used.set(
             addItem(
                 Tool_MatchBox_Used.ID,
                 "Match Box",
                 "This is not a Car",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L),
                 SubTag.INVISIBLE));
 
         ItemList.Tool_MatchBox_Full.set(
@@ -1058,8 +1056,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Tool_MatchBox_Full.ID,
                 "Match Box (Full)",
                 "This is not a Car",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2L)));
 
         ItemList.Tool_Lighter_Invar_Empty.set(
             addItem(
@@ -1067,16 +1065,16 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Lighter (Empty)",
                 "",
                 new ItemData(Materials.Invar, OrePrefixes.plate.mMaterialAmount * 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L)));
         ItemList.Tool_Lighter_Invar_Used.set(
             addItem(
                 Tool_Lighter_Invar_Used.ID,
                 "Lighter",
                 "",
                 new ItemData(Materials.Invar, OrePrefixes.plate.mMaterialAmount * 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L),
                 SubTag.INVISIBLE));
         ItemList.Tool_Lighter_Invar_Full.set(
             addItem(
@@ -1084,8 +1082,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Lighter (Full)",
                 "",
                 new ItemData(Materials.Invar, OrePrefixes.plate.mMaterialAmount * 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2L)));
 
         ItemList.Tool_Lighter_Platinum_Empty.set(
             addItem(
@@ -1093,18 +1091,18 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Platinum Lighter (Empty)",
                 "A known Prank Master is engraved on it",
                 new ItemData(Materials.Platinum, OrePrefixes.plate.mMaterialAmount * 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L)));
         ItemList.Tool_Lighter_Platinum_Used.set(
             addItem(
                 Tool_Lighter_Platinum_Used.ID,
                 "Platinum Lighter",
                 "A known Prank Master is engraved on it",
                 new ItemData(Materials.Platinum, OrePrefixes.plate.mMaterialAmount * 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L),
                 SubTag.INVISIBLE));
         ItemList.Tool_Lighter_Platinum_Full.set(
             addItem(
@@ -1112,9 +1110,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Platinum Lighter (Full)",
                 "A known Prank Master is engraved on it",
                 new ItemData(Materials.Platinum, OrePrefixes.plate.mMaterialAmount * 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2L)));
 
         ItemList.Ingot_Heavy1
             .set(addItem(Ingot_Heavy1.ID, "Heavy Duty Alloy Ingot T1", "Used to make Heavy Duty Plates T1"));
@@ -1128,8 +1126,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Ingot_Iridium_Alloy.ID,
                 "Iridium Alloy Ingot",
                 "Used to make Iridium Plates",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L)));
 
         ItemList.Paper_Printed_Pages.set(
             addItem(
@@ -1137,8 +1135,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Printed Pages",
                 "Used to make written Books",
                 new ItemData(Materials.Paper, 10886400L),
-                new Behaviour_PrintedPages(),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)));
+                new BehaviourPrintedPages(),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 2L)));
         ItemList.Paper_Magic_Empty.set(
             addItem(
                 Paper_Magic_Empty.ID,
@@ -1146,8 +1144,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "",
                 SubTag.INVISIBLE,
                 new ItemData(Materials.Paper, 3628800L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1L)));
         ItemList.Paper_Magic_Page.set(
             addItem(
                 Paper_Magic_Page.ID,
@@ -1155,8 +1153,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "",
                 SubTag.INVISIBLE,
                 new ItemData(Materials.Paper, 3628800L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 2L)));
         ItemList.Paper_Magic_Pages.set(
             addItem(
                 Paper_Magic_Pages.ID,
@@ -1164,8 +1162,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "",
                 SubTag.INVISIBLE,
                 new ItemData(Materials.Paper, 10886400L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 4L)));
         ItemList.Paper_Punch_Card_Empty.set(
             addItem(
                 Paper_Punch_Card_Empty.ID,
@@ -1173,7 +1171,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "",
                 SubTag.INVISIBLE,
                 new ItemData(Materials.Paper, 7257600L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1L)));
         ItemList.Paper_Punch_Card_Encoded.set(
             addItem(
                 Paper_Punch_Card_Encoded.ID,
@@ -1181,7 +1179,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "",
                 SubTag.INVISIBLE,
                 new ItemData(Materials.Paper, 7257600L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 2L)));
         ItemList.Book_Written_01.set(
             addItem(
                 Book_Written_01.ID,
@@ -1190,8 +1188,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 new ItemData(Materials.Paper, 10886400L),
                 "bookWritten",
                 OreDictNames.craftingBook,
-                new Behaviour_WrittenBook(),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)));
+                new BehaviourWrittenBook(),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 2L)));
         ItemList.Book_Written_02.set(
             addItem(
                 Book_Written_02.ID,
@@ -1200,8 +1198,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 new ItemData(Materials.Paper, 10886400L),
                 "bookWritten",
                 OreDictNames.craftingBook,
-                new Behaviour_WrittenBook(),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)));
+                new BehaviourWrittenBook(),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 2L)));
         ItemList.Book_Written_03.set(
             addItem(
                 Book_Written_03.ID,
@@ -1210,8 +1208,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 new ItemData(Materials.Paper, 10886400L),
                 "bookWritten",
                 OreDictNames.craftingBook,
-                new Behaviour_WrittenBook(),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)));
+                new BehaviourWrittenBook(),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 2L)));
 
         ItemList.Schematic.set(
             addItem(
@@ -1219,47 +1217,47 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Schematic",
                 "EMPTY",
                 new ItemData(Materials.Steel, 7257600L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 1L)));
         ItemList.Schematic_Crafting.set(
             addItem(
                 Schematic_Crafting.ID,
                 "Schematic (Crafting)",
                 "Crafts the Programmed Recipe",
                 new ItemData(Materials.Steel, 7257600L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 1L)));
         ItemList.Schematic_1by1.set(
             addItem(
                 Schematic_1by1.ID,
                 "Schematic (1x1)",
                 "Crafts 1 Items as 1x1 (use in Packager)",
                 new ItemData(Materials.Steel, 7257600L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 1L)));
         ItemList.Schematic_2by2.set(
             addItem(
                 Schematic_2by2.ID,
                 "Schematic (2x2)",
                 "Crafts 4 Items as 2x2 (use in Packager)",
                 new ItemData(Materials.Steel, 7257600L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 1L)));
         ItemList.Schematic_3by3.set(
             addItem(
                 Schematic_3by3.ID,
                 "Schematic (3x3)",
                 "Crafts 9 Items as 3x3 (use in Packager)",
                 new ItemData(Materials.Steel, 7257600L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 1L)));
         ItemList.Schematic_Dust.set(
             addItem(
                 Schematic_Dust.ID,
                 "Schematic (Dusts)",
                 "Combines Dusts (use in Packager)",
                 new ItemData(Materials.Steel, 7257600L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 1L)));
 
         ItemList.Battery_Hull_LV.set(
             addItem(
@@ -1267,27 +1265,27 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Small Battery Hull",
                 "An empty LV Battery Hull",
                 new ItemData(Materials.BatteryAlloy, OrePrefixes.plate.mMaterialAmount * 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L)));
         ItemList.Battery_Hull_MV.set(
             addItem(
                 Battery_Hull_MV.ID,
                 "Medium Battery Hull",
                 "An empty MV Battery Hull",
                 new ItemData(Materials.BatteryAlloy, OrePrefixes.plate.mMaterialAmount * 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L)));
         ItemList.Battery_Hull_HV.set(
             addItem(
                 Battery_Hull_HV.ID,
                 "Large Battery Hull",
                 "An empty HV Battery Hull",
                 new ItemData(Materials.BatteryAlloy, OrePrefixes.plate.mMaterialAmount * 9L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1L)));
 
         // ULV Batteries
         ItemList.Battery_RE_ULV_Tantalum.set(
@@ -1296,9 +1294,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Tantalum Capacitor",
                 "Reusable",
                 "batteryULV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L)));
 
         // LV Batteries
         ItemList.Battery_SU_LV_SulfuricAcid.set(
@@ -1307,27 +1305,27 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Small Acid Battery",
                 "Single Use",
                 "batteryLV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2L)));
 
         ItemList.Battery_SU_LV_Mercury.set(
             addItem(
                 Battery_SU_LV_Mercury.ID,
                 "Small Mercury Battery",
                 "Single Use",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2L)));
 
         ItemList.Battery_RE_LV_Cadmium.set(
             addItem(
                 Battery_RE_LV_Cadmium.ID,
                 "Small Cadmium Battery",
                 "Reusable",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L),
                 "batteryLV"));
 
         ItemList.Battery_RE_LV_Lithium.set(
@@ -1335,9 +1333,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Battery_RE_LV_Lithium.ID,
                 "Small Lithium Battery",
                 "Reusable",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L),
                 "batteryLV"));
 
         ItemList.Battery_RE_LV_Sodium.set(
@@ -1345,9 +1343,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Battery_RE_LV_Sodium.ID,
                 "Small Sodium Battery",
                 "Reusable",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L),
                 "batteryLV"));
 
         // MV Batteries
@@ -1357,9 +1355,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Medium Acid Battery",
                 "Single Use",
                 "batteryMV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 4L)));
 
         ItemList.Battery_SU_MV_Mercury.set(
             addItem(
@@ -1367,9 +1365,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Medium Mercury Battery",
                 "Single Use",
                 "batteryMV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 4L)));
 
         ItemList.Battery_RE_MV_Cadmium.set(
             addItem(
@@ -1377,9 +1375,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Medium Cadmium Battery",
                 "Reusable",
                 "batteryMV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2L)));
 
         ItemList.Battery_RE_MV_Lithium.set(
             addItem(
@@ -1387,9 +1385,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Medium Lithium Battery",
                 "Reusable",
                 "batteryMV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2L)));
 
         ItemList.Battery_RE_MV_Sodium.set(
             addItem(
@@ -1397,9 +1395,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Medium Sodium Battery",
                 "Reusable",
                 "batteryMV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2L)));
 
         // HV Batteries
         ItemList.Battery_SU_HV_SulfuricAcid.set(
@@ -1408,9 +1406,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Large Acid Battery",
                 "Single Use",
                 "batteryHV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 8L)));
 
         ItemList.Battery_SU_HV_Mercury.set(
             addItem(
@@ -1418,9 +1416,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Large Mercury Battery",
                 "Single Use",
                 "batteryHV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 8L)));
 
         ItemList.Battery_RE_HV_Cadmium.set(
             addItem(
@@ -1428,9 +1426,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Large Cadmium Battery",
                 "Reusable",
                 "batteryHV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 4L)));
 
         ItemList.Battery_RE_HV_Lithium.set(
             addItem(
@@ -1438,9 +1436,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Large Lithium Battery",
                 "Reusable",
                 "batteryHV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 4L)));
 
         ItemList.Battery_RE_HV_Sodium.set(
             addItem(
@@ -1448,9 +1446,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Large Sodium Battery",
                 "Reusable",
                 "batteryHV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 4L)));
 
         // IV Battery
         ItemList.Energy_LapotronicOrb.set(
@@ -1458,21 +1456,21 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Energy_Lapotronic_Orb.ID,
                 "Lapotronic Energy Orb",
                 "Reusable battery",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 16L),
                 OrePrefixes.battery.get(Materials.IV)));
 
         // ZPM Module
         ItemList.ZPM.set(
             addItem(
-                ID_MetaItem_01.ZPM.ID,
+                IDMetaItem01.ZPM.ID,
                 "Zero Point Module",
                 "Single use battery",
                 "batteryZPM",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L)));
 
         // LuV Lapotron orb cluster battery
         ItemList.Energy_LapotronicOrb2.set(
@@ -1480,9 +1478,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Energy_Lapotronic_orb_2.ID,
                 "Lapotronic Energy Orb Cluster",
                 "Reusable battery",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 16L),
                 OrePrefixes.battery.get(Materials.LuV)));
 
         // UV Battery
@@ -1492,9 +1490,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Ultimate Battery",
                 "Fill this to win minecraft",
                 "batteryUV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L)));
 
         // UMV Battery
         ItemList.ZPM3.set(
@@ -1503,9 +1501,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Really Ultimate Battery",
                 "Fill this to be way older",
                 "batteryUMV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L)));
 
         // UXV Battery
         ItemList.ZPM4.set(
@@ -1514,9 +1512,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Extremely Ultimate Battery",
                 "Fill this to be older",
                 "batteryUXV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L)));
 
         // MAX Battery
         ItemList.ZPM5.set(
@@ -1525,9 +1523,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Insanely Ultimate Battery",
                 "Fill this for fun",
                 "batteryMAX",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L)));
 
         // ERROR Battery
         ItemList.ZPM6.set(
@@ -1536,9 +1534,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Mega Ultimate Battery",
                 "Fill the capacitor to reach enlightenment",
                 "batteryERV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L)));
 
         // ZPM Cluster
         ItemList.Energy_Module.set(
@@ -1546,9 +1544,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Energy_Module.ID,
                 "Energy Module",
                 "Reusable battery",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 16L),
                 OrePrefixes.battery.get(Materials.ZPM)));
 
         // UV Cluster
@@ -1557,9 +1555,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Energy_Cluster.ID,
                 "Energy Cluster",
                 "Reusable battery",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L),
                 OrePrefixes.battery.get(Materials.UV)));
 
         // UIV, UMV, UXV and MAX component textures backported from gregicality.
@@ -1568,153 +1566,153 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Electric_Motor_LV.ID,
                 "Electric Motor (LV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 1L)));
         ItemList.Electric_Motor_MV.set(
             addItem(
                 Electric_Motor_MV.ID,
                 "Electric Motor (MV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2L)));
         ItemList.Electric_Motor_HV.set(
             addItem(
                 Electric_Motor_HV.ID,
                 "Electric Motor (HV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 4L)));
         ItemList.Electric_Motor_EV.set(
             addItem(
                 Electric_Motor_EV.ID,
                 "Electric Motor (EV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 8L)));
         ItemList.Electric_Motor_IV.set(
             addItem(
                 Electric_Motor_IV.ID,
                 "Electric Motor (IV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 16L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 16L)));
         ItemList.Electric_Motor_LuV.set(
             addItem(
                 Electric_Motor_LuV.ID,
                 "Electric Motor (LuV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 32L)));
         ItemList.Electric_Motor_ZPM.set(
             addItem(
                 Electric_Motor_ZPM.ID,
                 "Electric Motor (ZPM)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 64L)));
         ItemList.Electric_Motor_UV.set(
             addItem(
                 Electric_Motor_UV.ID,
                 "Electric Motor (UV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 128L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 128L)));
         ItemList.Electric_Motor_UHV.set(
             addItem(
                 Electric_Motor_UHV.ID,
                 "Electric Motor (UHV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 256L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 256L)));
         ItemList.Electric_Motor_UEV.set(
             addItem(
                 Electric_Motor_UEV.ID,
                 "Electric Motor (UEV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L)));
         ItemList.Electric_Motor_UIV.set(
             addItem(
                 Electric_Motor_UIV.ID,
                 "Electric Motor (UIV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L)));
         ItemList.Electric_Motor_UMV.set(
             addItem(
                 Electric_Motor_UMV.ID,
                 "Electric Motor (UMV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L)));
         ItemList.Electric_Motor_UXV.set(
             addItem(
                 Electric_Motor_UXV.ID,
                 "Electric Motor (UXV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L)));
         ItemList.Electric_Motor_MAX.set(
             addItem(
                 Electric_Motor_MAX.ID,
                 "Electric Motor (MAX)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L)));
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_LV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.IronMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.AnyIron), 'W', OrePrefixes.wireGt01.get(Materials.AnyCopper), 'C',
                 OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_LV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.SteelMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.Steel), 'W', OrePrefixes.wireGt01.get(Materials.AnyCopper), 'C',
                 OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_MV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.SteelMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.Aluminium), 'W', OrePrefixes.wireGt02.get(Materials.Cupronickel), 'C',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_HV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.SteelMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.StainlessSteel), 'W', OrePrefixes.wireGt04.get(Materials.Electrum), 'C',
                 OrePrefixes.cableGt02.get(Materials.Silver) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_EV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.NeodymiumMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.Titanium), 'W', OrePrefixes.wireGt04.get(Materials.BlackSteel), 'C',
                 OrePrefixes.cableGt02.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_IV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.NeodymiumMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.TungstenSteel), 'W', OrePrefixes.wireGt04.get(Materials.Graphene), 'C',
                 OrePrefixes.cableGt02.get(Materials.Tungsten) });
@@ -1724,355 +1722,348 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 414,
                 "Lump of Electronics",
                 "How did they even produce this?",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 1L)));
 
         ItemList.Tesseract.set(
             addItem(
                 Tesseract.ID,
                 "Raw Tesseract",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 1L)));
         ItemList.GigaChad.set(
             addItem(
                 GigaChad.ID,
                 "Giga Chad Token",
                 "You are worthy",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1000L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1000L)));
         ItemList.EnergisedTesseract.set(
             addItem(
                 EnergisedTesseract.ID,
                 "Energised Tesseract",
                 "Higher dimensional engineering",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 1L)));
 
         ItemList.Electric_Piston_LV.set(
             addItem(
                 Electric_Piston_LV.ID,
                 "Electric Piston (LV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 1L)));
         ItemList.Electric_Piston_MV.set(
             addItem(
                 Electric_Piston_MV.ID,
                 "Electric Piston (MV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2L)));
         ItemList.Electric_Piston_HV.set(
             addItem(
                 Electric_Piston_HV.ID,
                 "Electric Piston (HV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 4L)));
         ItemList.Electric_Piston_EV.set(
             addItem(
                 Electric_Piston_EV.ID,
                 "Electric Piston (EV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 8L)));
         ItemList.Electric_Piston_IV.set(
             addItem(
                 Electric_Piston_IV.ID,
                 "Electric Piston (IV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 16L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 16L)));
         ItemList.Electric_Piston_LuV.set(
             addItem(
                 Electric_Piston_LuV.ID,
                 "Electric Piston (LuV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 32L)));
         ItemList.Electric_Piston_ZPM.set(
             addItem(
                 Electric_Piston_ZPM.ID,
                 "Electric Piston (ZPM)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 64L)));
         ItemList.Electric_Piston_UV.set(
             addItem(
                 Electric_Piston_UV.ID,
                 "Electric Piston (UV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 128L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 128L)));
         ItemList.Electric_Piston_UHV.set(
             addItem(
                 Electric_Piston_UHV.ID,
                 "Electric Piston (UHV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 256L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 256L)));
         ItemList.Electric_Piston_UEV.set(
             addItem(
                 Electric_Piston_UEV.ID,
                 "Electric Piston (UEV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L)));
         ItemList.Electric_Piston_UIV.set(
             addItem(
                 Electric_Piston_UIV.ID,
                 "Electric Piston (UIV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L)));
         ItemList.Electric_Piston_UMV.set(
             addItem(
                 Electric_Piston_UMV.ID,
                 "Electric Piston (UMV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L)));
         ItemList.Electric_Piston_UXV.set(
             addItem(
                 Electric_Piston_UXV.ID,
                 "Electric Piston (UXV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L)));
         ItemList.Electric_Piston_MAX.set(
             addItem(
                 Electric_Piston_MAX.ID,
                 "Electric Piston (MAX)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L)));
 
         ItemList.Electric_Pump_LV.set(
             addItem(
                 Electric_Pump_LV.ID,
                 "Electric Pump (LV)",
-                GT_Utility.formatNumbers(32) + PartCoverText + GT_Utility.formatNumbers(32 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L)));
+                GTUtility.formatNumbers(32) + PartCoverText + GTUtility.formatNumbers(32 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L)));
         ItemList.Electric_Pump_MV.set(
             addItem(
                 Electric_Pump_MV.ID,
                 "Electric Pump (MV)",
-                GT_Utility.formatNumbers(128) + PartCoverText + GT_Utility.formatNumbers(128 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));
+                GTUtility.formatNumbers(128) + PartCoverText + GTUtility.formatNumbers(128 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 2L)));
         ItemList.Electric_Pump_HV.set(
             addItem(
                 Electric_Pump_HV.ID,
                 "Electric Pump (HV)",
-                GT_Utility.formatNumbers(512) + PartCoverText + GT_Utility.formatNumbers(512 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L)));
+                GTUtility.formatNumbers(512) + PartCoverText + GTUtility.formatNumbers(512 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 4L)));
         ItemList.Electric_Pump_EV.set(
             addItem(
                 Electric_Pump_EV.ID,
                 "Electric Pump (EV)",
-                GT_Utility.formatNumbers(2048) + PartCoverText + GT_Utility.formatNumbers(2048 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 8L)));
+                GTUtility.formatNumbers(2048) + PartCoverText + GTUtility.formatNumbers(2048 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 8L)));
         ItemList.Electric_Pump_IV.set(
             addItem(
                 Electric_Pump_IV.ID,
                 "Electric Pump (IV)",
-                GT_Utility.formatNumbers(8192) + PartCoverText + GT_Utility.formatNumbers(8192 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 16L)));
+                GTUtility.formatNumbers(8192) + PartCoverText + GTUtility.formatNumbers(8192 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 16L)));
         ItemList.Electric_Pump_LuV.set(
             addItem(
                 Electric_Pump_LuV.ID,
                 "Electric Pump (LuV)",
-                GT_Utility.formatNumbers(32768) + PartCoverText + GT_Utility.formatNumbers(32768 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 32L)));
+                GTUtility.formatNumbers(32768) + PartCoverText + GTUtility.formatNumbers(32768 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 32L)));
         ItemList.Electric_Pump_ZPM.set(
             addItem(
                 Electric_Pump_ZPM.ID,
                 "Electric Pump (ZPM)",
-                GT_Utility.formatNumbers(131072) + PartCoverText
-                    + GT_Utility.formatNumbers(131072 * 20)
-                    + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 64L)));
+                GTUtility.formatNumbers(131072) + PartCoverText + GTUtility.formatNumbers(131072 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 64L)));
         ItemList.Electric_Pump_UV.set(
             addItem(
                 Electric_Pump_UV.ID,
                 "Electric Pump (UV)",
-                GT_Utility.formatNumbers(524288) + PartCoverText
-                    + GT_Utility.formatNumbers(524288 * 20)
-                    + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 128L)));
+                GTUtility.formatNumbers(524288) + PartCoverText + GTUtility.formatNumbers(524288 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 128L)));
         ItemList.Electric_Pump_UHV.set(
             addItem(
                 Electric_Pump_UHV.ID,
                 "Electric Pump (UHV)",
-                GT_Utility.formatNumbers(1048576) + PartCoverText
-                    + GT_Utility.formatNumbers(1048576 * 20)
+                GTUtility.formatNumbers(1048576) + PartCoverText
+                    + GTUtility.formatNumbers(1048576 * 20)
                     + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 256L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 256L)));
         ItemList.Electric_Pump_UEV.set(
             addItem(
                 Electric_Pump_UEV.ID,
                 "Electric Pump (UEV)",
-                GT_Utility.formatNumbers(2097152) + PartCoverText
-                    + GT_Utility.formatNumbers(2097152 * 20)
+                GTUtility.formatNumbers(2097152) + PartCoverText
+                    + GTUtility.formatNumbers(2097152 * 20)
                     + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 512L)));
         ItemList.Electric_Pump_UIV.set(
             addItem(
                 Electric_Pump_UIV.ID,
                 "Electric Pump (UIV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 512L)));
         ItemList.Electric_Pump_UMV.set(
             addItem(
                 Electric_Pump_UMV.ID,
                 "Electric Pump (UMV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 512L)));
         ItemList.Electric_Pump_UXV.set(
             addItem(
                 Electric_Pump_UXV.ID,
                 "Electric Pump (UXV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 512L)));
         ItemList.Electric_Pump_MAX.set(
             addItem(
                 Electric_Pump_MAX.ID,
                 "Electric Pump (MAX)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 512L)));
 
         ItemList.Steam_Valve_LV.set(
             addItem(
                 Steam_Valve_LV.ID,
                 "Steam Valve (LV)",
-                GT_Utility.formatNumbers(1024) + PartCoverText + GT_Utility.formatNumbers(1024 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L)));
+                GTUtility.formatNumbers(1024) + PartCoverText + GTUtility.formatNumbers(1024 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L)));
         ItemList.Steam_Valve_MV.set(
             addItem(
                 Steam_Valve_MV.ID,
                 "Steam Valve (MV)",
-                GT_Utility.formatNumbers(2048) + PartCoverText + GT_Utility.formatNumbers(2048 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));
+                GTUtility.formatNumbers(2048) + PartCoverText + GTUtility.formatNumbers(2048 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 2L)));
         ItemList.Steam_Valve_HV.set(
             addItem(
                 Steam_Valve_HV.ID,
                 "Steam Valve (HV)",
-                GT_Utility.formatNumbers(4096) + PartCoverText + GT_Utility.formatNumbers(4096 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L)));
+                GTUtility.formatNumbers(4096) + PartCoverText + GTUtility.formatNumbers(4096 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 4L)));
         ItemList.Steam_Valve_EV.set(
             addItem(
                 Steam_Valve_EV.ID,
                 "Steam Valve (EV)",
-                GT_Utility.formatNumbers(8192) + PartCoverText + GT_Utility.formatNumbers(8192 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 8L)));
+                GTUtility.formatNumbers(8192) + PartCoverText + GTUtility.formatNumbers(8192 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 8L)));
         ItemList.Steam_Valve_IV.set(
             addItem(
                 Steam_Valve_IV.ID,
                 "Steam Valve (IV)",
-                GT_Utility.formatNumbers(16384) + PartCoverText + GT_Utility.formatNumbers(16384 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 16L)));
+                GTUtility.formatNumbers(16384) + PartCoverText + GTUtility.formatNumbers(16384 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 16L)));
 
         ItemList.FluidRegulator_LV.set(
-            addItem(FluidRegulator_LV.ID, "Fluid Regulator (LV)", FRText1 + GT_Utility.formatNumbers(640) + FRText2));
+            addItem(FluidRegulator_LV.ID, "Fluid Regulator (LV)", FRText1 + GTUtility.formatNumbers(640) + FRText2));
         ItemList.FluidRegulator_MV.set(
-            addItem(FluidRegulator_MV.ID, "Fluid Regulator (MV)", FRText1 + GT_Utility.formatNumbers(2560) + FRText2));
+            addItem(FluidRegulator_MV.ID, "Fluid Regulator (MV)", FRText1 + GTUtility.formatNumbers(2560) + FRText2));
         ItemList.FluidRegulator_HV.set(
-            addItem(FluidRegulator_HV.ID, "Fluid Regulator (HV)", FRText1 + GT_Utility.formatNumbers(10240) + FRText2));
+            addItem(FluidRegulator_HV.ID, "Fluid Regulator (HV)", FRText1 + GTUtility.formatNumbers(10240) + FRText2));
         ItemList.FluidRegulator_EV.set(
-            addItem(FluidRegulator_EV.ID, "Fluid Regulator (EV)", FRText1 + GT_Utility.formatNumbers(40960) + FRText2));
+            addItem(FluidRegulator_EV.ID, "Fluid Regulator (EV)", FRText1 + GTUtility.formatNumbers(40960) + FRText2));
         ItemList.FluidRegulator_IV.set(
-            addItem(
-                FluidRegulator_IV.ID,
-                "Fluid Regulator (IV)",
-                FRText1 + GT_Utility.formatNumbers(163840) + FRText2));
+            addItem(FluidRegulator_IV.ID, "Fluid Regulator (IV)", FRText1 + GTUtility.formatNumbers(163840) + FRText2));
         ItemList.FluidRegulator_LuV.set(
             addItem(
                 FluidRegulator_LuV.ID,
                 "Fluid Regulator (LuV)",
-                FRText1 + GT_Utility.formatNumbers(655360) + FRText2));
+                FRText1 + GTUtility.formatNumbers(655360) + FRText2));
         ItemList.FluidRegulator_ZPM.set(
             addItem(
                 FluidRegulator_ZPM.ID,
                 "Fluid Regulator (ZPM)",
-                FRText1 + GT_Utility.formatNumbers(2621440) + FRText2));
+                FRText1 + GTUtility.formatNumbers(2621440) + FRText2));
         ItemList.FluidRegulator_UV.set(
             addItem(
                 FluidRegulator_UV.ID,
                 "Fluid Regulator (UV)",
-                FRText1 + GT_Utility.formatNumbers(10485760) + FRText2));
+                FRText1 + GTUtility.formatNumbers(10485760) + FRText2));
 
         ItemList.FluidFilter.set(
             addItem(FluidFilter.ID, "Fluid Filter Cover", "Set with Fluid Container to only accept one Fluid Type"));
@@ -2097,240 +2088,240 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Conveyor_Module_LV.ID,
                 "Conveyor Module (LV)",
                 "1 stack every 20 secs (as Cover)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 1L)));
         ItemList.Conveyor_Module_MV.set(
             addItem(
                 Conveyor_Module_MV.ID,
                 "Conveyor Module (MV)",
                 "1 stack every 5 secs (as Cover)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 2L)));
         ItemList.Conveyor_Module_HV.set(
             addItem(
                 Conveyor_Module_HV.ID,
                 "Conveyor Module (HV)",
                 "1 stack every 1 sec (as Cover)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 4L)));
         ItemList.Conveyor_Module_EV.set(
             addItem(
                 Conveyor_Module_EV.ID,
                 "Conveyor Module (EV)",
                 "1 stack every 1/5 sec (as Cover)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 8L)));
         ItemList.Conveyor_Module_IV.set(
             addItem(
                 Conveyor_Module_IV.ID,
                 "Conveyor Module (IV)",
                 "1 stack every 1/20 sec (as Cover)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 16L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 16L)));
         ItemList.Conveyor_Module_LuV.set(
             addItem(
                 Conveyor_Module_LuV.ID,
                 "Conveyor Module (LuV)",
                 "2 stacks every 1/20 sec (as Cover)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 32L)));
         ItemList.Conveyor_Module_ZPM.set(
             addItem(
                 Conveyor_Module_ZPM.ID,
                 "Conveyor Module (ZPM)",
                 "4 stacks every 1/20 sec (as Cover)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 64L)));
         ItemList.Conveyor_Module_UV.set(
             addItem(
                 Conveyor_Module_UV.ID,
                 "Conveyor Module (UV)",
                 "8 stacks every 1/20 sec (as Cover)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 128L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 128L)));
         ItemList.Conveyor_Module_UHV.set(
             addItem(
                 Conveyor_Module_UHV.ID,
                 "Conveyor Module (UHV)",
                 "16 stacks every 1/20 sec (as Cover)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 256L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 256L)));
         ItemList.Conveyor_Module_UEV.set(
             addItem(
                 Conveyor_Module_UEV.ID,
                 "Conveyor Module (UEV)",
                 "32 stacks every 1/20 sec (as Cover)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 512L)));
         ItemList.Conveyor_Module_UIV.set(
             addItem(
                 Conveyor_Module_UIV.ID,
                 "Conveyor Module (UIV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 512L)));
         ItemList.Conveyor_Module_UMV.set(
             addItem(
                 Conveyor_Module_UMV.ID,
                 "Conveyor Module (UMV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 512L)));
         ItemList.Conveyor_Module_UXV.set(
             addItem(
                 Conveyor_Module_UXV.ID,
                 "Conveyor Module (UXV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 512L)));
         ItemList.Conveyor_Module_MAX.set(
             addItem(
                 Conveyor_Module_MAX.ID,
                 "Conveyor Module (MAX)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 512L)));
 
         ItemList.Robot_Arm_LV.set(
             addItem(
                 Robot_Arm_LV.ID,
                 "Robot Arm (LV)",
                 "1 stack every 20 secs (as Cover)/n " + RAText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1L)));
         ItemList.Robot_Arm_MV.set(
             addItem(
                 Robot_Arm_MV.ID,
                 "Robot Arm (MV)",
                 "1 stack every 5 secs (as Cover)/n " + RAText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 2L)));
         ItemList.Robot_Arm_HV.set(
             addItem(
                 Robot_Arm_HV.ID,
                 "Robot Arm (HV)",
                 "1 stack every 1 sec (as Cover)/n " + RAText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 4L)));
         ItemList.Robot_Arm_EV.set(
             addItem(
                 Robot_Arm_EV.ID,
                 "Robot Arm (EV)",
                 "1 stack every 1/5 sec (as Cover)/n " + RAText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 8L)));
         ItemList.Robot_Arm_IV.set(
             addItem(
                 Robot_Arm_IV.ID,
                 "Robot Arm (IV)",
                 "1 stack every 1/20 sec (as Cover)/n " + RAText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 16L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 16L)));
         ItemList.Robot_Arm_LuV.set(
             addItem(
                 Robot_Arm_LuV.ID,
                 "Robot Arm (LuV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 32L)));
         ItemList.Robot_Arm_ZPM.set(
             addItem(
                 Robot_Arm_ZPM.ID,
                 "Robot Arm (ZPM)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 64L)));
         ItemList.Robot_Arm_UV.set(
             addItem(
                 Robot_Arm_UV.ID,
                 "Robot Arm (UV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 128L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 128L)));
         ItemList.Robot_Arm_UHV.set(
             addItem(
                 Robot_Arm_UHV.ID,
                 "Robot Arm (UHV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 256L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 256L)));
         ItemList.Robot_Arm_UEV.set(
             addItem(
                 Robot_Arm_UEV.ID,
                 "Robot Arm (UEV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 512L)));
         ItemList.Robot_Arm_UIV.set(
             addItem(
                 Robot_Arm_UIV.ID,
                 "Robot Arm (UIV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 512L)));
         ItemList.Robot_Arm_UMV.set(
             addItem(
                 Robot_Arm_UMV.ID,
                 "Robot Arm (UMV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 512L)));
         ItemList.Robot_Arm_UXV.set(
             addItem(
                 Robot_Arm_UXV.ID,
                 "Robot Arm (UXV)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 512L)));
         ItemList.Robot_Arm_MAX.set(
             addItem(
                 Robot_Arm_MAX.ID,
                 "Robot Arm (MAX)",
                 PartNotCoverText,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 512L)));
 
         ItemList.QuantumEye.set(addItem(QuantumEye.ID, "Quantum Eye", "Improved Ender Eye"));
         ItemList.QuantumStar.set(addItem(QuantumStar.ID, "Quantum Star", "Improved Nether Star"));
@@ -2341,369 +2332,369 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Emitter_LV.ID,
                 "Emitter (LV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 1L)));
         ItemList.Emitter_MV.set(
             addItem(
                 Emitter_MV.ID,
                 "Emitter (MV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 2L)));
         ItemList.Emitter_HV.set(
             addItem(
                 Emitter_HV.ID,
                 "Emitter (HV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 4L)));
         ItemList.Emitter_EV.set(
             addItem(
                 Emitter_EV.ID,
                 "Emitter (EV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 8L)));
         ItemList.Emitter_IV.set(
             addItem(
                 Emitter_IV.ID,
                 "Emitter (IV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 16L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 16L)));
         ItemList.Emitter_LuV.set(
             addItem(
                 Emitter_LuV.ID,
                 "Emitter (LuV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 32L)));
         ItemList.Emitter_ZPM.set(
             addItem(
                 Emitter_ZPM.ID,
                 "Emitter (ZPM)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 64L)));
         ItemList.Emitter_UV.set(
             addItem(
                 Emitter_UV.ID,
                 "Emitter (UV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 128L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 128L)));
         ItemList.Emitter_UHV.set(
             addItem(
                 Emitter_UHV.ID,
                 "Emitter (UHV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 256L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 256L)));
         ItemList.Emitter_UEV.set(
             addItem(
                 Emitter_UEV.ID,
                 "Emitter (UEV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 512L)));
         ItemList.Emitter_UIV.set(
             addItem(
                 Emitter_UIV.ID,
                 "Emitter (UIV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 512L)));
         ItemList.Emitter_UMV.set(
             addItem(
                 Emitter_UMV.ID,
                 "Emitter (UMV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 512L)));
         ItemList.Emitter_UXV.set(
             addItem(
                 Emitter_UXV.ID,
                 "Emitter (UXV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 512L)));
         ItemList.Emitter_MAX.set(
             addItem(
                 Emitter_MAX.ID,
                 "Emitter (MAX)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 512L)));
 
         ItemList.Sensor_LV.set(
             addItem(
                 Sensor_LV.ID,
                 "Sensor (LV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 1L)));
 
         ItemList.Sensor_MV.set(
             addItem(
                 Sensor_MV.ID,
                 "Sensor (MV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L)));
         ItemList.Sensor_HV.set(
             addItem(
                 Sensor_HV.ID,
                 "Sensor (HV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 4L)));
         ItemList.Sensor_EV.set(
             addItem(
                 Sensor_EV.ID,
                 "Sensor (EV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 8L)));
         ItemList.Sensor_IV.set(
             addItem(
                 Sensor_IV.ID,
                 "Sensor (IV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 16L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 16L)));
         ItemList.Sensor_LuV.set(
             addItem(
                 Sensor_LuV.ID,
                 "Sensor (LuV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 32L)));
         ItemList.Sensor_ZPM.set(
             addItem(
                 Sensor_ZPM.ID,
                 "Sensor (ZPM)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 64L)));
         ItemList.Sensor_UV.set(
             addItem(
                 Sensor_UV.ID,
                 "Sensor (UV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 128L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 128L)));
         ItemList.Sensor_UHV.set(
             addItem(
                 Sensor_UHV.ID,
                 "Sensor (UHV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 256L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 256L)));
         ItemList.Sensor_UEV.set(
             addItem(
                 Sensor_UEV.ID,
                 "Sensor (UEV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 512L)));
         ItemList.Sensor_UIV.set(
             addItem(
                 Sensor_UIV.ID,
                 "Sensor (UIV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 512L)));
         ItemList.Sensor_UMV.set(
             addItem(
                 Sensor_UMV.ID,
                 "Sensor (UMV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 512L)));
         ItemList.Sensor_UXV.set(
             addItem(
                 Sensor_UXV.ID,
                 "Sensor (UXV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 512L)));
         ItemList.Sensor_MAX.set(
             addItem(
                 Sensor_MAX.ID,
                 "Sensor (MAX)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 512L)));
 
         ItemList.Field_Generator_LV.set(
             addItem(
                 Field_Generator_LV.ID,
                 "Field Generator (LV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1L)));
         ItemList.Field_Generator_MV.set(
             addItem(
                 Field_Generator_MV.ID,
                 "Field Generator (MV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 2L)));
         ItemList.Field_Generator_HV.set(
             addItem(
                 Field_Generator_HV.ID,
                 "Field Generator (HV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 4L)));
         ItemList.Field_Generator_EV.set(
             addItem(
                 Field_Generator_EV.ID,
                 "Field Generator (EV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 8L)));
         ItemList.Field_Generator_IV.set(
             addItem(
                 Field_Generator_IV.ID,
                 "Field Generator (IV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 16L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 16L)));
         ItemList.Field_Generator_LuV.set(
             addItem(
                 Field_Generator_LuV.ID,
                 "Field Generator (LuV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 32L)));
         ItemList.Field_Generator_ZPM.set(
             addItem(
                 Field_Generator_ZPM.ID,
                 "Field Generator (ZPM)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 64L)));
         ItemList.Field_Generator_UV.set(
             addItem(
                 Field_Generator_UV.ID,
                 "Field Generator (UV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 128L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 128L)));
         ItemList.Field_Generator_UHV.set(
             addItem(
                 Field_Generator_UHV.ID,
                 "Field Generator (UHV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 256L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 256L)));
         ItemList.Field_Generator_UEV.set(
             addItem(
                 Field_Generator_UEV.ID,
                 "Field Generator (UEV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 512L)));
         ItemList.Field_Generator_UIV.set(
             addItem(
                 Field_Generator_UIV.ID,
                 "Field Generator (UIV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 512L)));
         ItemList.Field_Generator_UMV.set(
             addItem(
                 Field_Generator_UMV.ID,
                 "Field Generator (UMV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 512L)));
         ItemList.Field_Generator_UXV.set(
             addItem(
                 Field_Generator_UXV.ID,
                 "Field Generator (UXV)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 512L)));
         ItemList.Field_Generator_MAX.set(
             addItem(
                 Field_Generator_MAX.ID,
                 "Field Generator (MAX)",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 512L)));
 
         ItemList.StableAdhesive.set(
             addItem(
                 StableAdhesive.ID,
                 "Hyper-Stable Self-Healing Adhesive",
                 "Complete and selective adhesion, even when torn or damaged",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 30L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 10L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 5L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 30L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.LIMUS, 10L),
+                new TCAspects.TC_AspectStack(TCAspects.VINCULUM, 5L)));
         ItemList.SuperconductorComposite.set(
             addItem(
                 SuperconductorComposite.ID,
                 "Superconductor Rare-Earth Composite",
                 "Zero resistance to electrical and quantum flow, regardless of temperature",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 50L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 25L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 15L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 10L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 50L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 25L),
+                new TCAspects.TC_AspectStack(TCAspects.TERRA, 15L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 10L)));
         ItemList.NaquadriaSupersolid.set(
             addItem(
                 NaquadriaSupersolid.ID,
                 "Black Body Naquadria Supersolid",
                 "Flows like a fluid and reflects nothing, perfect absorption and transfer",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 100L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 60L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 40L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 20L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 10L)));
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 100L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 60L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 40L),
+                new TCAspects.TC_AspectStack(TCAspects.RADIO, 20L),
+                new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 10L)));
 
         // Circuits ULV - LuV.
         ItemList.Circuit_Primitive.set(
@@ -2766,7 +2757,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Data Orb",
                 "A High Capacity Data Storage",
                 SubTag.NO_UNIFICATION,
-                new Behaviour_DataOrb()));
+                new BehaviourDataOrb()));
 
         ItemList.Tool_DataStick.set(
             addItem(
@@ -2774,17 +2765,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Data Stick",
                 "A Low Capacity Data Storage",
                 SubTag.NO_UNIFICATION,
-                new Behaviour_DataStick()));
+                new BehaviourDataStick()));
 
         ItemList.Tool_Cover_Copy_Paste.set(
             addItem(
                 Tool_Cover_Copy_Paste.ID,
                 "Cover Copy/Paste tool",
                 "Set Cover Massively.",
-                Behaviour_Cover_Tool.INSTANCE,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 6L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 6L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 6L)));
+                BehaviourCoverTool.INSTANCE,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 6L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 6L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 6L)));
 
         ItemList.Circuit_Board_Basic.set(addItem(Circuit_Board_Basic.ID, "Coated Circuit Board", "A Basic Board"));
         ItemList.Circuit_Board_Coated.set(ItemList.Circuit_Board_Basic.get(1));
@@ -2822,27 +2813,27 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Component_Sawblade_Diamond.ID,
                 "Diamond Sawblade",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4L),
                 OreDictNames.craftingDiamondBlade));
         ItemList.Component_Grinder_Diamond.set(
             addItem(
                 Component_Grinder_Diamond.ID,
                 "Diamond Grinding Head",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 6L),
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 6L),
                 OreDictNames.craftingGrinder));
         ItemList.Component_Grinder_Tungsten.set(
             addItem(
                 Component_Grinder_Tungsten.ID,
                 "Tungsten Grinding Head",
                 "",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 6L),
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 6L),
                 OreDictNames.craftingGrinder));
 
         ItemList.Upgrade_Muffler.set(
@@ -2850,14 +2841,14 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Upgrade_Muffler.ID,
                 "Muffler Upgrade",
                 "Makes Machines silent",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 2L)));
         ItemList.Upgrade_Lock.set(
             addItem(
                 Upgrade_Lock.ID,
                 "Lock Upgrade",
                 "Protects your Machines",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 4L)));
 
         ItemList.Component_Filter.set(
             addItem(
@@ -2865,9 +2856,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Item Filter",
                 "",
                 new ItemData(Materials.Zinc, OrePrefixes.foil.mMaterialAmount * 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 1L),
                 OreDictNames.craftingFilter));
 
         ItemList.Cover_Controller.set(
@@ -2875,354 +2866,354 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 Cover_Controller.ID,
                 "Machine Controller Cover",
                 "Turns Machines ON/OFF",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L)));
         ItemList.Cover_ActivityDetector.set(
             addItem(
                 Cover_ActivityDetector.ID,
                 "Activity Detector Cover",
                 "Gives out Activity as Redstone",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L)));
         ItemList.Cover_FluidDetector.set(
             addItem(
                 Cover_FluidDetector.ID,
                 "Fluid Detector Cover",
                 "Gives out Fluid Amount as Redstone",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L)));
         ItemList.Cover_ItemDetector.set(
             addItem(
                 Cover_ItemDetector.ID,
                 "Item Detector Cover",
                 "Gives out Item Amount as Redstone",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.TERRA, 1L)));
         ItemList.Cover_EnergyDetector.set(
             addItem(
                 Cover_EnergyDetector.ID,
                 "Energy Detector Cover",
                 "Gives out Energy Amount as Redstone",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L)));
         ItemList.Cover_PlayerDetector.set(
             addItem(
                 Cover_PlayerDetector.ID,
                 "Player Detector Cover",
                 "Gives out close Players as Redstone",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L)));
         ItemList.Cover_FluidStorageMonitor.set(
             addItem(
                 Cover_FLuidStorageMonitor.ID,
                 "Fluid Storage Monitor Cover",
                 "Displays the fluid stored in the Tank",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L)));
         ItemList.Cover_Chest_Basic.set(
             addItem(
                 Cover_Chest_Basic.ID,
                 "Basic Item Holder",
                 "Hold a few item for use within machine GUI",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 2L)));
         ItemList.Cover_Chest_Good.set(
             addItem(
                 Cover_Chest_Good.ID,
                 "Good Item Holder",
                 "Hold a few item for use within machine GUI",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 2L)));
         ItemList.Cover_Chest_Advanced.set(
             addItem(
                 Cover_Chest_Advanced.ID,
                 "Advanced Item Holder",
                 "Hold a few item for use within machine GUI",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 2L)));
 
         ItemList.Cover_Screen.set(
             addItem(
                 Cover_Screen.ID,
                 "Computer Monitor Cover",
                 "Displays Data and GUI",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.LUX, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L)));
         ItemList.Cover_Crafting.set(
             addItem(
                 Cover_Crafting.ID,
                 "Crafting Table Cover",
                 "Better than a wooden Workbench",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 4L)));
         ItemList.Cover_Drain.set(
             addItem(
                 Cover_Drain.ID,
                 "Drain Module Cover",
                 "Absorbs Fluids and collects Rain",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 2L)));
 
         ItemList.Cover_Shutter.set(
             addItem(
                 Cover_Shutter.ID,
                 "Shutter Module Cover",
                 "Blocks Inventory/Tank Side. Use together with Machine Controller.",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 1L)));
 
         ItemList.Cover_SolarPanel.set(
             addItem(
                 Cover_SolarPanel.ID,
                 "Solar Panel",
                 "May the Sun be with you (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 1L)));
         ItemList.Cover_SolarPanel_8V.set(
             addItem(
                 Cover_SolarPanel_8V.ID,
                 "Solar Panel (8V)",
                 "8 Volt Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 2L)));
         ItemList.Cover_SolarPanel_LV.set(
             addItem(
                 Cover_SolarPanel_LV.ID,
                 "Solar Panel (LV)",
                 "Low Voltage Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 4L)));
         ItemList.Cover_SolarPanel_MV.set(
             addItem(
                 Cover_SolarPanel_MV.ID,
                 "Solar Panel (MV)",
                 "Medium Voltage Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 8L)));
         ItemList.Cover_SolarPanel_HV.set(
             addItem(
                 Cover_SolarPanel_HV.ID,
                 "Solar Panel (HV)",
                 "High Voltage Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 16L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 16L)));
         ItemList.Cover_SolarPanel_EV.set(
             addItem(
                 Cover_SolarPanel_EV.ID,
                 "Solar Panel (EV)",
                 "Extreme Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 32L)));
         ItemList.Cover_SolarPanel_IV.set(
             addItem(
                 Cover_SolarPanel_IV.ID,
                 "Solar Panel (IV)",
                 "Insane Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 64L)));
         ItemList.Cover_SolarPanel_LuV.set(
             addItem(
                 Cover_SolarPanel_LuV.ID,
                 "Solar Panel (LuV)",
                 "Ludicrous Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 64L)));
         ItemList.Cover_SolarPanel_ZPM.set(
             addItem(
                 Cover_SolarPanel_ZPM.ID,
                 "Solar Panel (ZPM)",
                 "ZPM Voltage Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 64L)));
         ItemList.Cover_SolarPanel_UV.set(
             addItem(
                 Cover_SolarPanel_UV.ID,
                 "Solar Panel (UV)",
                 "Ultimate Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 64L)));
 
         ItemList.Tool_Sonictron.set(
             addItem(
                 Tool_Sonictron.ID,
                 "Sonictron",
                 "Bring your Music with you",
-                Behaviour_Sonictron.INSTANCE,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 4L)));
+                BehaviourSonictron.INSTANCE,
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 4L)));
         ItemList.Tool_Cheat.set(
             addItem(
                 Tool_Cheat.ID,
                 "Debug Scanner",
                 "Also an Infinite Energy Source",
-                Behaviour_Scanner.INSTANCE,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 64L)));
+                BehaviourScanner.INSTANCE,
+                new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 64L)));
         ItemList.Tool_Scanner.set(
             addItem(
                 Tool_Scanner.ID,
                 "Portable Scanner",
                 "Tricorder",
-                Behaviour_Scanner.INSTANCE,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 6L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 6L)));
+                BehaviourScanner.INSTANCE,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 6L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 6L)));
 
-        ItemList.NC_SensorKit.set(addItem(NC_SensorKit.ID, "GregTech Sensor Kit", "", new Behaviour_SensorKit()));
+        ItemList.NC_SensorKit.set(addItem(NC_SensorKit.ID, "GregTech Sensor Kit", "", new BehaviourSensorKit()));
         ItemList.Duct_Tape.set(
             addItem(
                 Duct_Tape.ID,
                 "BrainTech Aerospace Advanced Reinforced Duct Tape FAL-84",
                 "If you can't fix it with this, use more of it!",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
                 OreDictNames.craftingDuctTape));
         ItemList.McGuffium_239.set(
             addItem(
                 McGuffium_239.ID,
                 "Mc Guffium 239",
                 "42% better than Phlebotnium",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SPIRITUS, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITIUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.SPIRITUS, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.AURAM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.VITIUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.RADIO, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 8L)));
 
         ItemList.Cover_RedstoneTransmitterExternal.set(
             addItem(
                 Cover_RedstoneTransmitterExternal.ID,
                 "Redstone Transmitter (External)",
                 "Transfers Redstone signals wireless",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L)));
         ItemList.Cover_RedstoneTransmitterInternal.set(
             addItem(
                 Cover_RedstoneTransmitterInternal.ID,
                 "Redstone Transmitter (Internal)",
                 "Transfers Redstone signals wireless",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L)));
         ItemList.Cover_RedstoneReceiverExternal.set(
             addItem(
                 Cover_RedstoneReceiverExternal.ID,
                 "Redstone Receiver (External)",
                 "Transfers Redstone signals wireless",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L)));
         ItemList.Cover_RedstoneReceiverInternal.set(
             addItem(
                 Cover_RedstoneReceiverInternal.ID,
                 "Redstone Receiver (Internal)",
                 "Transfers Redstone signals wireless",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L)));
 
         ItemList.Cover_NeedsMaintainance.set(
             addItem(
                 Cover_NeedsMaintenance.ID,
                 "Needs Maintenance Cover",
                 "Attach to Multiblock Controller. Emits Redstone Signal if needs Maintenance",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L)));
 
         ItemList.Steam_Regulator_LV.set(
             addItem(
                 Steam_Regulator_LV.ID,
                 "Steam Regulator (LV)",
-                GT_Utility.formatNumbers(1024) + PartCoverText + GT_Utility.formatNumbers(1024 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L)));
+                GTUtility.formatNumbers(1024) + PartCoverText + GTUtility.formatNumbers(1024 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L)));
         ItemList.Steam_Regulator_MV.set(
             addItem(
                 Steam_Regulator_MV.ID,
                 "Steam Regulator (MV)",
-                GT_Utility.formatNumbers(2048) + PartCoverText + GT_Utility.formatNumbers(2048 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));
+                GTUtility.formatNumbers(2048) + PartCoverText + GTUtility.formatNumbers(2048 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 2L)));
         ItemList.Steam_Regulator_HV.set(
             addItem(
                 Steam_Regulator_HV.ID,
                 "Steam Regulator (HV)",
-                GT_Utility.formatNumbers(4096) + PartCoverText + GT_Utility.formatNumbers(4096 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L)));
+                GTUtility.formatNumbers(4096) + PartCoverText + GTUtility.formatNumbers(4096 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 4L)));
         ItemList.Steam_Regulator_EV.set(
             addItem(
                 Steam_Regulator_EV.ID,
                 "Steam Regulator (EV)",
-                GT_Utility.formatNumbers(8192) + PartCoverText + GT_Utility.formatNumbers(8192 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 8L)));
+                GTUtility.formatNumbers(8192) + PartCoverText + GTUtility.formatNumbers(8192 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 8L)));
         ItemList.Steam_Regulator_IV.set(
             addItem(
                 Steam_Regulator_IV.ID,
                 "Steam Regulator (IV)",
-                GT_Utility.formatNumbers(16384) + PartCoverText + GT_Utility.formatNumbers(16384 * 20) + PartCoverText2,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 16L)));
+                GTUtility.formatNumbers(16384) + PartCoverText + GTUtility.formatNumbers(16384 * 20) + PartCoverText2,
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.ITER, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 16L)));
         ItemList.Electromagnet_Iron.set(
             addItem(
                 Electromagnet_Iron.ID,
                 "Iron Electromagnet",
                 MagnetTiers.buildMagnetTooltip(MagnetTiers.Iron),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 8)));
+                new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 8)));
         ItemList.Electromagnet_Steel.set(
             addItem(
                 Electromagnet_Steel.ID,
                 "Steel Electromagnet",
                 MagnetTiers.buildMagnetTooltip(MagnetTiers.Steel),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 16)));
+                new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 16)));
         ItemList.Electromagnet_Neodymium.set(
             addItem(
                 Electromagnet_Neodymium.ID,
                 "Neodymium Electromagnet",
                 MagnetTiers.buildMagnetTooltip(MagnetTiers.Neodymium),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 24)));
+                new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 24)));
         ItemList.Electromagnet_Samarium.set(
             addItem(
                 Electromagnet_Samarium.ID,
                 EnumChatFormatting.YELLOW + "Samarium Electromagnet",
                 MagnetTiers.buildMagnetTooltip(MagnetTiers.Samarium),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 32)));
+                new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 32)));
         ItemList.Electromagnet_Tengam.set(
             addItem(
                 Electromagnet_Tengam.ID,
                 EnumChatFormatting.GREEN + "Tengam Electromagnet",
                 MagnetTiers.buildMagnetTooltip(MagnetTiers.Tengam),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 40)));
+                new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 40)));
         ItemList.Black_Hole_Opener.set(
             addItem(
                 Black_Hole_Opener.ID,
                 "Black Hole Activation Catalyst",
                 "Opens a semi-stable black hole",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 32),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 64)));
+                new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 32),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 64)));
         ItemList.Black_Hole_Closer.set(
             addItem(
                 Black_Hole_Closer.ID,
                 "Black Hole Deactivation Catalyst",
                 "Safely closes a semi-stable black hole",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 32),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 64)));
+                new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 32),
+                new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 64)));
 
         // Empty battery hulls
         ItemList.BatteryHull_EV.set(
@@ -3231,90 +3222,90 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Small Sunnarium Battery (Empty)",
                 "An empty EV Battery Container",
                 new ItemData(Materials.BlueSteel, OrePrefixes.plate.mMaterialAmount * 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 8L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 8L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 8L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 8L)));
         ItemList.BatteryHull_IV.set(
             addItem(
                 BatteryHull_IV.ID,
                 "Medium Sunnarium Battery (Empty)",
                 "An empty IV Battery Container",
                 new ItemData(Materials.RoseGold, OrePrefixes.plate.mMaterialAmount * 6L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 16L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 16L)));
         ItemList.BatteryHull_LuV.set(
             addItem(
                 BatteryHull_LuV.ID,
                 "Large Sunnarium Battery (Empty)",
                 "An empty LuV Battery Container",
                 new ItemData(Materials.RedSteel, OrePrefixes.plate.mMaterialAmount * 18L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 32L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 32L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 32L)));
         ItemList.BatteryHull_ZPM.set(
             addItem(
                 BatteryHull_ZPM.ID,
                 "Medium Naquadria Battery (Empty)",
                 "An empty ZPM Energy Storage",
                 new ItemData(Materials.Europium, OrePrefixes.plate.mMaterialAmount * 6L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 64L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 64L)));
         ItemList.BatteryHull_UV.set(
             addItem(
                 BatteryHull_UV.ID,
                 "Large Naquadria Battery (Empty)",
                 "An empty UV Energy Storage",
                 new ItemData(Materials.Americium, OrePrefixes.plate.mMaterialAmount * 18L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 128L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 128L)));
         ItemList.BatteryHull_UHV.set(
             addItem(
                 BatteryHull_UHV.ID,
                 "Small Neutronium Battery (Empty)",
                 "An empty UHV Energy Storage",
                 new ItemData(Materials.Naquadah, OrePrefixes.plate.mMaterialAmount * 24L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 256L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 256L)));
         ItemList.BatteryHull_UEV.set(
             addItem(
                 BatteryHull_UEV.ID,
                 "Medium Neutronium Battery (Empty)",
                 "An empty UEV Energy Storage",
                 new ItemData(Materials.NaquadahEnriched, OrePrefixes.plate.mMaterialAmount * 36L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 512L)));
         ItemList.BatteryHull_UIV.set(
             addItem(
                 BatteryHull_UIV.ID,
                 "Large Neutronium Battery (Empty)",
                 "An empty UIV Energy Storage",
                 new ItemData(Materials.NaquadahAlloy, OrePrefixes.plate.mMaterialAmount * 48L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1024L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1024L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1024L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 1024L)));
         ItemList.BatteryHull_UMV.set(
             addItem(
                 BatteryHull_UMV.ID,
                 "Medium Plasma Battery (Empty)",
                 "An empty UMV Energy Storage",
                 new ItemData(Materials.Neutronium, OrePrefixes.plate.mMaterialAmount * 56L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2048L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2048L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2048L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 2048L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2048L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 2048L)));
         ItemList.BatteryHull_UxV.set(
             addItem(
                 BatteryHull_UxV.ID,
                 "Large Plasma Battery (Empty)",
                 "An empty UXV Energy Storage",
                 new ItemData(Materials.DraconiumAwakened, OrePrefixes.plate.mMaterialAmount * 64L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4096L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4096L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 4096L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4096L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4096L),
+                new TCAspects.TC_AspectStack(TCAspects.VACUOS, 4096L)));
 
         ItemList.BatteryHull_EV_Full.set(
             addItem(
@@ -3322,9 +3313,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Small Sunnarium Battery",
                 "Reusable",
                 "batteryEV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L)));
 
         ItemList.BatteryHull_IV_Full.set(
             addItem(
@@ -3332,9 +3323,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Medium Sunnarium Battery",
                 "Reusable",
                 "batteryIV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L)));
 
         ItemList.BatteryHull_LuV_Full.set(
             addItem(
@@ -3342,9 +3333,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Large Sunnarium Battery",
                 "Reusable",
                 "batteryLuV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L)));
 
         ItemList.BatteryHull_ZPM_Full.set(
             addItem(
@@ -3352,9 +3343,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Medium Naquadria Battery",
                 "Reusable",
                 "batteryZPM",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L)));
 
         ItemList.BatteryHull_UV_Full.set(
             addItem(
@@ -3362,9 +3353,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Large Naquadria Battery",
                 "Reusable",
                 "batteryUV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L)));
 
         ItemList.BatteryHull_UHV_Full.set(
             addItem(
@@ -3372,9 +3363,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Small Neutronium Battery",
                 "Reusable",
                 "batteryUHV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L)));
 
         ItemList.BatteryHull_UEV_Full.set(
             addItem(
@@ -3382,9 +3373,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Medium Neutronium Battery",
                 "Reusable",
                 "batteryUEV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L)));
 
         ItemList.BatteryHull_UIV_Full.set(
             addItem(
@@ -3392,9 +3383,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Large Neutronium Battery",
                 "Reusable",
                 "batteryUIV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L)));
 
         ItemList.BatteryHull_UMV_Full.set(
             addItem(
@@ -3402,9 +3393,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Medium Infinity Battery",
                 "Reusable",
                 "batteryUMV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L)));
 
         ItemList.BatteryHull_UxV_Full.set(
             addItem(
@@ -3412,9 +3403,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 "Large Infinity Battery",
                 "Reusable",
                 "batteryUXV",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 16L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 32L)));
 
         removeRecipes();
         setBurnValues();
@@ -3440,7 +3431,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         int aDamage = aItemEntity.getEntityItem()
             .getItemDamage();
         if ((aDamage < 32000) && (aDamage >= 0) && (!aItemEntity.worldObj.isRemote)) {
-            Materials aMaterial = GregTech_API.sGeneratedMaterials[(aDamage % 1000)];
+            Materials aMaterial = GregTechAPI.sGeneratedMaterials[(aDamage % 1000)];
             if ((aMaterial != null) && (aMaterial != Materials.Empty) && (aMaterial != Materials._NULL)) {
                 int tX = MathHelper.floor_double(aItemEntity.posX);
                 int tY = MathHelper.floor_double(aItemEntity.posY);
@@ -3454,7 +3445,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                         aMaterial = cauldronRemap.getOrDefault(aMaterial, aMaterial);
 
                         aItemEntity.setEntityItemStack(
-                            GT_OreDictUnificator
+                            GTOreDictUnificator
                                 .get(OrePrefixes.dust, aMaterial, aItemEntity.getEntityItem().stackSize));
                         aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3);
                         return true;
@@ -3464,7 +3455,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     byte tMetaData = (byte) aItemEntity.worldObj.getBlockMetadata(tX, tY, tZ);
                     if ((tBlock == Blocks.cauldron) && (tMetaData > 0)) {
                         aItemEntity.setEntityItemStack(
-                            GT_OreDictUnificator
+                            GTOreDictUnificator
                                 .get(OrePrefixes.crushedPurified, aMaterial, aItemEntity.getEntityItem().stackSize));
                         aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3);
                         return true;
@@ -3488,7 +3479,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         super.addAdditionalToolTips(aList, aStack, aPlayer);
         int aDamage = aStack.getItemDamage();
         if ((aDamage < 32000) && (aDamage >= 0)) {
-            Materials aMaterial = GregTech_API.sGeneratedMaterials[(aDamage % 1000)];
+            Materials aMaterial = GregTechAPI.sGeneratedMaterials[(aDamage % 1000)];
             if ((aMaterial != null) && (aMaterial != Materials.Empty) && (aMaterial != Materials._NULL)) {
                 OrePrefixes aPrefix = this.mGeneratedPrefixList[(aDamage / 1000)];
                 if ((aPrefix == OrePrefixes.dustImpure) || (aPrefix == OrePrefixes.dustPure)) {
@@ -3499,9 +3490,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
     }
 
     public boolean isPlasmaCellUsed(OrePrefixes aPrefix, Materials aMaterial) {
-        Collection<GT_Recipe> fusionRecipes = RecipeMaps.fusionRecipes.getAllRecipes();
+        Collection<GTRecipe> fusionRecipes = RecipeMaps.fusionRecipes.getAllRecipes();
         if (aPrefix == OrePrefixes.cellPlasma && aMaterial.getPlasma(1L) != null) { // Materials has a plasma fluid
-            for (GT_Recipe recipe : fusionRecipes) { // Loop through fusion recipes
+            for (GTRecipe recipe : fusionRecipes) { // Loop through fusion recipes
                 if (recipe.getFluidOutput(0) != null) { // Make sure fluid output can't be null (not sure if possible)
                     if (recipe.getFluidOutput(0)
                         .isFluidEqual(aMaterial.getPlasma(1L))) return true; // Fusion recipe
@@ -3570,7 +3561,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
     }
 
     private void oredictBlacklistEntries() {
-        GT_OreDictUnificator.addToBlacklist(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID));
+        GTOreDictUnificator.addToBlacklist(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID));
     }
 
     private void registerCovers() {
@@ -3594,336 +3585,334 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 .glow()
                 .build());
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID),
             TextureFactory.of(COVER_WOOD_PLATE),
             null);
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Electric_Pump_LV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_Pump(32, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverPump(32, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.Electric_Pump_MV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_Pump(128, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverPump(128, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.Electric_Pump_HV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[3][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_Pump(512, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverPump(512, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.Electric_Pump_EV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[4][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_Pump(2048, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverPump(2048, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.Electric_Pump_IV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_Pump(8192, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverPump(8192, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.Electric_Pump_LuV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[6][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_Pump(32768, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverPump(32768, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.Electric_Pump_ZPM.get(1L),
             TextureFactory.of(MACHINE_CASINGS[7][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_Pump(131072, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverPump(131072, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.Electric_Pump_UV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[8][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_Pump(524288, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverPump(524288, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.Electric_Pump_UHV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[9][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_Pump(1048576, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverPump(1048576, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.Electric_Pump_UEV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[10][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_Pump(2097152, TextureFactory.of(OVERLAY_PUMP)));
+            new CoverPump(2097152, TextureFactory.of(OVERLAY_PUMP)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Steam_Valve_LV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_VALVE)),
-            new GT_Cover_SteamValve(1024, TextureFactory.of(OVERLAY_VALVE)));
-        GregTech_API.registerCover(
+            new CoverSteamValve(1024, TextureFactory.of(OVERLAY_VALVE)));
+        GregTechAPI.registerCover(
             ItemList.Steam_Valve_MV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_VALVE)),
-            new GT_Cover_SteamValve(2048, TextureFactory.of(OVERLAY_VALVE)));
-        GregTech_API.registerCover(
+            new CoverSteamValve(2048, TextureFactory.of(OVERLAY_VALVE)));
+        GregTechAPI.registerCover(
             ItemList.Steam_Valve_HV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[3][0], TextureFactory.of(OVERLAY_VALVE)),
-            new GT_Cover_SteamValve(4096, TextureFactory.of(OVERLAY_VALVE)));
-        GregTech_API.registerCover(
+            new CoverSteamValve(4096, TextureFactory.of(OVERLAY_VALVE)));
+        GregTechAPI.registerCover(
             ItemList.Steam_Valve_EV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[4][0], TextureFactory.of(OVERLAY_VALVE)),
-            new GT_Cover_SteamValve(8192, TextureFactory.of(OVERLAY_VALVE)));
-        GregTech_API.registerCover(
+            new CoverSteamValve(8192, TextureFactory.of(OVERLAY_VALVE)));
+        GregTechAPI.registerCover(
             ItemList.Steam_Valve_IV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_VALVE)),
-            new GT_Cover_SteamValve(16384, TextureFactory.of(OVERLAY_VALVE)));
+            new CoverSteamValve(16384, TextureFactory.of(OVERLAY_VALVE)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.FluidRegulator_LV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_FluidRegulator(32, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverFluidRegulator(32, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.FluidRegulator_MV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_FluidRegulator(128, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverFluidRegulator(128, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.FluidRegulator_HV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[3][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_FluidRegulator(512, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverFluidRegulator(512, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.FluidRegulator_EV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[4][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_FluidRegulator(2048, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverFluidRegulator(2048, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.FluidRegulator_IV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_FluidRegulator(8192, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverFluidRegulator(8192, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.FluidRegulator_LuV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[6][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_FluidRegulator(32768, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverFluidRegulator(32768, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.FluidRegulator_ZPM.get(1L),
             TextureFactory.of(MACHINE_CASINGS[7][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_FluidRegulator(131072, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
+            new CoverFluidRegulator(131072, TextureFactory.of(OVERLAY_PUMP)));
+        GregTechAPI.registerCover(
             ItemList.FluidRegulator_UV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[8][0], TextureFactory.of(OVERLAY_PUMP)),
-            new GT_Cover_FluidRegulator(524288, TextureFactory.of(OVERLAY_PUMP)));
+            new CoverFluidRegulator(524288, TextureFactory.of(OVERLAY_PUMP)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.FluidFilter.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_SHUTTER)),
-            new GT_Cover_Fluidfilter(TextureFactory.of(OVERLAY_SHUTTER)));
+            new CoverFluidfilter(TextureFactory.of(OVERLAY_SHUTTER)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.ItemFilter_Export.get(1L),
             TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_ItemFilter(true, TextureFactory.of(OVERLAY_CONVEYOR)));
+            new CoverItemFilter(true, TextureFactory.of(OVERLAY_CONVEYOR)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.ItemFilter_Import.get(1L),
             TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_ItemFilter(false, TextureFactory.of(OVERLAY_CONVEYOR)));
+            new CoverItemFilter(false, TextureFactory.of(OVERLAY_CONVEYOR)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_FluidLimiter.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_SHUTTER)),
-            new GT_Cover_FluidLimiter(TextureFactory.of(OVERLAY_SHUTTER)));
+            new CoverFluidLimiter(TextureFactory.of(OVERLAY_SHUTTER)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Conveyor_Module_LV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_Conveyor(400, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
-        GregTech_API.registerCover(
+            new CoverConveyor(400, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
+        GregTechAPI.registerCover(
             ItemList.Conveyor_Module_MV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_Conveyor(100, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
-        GregTech_API.registerCover(
+            new CoverConveyor(100, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
+        GregTechAPI.registerCover(
             ItemList.Conveyor_Module_HV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[3][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_Conveyor(20, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
-        GregTech_API.registerCover(
+            new CoverConveyor(20, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
+        GregTechAPI.registerCover(
             ItemList.Conveyor_Module_EV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[4][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_Conveyor(4, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
-        GregTech_API.registerCover(
+            new CoverConveyor(4, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
+        GregTechAPI.registerCover(
             ItemList.Conveyor_Module_IV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_Conveyor(1, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
-        GregTech_API.registerCover(
+            new CoverConveyor(1, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
+        GregTechAPI.registerCover(
             ItemList.Conveyor_Module_LuV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[6][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_Conveyor(1, 2, TextureFactory.of(OVERLAY_CONVEYOR)));
-        GregTech_API.registerCover(
+            new CoverConveyor(1, 2, TextureFactory.of(OVERLAY_CONVEYOR)));
+        GregTechAPI.registerCover(
             ItemList.Conveyor_Module_ZPM.get(1L),
             TextureFactory.of(MACHINE_CASINGS[7][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_Conveyor(1, 4, TextureFactory.of(OVERLAY_CONVEYOR)));
-        GregTech_API.registerCover(
+            new CoverConveyor(1, 4, TextureFactory.of(OVERLAY_CONVEYOR)));
+        GregTechAPI.registerCover(
             ItemList.Conveyor_Module_UV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[8][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_Conveyor(1, 8, TextureFactory.of(OVERLAY_CONVEYOR)));
-        GregTech_API.registerCover(
+            new CoverConveyor(1, 8, TextureFactory.of(OVERLAY_CONVEYOR)));
+        GregTechAPI.registerCover(
             ItemList.Conveyor_Module_UHV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[9][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_Conveyor(1, 16, TextureFactory.of(OVERLAY_CONVEYOR)));
-        GregTech_API.registerCover(
+            new CoverConveyor(1, 16, TextureFactory.of(OVERLAY_CONVEYOR)));
+        GregTechAPI.registerCover(
             ItemList.Conveyor_Module_UEV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[10][0], TextureFactory.of(OVERLAY_CONVEYOR)),
-            new GT_Cover_Conveyor(1, 32, TextureFactory.of(OVERLAY_CONVEYOR)));
+            new CoverConveyor(1, 32, TextureFactory.of(OVERLAY_CONVEYOR)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Robot_Arm_LV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_ARM)),
-            new GT_Cover_Arm(400, TextureFactory.of(OVERLAY_ARM)));
-        GregTech_API.registerCover(
+            new CoverArm(400, TextureFactory.of(OVERLAY_ARM)));
+        GregTechAPI.registerCover(
             ItemList.Robot_Arm_MV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ARM)),
-            new GT_Cover_Arm(100, TextureFactory.of(OVERLAY_ARM)));
-        GregTech_API.registerCover(
+            new CoverArm(100, TextureFactory.of(OVERLAY_ARM)));
+        GregTechAPI.registerCover(
             ItemList.Robot_Arm_HV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[3][0], TextureFactory.of(OVERLAY_ARM)),
-            new GT_Cover_Arm(20, TextureFactory.of(OVERLAY_ARM)));
-        GregTech_API.registerCover(
+            new CoverArm(20, TextureFactory.of(OVERLAY_ARM)));
+        GregTechAPI.registerCover(
             ItemList.Robot_Arm_EV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[4][0], TextureFactory.of(OVERLAY_ARM)),
-            new GT_Cover_Arm(4, TextureFactory.of(OVERLAY_ARM)));
-        GregTech_API.registerCover(
+            new CoverArm(4, TextureFactory.of(OVERLAY_ARM)));
+        GregTechAPI.registerCover(
             ItemList.Robot_Arm_IV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_ARM)),
-            new GT_Cover_Arm(1, TextureFactory.of(OVERLAY_ARM)));
+            new CoverArm(1, TextureFactory.of(OVERLAY_ARM)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_Controller.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_CONTROLLER)),
-            new GT_Cover_ControlsWork(TextureFactory.of(OVERLAY_CONTROLLER)));
+            new CoverControlsWork(TextureFactory.of(OVERLAY_CONTROLLER)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_Chest_Basic.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_COVER_CHEST_1)),
-            new GT_Cover_Chest(9, TextureFactory.of(Textures.BlockIcons.OVERLAY_COVER_CHEST_1)));
-        GregTech_API.registerCover(
+            new CoverChest(9, TextureFactory.of(Textures.BlockIcons.OVERLAY_COVER_CHEST_1)));
+        GregTechAPI.registerCover(
             ItemList.Cover_Chest_Good.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_COVER_CHEST_2)),
-            new GT_Cover_Chest(12, TextureFactory.of(Textures.BlockIcons.OVERLAY_COVER_CHEST_2)));
-        GregTech_API.registerCover(
+            new CoverChest(12, TextureFactory.of(Textures.BlockIcons.OVERLAY_COVER_CHEST_2)));
+        GregTechAPI.registerCover(
             ItemList.Cover_Chest_Advanced.get(1L),
             TextureFactory.of(MACHINE_CASINGS[3][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_COVER_CHEST_3)),
-            new GT_Cover_Chest(15, TextureFactory.of(Textures.BlockIcons.OVERLAY_COVER_CHEST_3)));
-        GregTech_API.registerCover(
+            new CoverChest(15, TextureFactory.of(Textures.BlockIcons.OVERLAY_COVER_CHEST_3)));
+        GregTechAPI.registerCover(
             ItemList.Cover_ActivityDetector.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], doesWorkCoverTexture),
-            new GT_Cover_DoesWork(doesWorkCoverTexture));
-        GregTech_API.registerCover(
+            new CoverDoesWork(doesWorkCoverTexture));
+        GregTechAPI.registerCover(
             ItemList.Cover_FluidDetector.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_FLUIDDETECTOR)),
-            new GT_Cover_LiquidMeter(TextureFactory.of(OVERLAY_FLUIDDETECTOR)));
-        GregTech_API.registerCover(
+            new CoverLiquidMeter(TextureFactory.of(OVERLAY_FLUIDDETECTOR)));
+        GregTechAPI.registerCover(
             ItemList.Cover_ItemDetector.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ITEMDETECTOR)),
-            new GT_Cover_ItemMeter(TextureFactory.of(OVERLAY_ITEMDETECTOR)));
-        GregTech_API.registerCover(
+            new CoverItemMeter(TextureFactory.of(OVERLAY_ITEMDETECTOR)));
+        GregTechAPI.registerCover(
             ItemList.Cover_EnergyDetector.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ENERGYDETECTOR)),
-            new GT_Cover_EUMeter(TextureFactory.of(OVERLAY_ENERGYDETECTOR)));
+            new CoverEUMeter(TextureFactory.of(OVERLAY_ENERGYDETECTOR)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_PlayerDetector.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], playerDectectorCoverTexture),
-            new GT_Cover_PlayerDetector(playerDectectorCoverTexture));
-        GregTech_API.registerCover(
+            new CoverPlayerDetector(playerDectectorCoverTexture));
+        GregTechAPI.registerCover(
             ItemList.Cover_FluidStorageMonitor.get(1L),
             TextureFactory.of(OVERLAY_FLUID_STORAGE_MONITOR0),
-            new GT_Cover_FluidStorageMonitor());
+            new CoverFluidStorageMonitor());
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_Screen.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], screenCoverTexture),
-            new GT_Cover_Screen(screenCoverTexture));
-        GregTech_API.registerCover(
+            new CoverScreen(screenCoverTexture));
+        GregTechAPI.registerCover(
             ItemList.Cover_Crafting.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_CRAFTING)),
-            new GT_Cover_Crafting(TextureFactory.of(OVERLAY_CRAFTING)));
-        GregTech_API.registerCover(
+            new CoverCrafting(TextureFactory.of(OVERLAY_CRAFTING)));
+        GregTechAPI.registerCover(
             ItemList.Cover_Drain.get(1L),
             TextureFactory.of(MACHINE_CASINGS[0][0], TextureFactory.of(OVERLAY_DRAIN)),
-            new GT_Cover_Drain(TextureFactory.of(OVERLAY_DRAIN)));
-        GregTech_API.registerCover(
+            new CoverDrain(TextureFactory.of(OVERLAY_DRAIN)));
+        GregTechAPI.registerCover(
             ItemList.Cover_Shutter.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_SHUTTER)),
-            new GT_Cover_Shutter(TextureFactory.of(OVERLAY_SHUTTER)));
+            new CoverShutter(TextureFactory.of(OVERLAY_SHUTTER)));
 
-        GregTech_API.registerCover(
-            ItemList.Cover_SolarPanel.get(1L),
-            TextureFactory.of(SOLARPANEL),
-            new GT_Cover_SolarPanel(1));
-        GregTech_API.registerCover(
+        GregTechAPI
+            .registerCover(ItemList.Cover_SolarPanel.get(1L), TextureFactory.of(SOLARPANEL), new CoverSolarPanel(1));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_8V.get(1L),
             TextureFactory.of(SOLARPANEL_8V),
-            new GT_Cover_SolarPanel(8));
-        GregTech_API.registerCover(
+            new CoverSolarPanel(8));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_LV.get(1L),
             TextureFactory.of(SOLARPANEL_LV),
-            new GT_Cover_SolarPanel(32));
-        GregTech_API.registerCover(
+            new CoverSolarPanel(32));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_MV.get(1L),
             TextureFactory.of(SOLARPANEL_MV),
-            new GT_Cover_SolarPanel(128));
-        GregTech_API.registerCover(
+            new CoverSolarPanel(128));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_HV.get(1L),
             TextureFactory.of(SOLARPANEL_HV),
-            new GT_Cover_SolarPanel(512));
-        GregTech_API.registerCover(
+            new CoverSolarPanel(512));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_EV.get(1L),
             TextureFactory.of(SOLARPANEL_EV),
-            new GT_Cover_SolarPanel(2048));
-        GregTech_API.registerCover(
+            new CoverSolarPanel(2048));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_IV.get(1L),
             TextureFactory.of(SOLARPANEL_IV),
-            new GT_Cover_SolarPanel(8192));
-        GregTech_API.registerCover(
+            new CoverSolarPanel(8192));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_LuV.get(1L),
             TextureFactory.of(SOLARPANEL_LuV),
-            new GT_Cover_SolarPanel(32768));
-        GregTech_API.registerCover(
+            new CoverSolarPanel(32768));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_ZPM.get(1L),
             TextureFactory.of(SOLARPANEL_ZPM),
-            new GT_Cover_SolarPanel(131072));
-        GregTech_API.registerCover(
+            new CoverSolarPanel(131072));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_UV.get(1L),
             TextureFactory.of(SOLARPANEL_UV),
-            new GT_Cover_SolarPanel(524288));
+            new CoverSolarPanel(524288));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_RedstoneTransmitterExternal.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_REDSTONE_TRANSMITTER)),
-            new GT_Cover_RedstoneTransmitterExternal(TextureFactory.of(OVERLAY_REDSTONE_TRANSMITTER)));
-        GregTech_API.registerCover(
+            new CoverRedstoneTransmitterExternal(TextureFactory.of(OVERLAY_REDSTONE_TRANSMITTER)));
+        GregTechAPI.registerCover(
             ItemList.Cover_RedstoneTransmitterInternal.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_REDSTONE_TRANSMITTER)),
-            new GT_Cover_RedstoneTransmitterInternal(TextureFactory.of(OVERLAY_REDSTONE_TRANSMITTER)));
-        GregTech_API.registerCover(
+            new CoverRedstoneTransmitterInternal(TextureFactory.of(OVERLAY_REDSTONE_TRANSMITTER)));
+        GregTechAPI.registerCover(
             ItemList.Cover_RedstoneReceiverExternal.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_REDSTONE_RECEIVER)),
-            new GT_Cover_RedstoneReceiverExternal(TextureFactory.of(OVERLAY_REDSTONE_RECEIVER)));
-        GregTech_API.registerCover(
+            new CoverRedstoneReceiverExternal(TextureFactory.of(OVERLAY_REDSTONE_RECEIVER)));
+        GregTechAPI.registerCover(
             ItemList.Cover_RedstoneReceiverInternal.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_REDSTONE_RECEIVER)),
-            new GT_Cover_RedstoneReceiverInternal(TextureFactory.of(OVERLAY_REDSTONE_RECEIVER)));
+            new CoverRedstoneReceiverInternal(TextureFactory.of(OVERLAY_REDSTONE_RECEIVER)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Steam_Regulator_LV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_VALVE)),
-            new GT_Cover_SteamRegulator(1024, TextureFactory.of(OVERLAY_VALVE)));
-        GregTech_API.registerCover(
+            new CoverSteamRegulator(1024, TextureFactory.of(OVERLAY_VALVE)));
+        GregTechAPI.registerCover(
             ItemList.Steam_Regulator_MV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_VALVE)),
-            new GT_Cover_SteamRegulator(2048, TextureFactory.of(OVERLAY_VALVE)));
-        GregTech_API.registerCover(
+            new CoverSteamRegulator(2048, TextureFactory.of(OVERLAY_VALVE)));
+        GregTechAPI.registerCover(
             ItemList.Steam_Regulator_HV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[3][0], TextureFactory.of(OVERLAY_VALVE)),
-            new GT_Cover_SteamRegulator(4096, TextureFactory.of(OVERLAY_VALVE)));
-        GregTech_API.registerCover(
+            new CoverSteamRegulator(4096, TextureFactory.of(OVERLAY_VALVE)));
+        GregTechAPI.registerCover(
             ItemList.Steam_Regulator_EV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[4][0], TextureFactory.of(OVERLAY_VALVE)),
-            new GT_Cover_SteamRegulator(8192, TextureFactory.of(OVERLAY_VALVE)));
-        GregTech_API.registerCover(
+            new CoverSteamRegulator(8192, TextureFactory.of(OVERLAY_VALVE)));
+        GregTechAPI.registerCover(
             ItemList.Steam_Regulator_IV.get(1L),
             TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_VALVE)),
-            new GT_Cover_SteamRegulator(16384, TextureFactory.of(OVERLAY_VALVE)));
+            new CoverSteamRegulator(16384, TextureFactory.of(OVERLAY_VALVE)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_NeedsMaintainance.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_MAINTENANCE_DETECTOR)),
-            new GT_Cover_NeedMaintainance(TextureFactory.of(OVERLAY_MAINTENANCE_DETECTOR)));
+            new CoverNeedMaintainance(TextureFactory.of(OVERLAY_MAINTENANCE_DETECTOR)));
 
     }
 
     private void removeRecipes() {
-        GT_ModHandler.removeRecipe(
+        GTModHandler.removeRecipe(
             new ItemStack(Blocks.glass),
             null,
             new ItemStack(Blocks.glass),
@@ -3934,378 +3923,378 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
     private void craftingShapedRecipes() {
         ItemStack tStack = new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID);
         tStack.setStackDisplayName("The holy Planks of Sengir");
-        GT_Utility.ItemNBT.addEnchantment(tStack, Enchantment.smite, 10);
-        GT_ModHandler.addCraftingRecipe(
+        GTUtility.ItemNBT.addEnchantment(tStack, Enchantment.smite, 10);
+        GTModHandler.addCraftingRecipe(
             tStack,
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "XXX", "XDX", "XXX", 'X', OrePrefixes.gem.get(Materials.NetherStar), 'D',
                 new ItemStack(Blocks.dragon_egg, 1, 32767) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Shape_Slicer_Flat.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "hXS", aTextShape, "fXd", 'P', ItemList.Shape_Extruder_Block, 'X',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'S',
                 OrePrefixes.screw.get(Materials.StainlessSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Shape_Slicer_Stripes.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "hXS", "XPX", "fXd", 'P', ItemList.Shape_Extruder_Block, 'X',
                 OrePrefixes.plate.get(Materials.StainlessSteel), 'S',
                 OrePrefixes.screw.get(Materials.StainlessSteel) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Fuel_Can_Plastic_Empty.get(7L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { " PP", "P P", "PPP", 'P', OrePrefixes.plate.get(Materials.Plastic) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Crate_Empty.get(4L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "SWS", "WdW", "SWS", 'W', OrePrefixes.plank.get(Materials.Wood), 'S',
                 OrePrefixes.screw.get(Materials.AnyIron) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Crate_Empty.get(4L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "SWS", "WdW", "SWS", 'W', OrePrefixes.plank.get(Materials.Wood), 'S',
                 OrePrefixes.screw.get(Materials.Steel) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Schematic_1by1.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "d  ", aTextShape, aTextEmptyRow, 'P', ItemList.Schematic });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Schematic_2by2.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { " d ", aTextShape, aTextEmptyRow, 'P', ItemList.Schematic });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Schematic_3by3.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "  d", aTextShape, aTextEmptyRow, 'P', ItemList.Schematic });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Schematic_Dust.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { aTextEmptyRow, aTextShape, "  d", 'P', ItemList.Schematic });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Battery_Hull_LV.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { "Cf ", "Ph ", "Ps ", 'P', OrePrefixes.plate.get(Materials.BatteryAlloy), 'C',
                 OreDictNames.craftingWireTin });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_LV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.IronMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.AnyIron), 'W', OrePrefixes.wireGt01.get(Materials.AnyCopper), 'C',
                 OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_LV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.SteelMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.Steel), 'W', OrePrefixes.wireGt01.get(Materials.AnyCopper), 'C',
                 OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_MV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.SteelMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.Aluminium), 'W', OrePrefixes.wireGt02.get(Materials.Cupronickel), 'C',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_HV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.SteelMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.StainlessSteel), 'W', OrePrefixes.wireGt04.get(Materials.Electrum), 'C',
                 OrePrefixes.cableGt02.get(Materials.Silver) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_EV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.NeodymiumMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.Titanium), 'W', OrePrefixes.wireGt04.get(Materials.BlackSteel), 'C',
                 OrePrefixes.cableGt02.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Motor_IV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.NeodymiumMagnetic), 'R',
                 OrePrefixes.stick.get(Materials.TungstenSteel), 'W', OrePrefixes.wireGt04.get(Materials.Graphene), 'C',
                 OrePrefixes.cableGt02.get(Materials.Tungsten) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Piston_LV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "PPP", "CSS", "CMG", 'P', OrePrefixes.plate.get(Materials.Steel), 'S',
                 OrePrefixes.stick.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'M',
                 ItemList.Electric_Motor_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Piston_MV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "PPP", "CSS", "CMG", 'P', OrePrefixes.plate.get(Materials.Aluminium), 'S',
                 OrePrefixes.stick.get(Materials.Aluminium), 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'M',
                 ItemList.Electric_Motor_MV, 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Piston_HV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "PPP", "CSS", "CMG", 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'S',
                 OrePrefixes.stick.get(Materials.StainlessSteel), 'G',
                 OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'M', ItemList.Electric_Motor_HV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Piston_EV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "PPP", "CSS", "CMG", 'P', OrePrefixes.plate.get(Materials.Titanium), 'S',
                 OrePrefixes.stick.get(Materials.Titanium), 'G', OrePrefixes.gearGtSmall.get(Materials.Titanium), 'M',
                 ItemList.Electric_Motor_EV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Piston_IV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "PPP", "CSS", "CMG", 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'S',
                 OrePrefixes.stick.get(Materials.TungstenSteel), 'G',
                 OrePrefixes.gearGtSmall.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Tungsten) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Pump_LV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "SXO", "dPw", "OMW", 'M', ItemList.Electric_Motor_LV, 'O',
                 OrePrefixes.ring.get(Materials.AnyRubber), 'X', OrePrefixes.rotor.get(Materials.Tin), 'S',
                 OrePrefixes.screw.get(Materials.Tin), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'P',
                 OrePrefixes.pipeMedium.get(Materials.Bronze) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Pump_MV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "SXO", "dPw", "OMW", 'M', ItemList.Electric_Motor_MV, 'O',
                 OrePrefixes.ring.get(Materials.AnyRubber), 'X', OrePrefixes.rotor.get(Materials.Bronze), 'S',
                 OrePrefixes.screw.get(Materials.Bronze), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'P',
                 OrePrefixes.pipeMedium.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Pump_HV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "SXO", "dPw", "OMW", 'M', ItemList.Electric_Motor_HV, 'O',
                 OrePrefixes.ring.get(Materials.AnyRubber), 'X', OrePrefixes.rotor.get(Materials.Steel), 'S',
                 OrePrefixes.screw.get(Materials.Steel), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'P',
                 OrePrefixes.pipeMedium.get(Materials.StainlessSteel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Pump_EV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "SXO", "dPw", "OMW", 'M', ItemList.Electric_Motor_EV, 'O',
                 OrePrefixes.ring.get(Materials.AnyRubber), 'X', OrePrefixes.rotor.get(Materials.StainlessSteel), 'S',
                 OrePrefixes.screw.get(Materials.StainlessSteel), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium),
                 'P', OrePrefixes.pipeMedium.get(Materials.Titanium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Electric_Pump_IV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "SXO", "dPw", "OMW", 'M', ItemList.Electric_Motor_IV, 'O',
                 OrePrefixes.ring.get(Materials.AnySyntheticRubber), 'X', OrePrefixes.rotor.get(Materials.TungstenSteel),
                 'S', OrePrefixes.screw.get(Materials.TungstenSteel), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten),
                 'P', OrePrefixes.pipeMedium.get(Materials.TungstenSteel) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Conveyor_Module_LV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "RRR", "MCM", "RRR", 'M', ItemList.Electric_Motor_LV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Tin), 'R', OrePrefixes.plate.get(Materials.AnyRubber) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Conveyor_Module_MV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "RRR", "MCM", "RRR", 'M', ItemList.Electric_Motor_MV, 'C',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper), 'R', OrePrefixes.plate.get(Materials.AnyRubber) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Conveyor_Module_HV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "RRR", "MCM", "RRR", 'M', ItemList.Electric_Motor_HV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Gold), 'R', OrePrefixes.plate.get(Materials.AnyRubber) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Conveyor_Module_EV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "RRR", "MCM", "RRR", 'M', ItemList.Electric_Motor_EV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Aluminium), 'R', OrePrefixes.plate.get(Materials.AnyRubber) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Conveyor_Module_IV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "RRR", "MCM", "RRR", 'M', ItemList.Electric_Motor_IV, 'C',
                 OrePrefixes.cableGt01.get(Materials.Tungsten), 'R',
                 OrePrefixes.plate.get(Materials.AnySyntheticRubber) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Robot_Arm_LV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Steel), 'M',
                 ItemList.Electric_Motor_LV, 'P', ItemList.Electric_Piston_LV, 'E',
                 OrePrefixes.circuit.get(Materials.LV), 'C', OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Robot_Arm_MV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Aluminium), 'M',
                 ItemList.Electric_Motor_MV, 'P', ItemList.Electric_Piston_MV, 'E',
                 OrePrefixes.circuit.get(Materials.MV), 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Robot_Arm_HV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.StainlessSteel), 'M',
                 ItemList.Electric_Motor_HV, 'P', ItemList.Electric_Piston_HV, 'E',
                 OrePrefixes.circuit.get(Materials.HV), 'C', OrePrefixes.cableGt01.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Robot_Arm_EV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Titanium), 'M',
                 ItemList.Electric_Motor_EV, 'P', ItemList.Electric_Piston_EV, 'E',
                 OrePrefixes.circuit.get(Materials.EV), 'C', OrePrefixes.cableGt01.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Robot_Arm_IV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.TungstenSteel), 'M',
                 ItemList.Electric_Motor_IV, 'P', ItemList.Electric_Piston_IV, 'E',
                 OrePrefixes.circuit.get(Materials.IV), 'C', OrePrefixes.cableGt01.get(Materials.Tungsten) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Emitter_LV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.CertusQuartz), 'S',
                 OrePrefixes.stick.get(Materials.Brass), 'C', OrePrefixes.circuit.get(Materials.LV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tin) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Emitter_MV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.EnderPearl), 'S',
                 OrePrefixes.stick.get(Materials.Electrum), 'C', OrePrefixes.circuit.get(Materials.MV), 'W',
                 OrePrefixes.cableGt01.get(Materials.AnyCopper) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Emitter_HV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.EnderEye), 'S',
                 OrePrefixes.stick.get(Materials.Chrome), 'C', OrePrefixes.circuit.get(Materials.HV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Gold) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Emitter_EV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "SSC", "WQS", "CWS", 'Q', ItemList.QuantumEye, 'S',
                 OrePrefixes.stick.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.EV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Aluminium) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Emitter_IV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "SSC", "WQS", "CWS", 'Q', ItemList.QuantumStar, 'S',
                 OrePrefixes.stick.get(Materials.Iridium), 'C', OrePrefixes.circuit.get(Materials.IV), 'W',
                 OrePrefixes.cableGt01.get(Materials.Tungsten) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Sensor_LV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gem.get(Materials.CertusQuartz), 'S',
                 OrePrefixes.stick.get(Materials.Brass), 'P', OrePrefixes.plate.get(Materials.Steel), 'C',
                 OrePrefixes.circuit.get(Materials.LV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Sensor_MV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gemFlawless.get(Materials.Emerald), 'S',
                 OrePrefixes.stick.get(Materials.Electrum), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'C',
                 OrePrefixes.circuit.get(Materials.MV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Sensor_HV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gem.get(Materials.EnderEye), 'S',
                 OrePrefixes.stick.get(Materials.Chrome), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'C',
                 OrePrefixes.circuit.get(Materials.HV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Sensor_EV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "P Q", "PS ", "CPP", 'Q', ItemList.QuantumEye, 'S',
                 OrePrefixes.stick.get(Materials.Platinum), 'P', OrePrefixes.plate.get(Materials.Titanium), 'C',
                 OrePrefixes.circuit.get(Materials.EV) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Sensor_IV.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "P Q", "PS ", "CPP", 'Q', ItemList.QuantumStar, 'S',
                 OrePrefixes.stick.get(Materials.Iridium), 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'C',
                 OrePrefixes.circuit.get(Materials.IV) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Component_Sawblade_Diamond.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { " D ", "DGD", " D ", 'D', OrePrefixes.dustSmall.get(Materials.Diamond), 'G',
                 OrePrefixes.gearGt.get(Materials.CobaltBrass) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Component_Grinder_Diamond.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "DSD", "SIS", "DSD", 'I', OrePrefixes.gem.get(Materials.Diamond), 'D',
                 OrePrefixes.dust.get(Materials.Diamond), 'S', OrePrefixes.plateDouble.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Component_Grinder_Tungsten.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "TST", "SIS", "TST", 'I', OreDictNames.craftingIndustrialDiamond, 'T',
                 OrePrefixes.plate.get(Materials.Tungsten), 'S', OrePrefixes.plateDouble.get(Materials.Steel) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Cover_Screen.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "AGA", "RPB", "ALA", 'A', OrePrefixes.plate.get(Materials.Aluminium), 'L',
                 OrePrefixes.dust.get(Materials.Glowstone), 'R', Dyes.dyeRed, 'G', Dyes.dyeLime, 'B', Dyes.dyeBlue, 'P',
                 OrePrefixes.plate.get(Materials.Glass) });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Tool_Scanner.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
+                | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "EPR", "CSC", "PBP", 'C', OrePrefixes.circuit.get(Materials.HV), 'P',
                 OrePrefixes.plate.get(Materials.Aluminium), 'E', ItemList.Emitter_MV, 'R', ItemList.Sensor_MV, 'S',
                 ItemList.Cover_Screen, 'B', ItemList.Battery_RE_MV_Lithium });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.ItemFilter_Export.get(1L),
             new Object[] { "SPS", "dIC", "SPS", 'P', OrePrefixes.plate.get(Materials.Tin), 'S',
                 OrePrefixes.screw.get(Materials.Iron), 'I', ItemList.Component_Filter, 'C',
                 ItemList.Conveyor_Module_LV });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.ItemFilter_Import.get(1L),
             new Object[] { "SPS", "CId", "SPS", 'P', OrePrefixes.plate.get(Materials.Tin), 'S',
                 OrePrefixes.screw.get(Materials.Iron), 'I', ItemList.Component_Filter, 'C',
                 ItemList.Conveyor_Module_LV });
 
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Tool_Cover_Copy_Paste.get(1L),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "PSP", "PCP", "PBP", 'P', OrePrefixes.plate.get(Materials.Aluminium), 'S',
                 ItemList.Tool_DataStick.get(1L), 'C', ItemList.Cover_Screen.get(1L), 'B',
                 ItemList.Battery_RE_MV_Lithium.get(1L) });
@@ -4313,188 +4302,188 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
 
     private void craftingShapelessRecipes() {
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Coin_Chocolate.get(1L),
             new Object[] { OrePrefixes.dust.get(Materials.Cocoa), OrePrefixes.dust.get(Materials.Milk),
                 OrePrefixes.dust.get(Materials.Sugar), OrePrefixes.foil.get(Materials.Gold) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Copper.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Iron });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Iron.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Silver });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Silver.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Gold });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Gold.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Platinum });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Platinum.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Osmium });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Iron.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Copper, ItemList.Credit_Copper, ItemList.Credit_Copper,
                 ItemList.Credit_Copper, ItemList.Credit_Copper, ItemList.Credit_Copper, ItemList.Credit_Copper,
                 ItemList.Credit_Copper });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Silver.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Iron, ItemList.Credit_Iron, ItemList.Credit_Iron, ItemList.Credit_Iron,
                 ItemList.Credit_Iron, ItemList.Credit_Iron, ItemList.Credit_Iron, ItemList.Credit_Iron });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Gold.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Silver, ItemList.Credit_Silver, ItemList.Credit_Silver,
                 ItemList.Credit_Silver, ItemList.Credit_Silver, ItemList.Credit_Silver, ItemList.Credit_Silver,
                 ItemList.Credit_Silver });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Platinum.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Gold, ItemList.Credit_Gold, ItemList.Credit_Gold, ItemList.Credit_Gold,
                 ItemList.Credit_Gold, ItemList.Credit_Gold, ItemList.Credit_Gold, ItemList.Credit_Gold });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Osmium.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Platinum, ItemList.Credit_Platinum, ItemList.Credit_Platinum,
                 ItemList.Credit_Platinum, ItemList.Credit_Platinum, ItemList.Credit_Platinum, ItemList.Credit_Platinum,
                 ItemList.Credit_Platinum });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Copper.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Cupronickel });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Cupronickel.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Silver });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Silver.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Gold });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Gold.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Platinum });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Platinum.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Osmium });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Osmium.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Naquadah });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Naquadah.get(8L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Neutronium });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Cupronickel.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Copper, ItemList.Credit_Greg_Copper, ItemList.Credit_Greg_Copper,
                 ItemList.Credit_Greg_Copper, ItemList.Credit_Greg_Copper, ItemList.Credit_Greg_Copper,
                 ItemList.Credit_Greg_Copper, ItemList.Credit_Greg_Copper });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Silver.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Cupronickel, ItemList.Credit_Greg_Cupronickel,
                 ItemList.Credit_Greg_Cupronickel, ItemList.Credit_Greg_Cupronickel, ItemList.Credit_Greg_Cupronickel,
                 ItemList.Credit_Greg_Cupronickel, ItemList.Credit_Greg_Cupronickel, ItemList.Credit_Greg_Cupronickel });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Gold.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Silver, ItemList.Credit_Greg_Silver, ItemList.Credit_Greg_Silver,
                 ItemList.Credit_Greg_Silver, ItemList.Credit_Greg_Silver, ItemList.Credit_Greg_Silver,
                 ItemList.Credit_Greg_Silver, ItemList.Credit_Greg_Silver });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Platinum.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Gold, ItemList.Credit_Greg_Gold, ItemList.Credit_Greg_Gold,
                 ItemList.Credit_Greg_Gold, ItemList.Credit_Greg_Gold, ItemList.Credit_Greg_Gold,
                 ItemList.Credit_Greg_Gold, ItemList.Credit_Greg_Gold });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Osmium.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Platinum, ItemList.Credit_Greg_Platinum, ItemList.Credit_Greg_Platinum,
                 ItemList.Credit_Greg_Platinum, ItemList.Credit_Greg_Platinum, ItemList.Credit_Greg_Platinum,
                 ItemList.Credit_Greg_Platinum, ItemList.Credit_Greg_Platinum });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Naquadah.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Osmium, ItemList.Credit_Greg_Osmium, ItemList.Credit_Greg_Osmium,
                 ItemList.Credit_Greg_Osmium, ItemList.Credit_Greg_Osmium, ItemList.Credit_Greg_Osmium,
                 ItemList.Credit_Greg_Osmium, ItemList.Credit_Greg_Osmium });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Credit_Greg_Neutronium.get(1L),
-            GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.KEEPNBT | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Credit_Greg_Naquadah, ItemList.Credit_Greg_Naquadah, ItemList.Credit_Greg_Naquadah,
                 ItemList.Credit_Greg_Naquadah, ItemList.Credit_Greg_Naquadah, ItemList.Credit_Greg_Naquadah,
                 ItemList.Credit_Greg_Naquadah, ItemList.Credit_Greg_Naquadah });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Schematic.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Schematic_Crafting });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Schematic.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Schematic_1by1 });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Schematic.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Schematic_2by2 });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Schematic.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Schematic_3by3 });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Schematic.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Schematic_Dust });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Tool_DataOrb.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Tool_DataOrb.get(1L) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Tool_DataStick.get(1L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
             new Object[] { ItemList.Tool_DataStick.get(1L) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Cover_RedstoneTransmitterInternal.get(1L),
             new Object[] { ItemList.Cover_RedstoneTransmitterExternal.get(1L) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Cover_RedstoneReceiverInternal.get(1L),
             new Object[] { ItemList.Cover_RedstoneReceiverExternal.get(1L) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Cover_RedstoneTransmitterExternal.get(1L),
             new Object[] { ItemList.Cover_RedstoneTransmitterInternal.get(1L) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Cover_RedstoneReceiverExternal.get(1L),
             new Object[] { ItemList.Cover_RedstoneReceiverInternal.get(1L) });
 
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.ItemFilter_Export.get(1L),
             new Object[] { ItemList.ItemFilter_Import.get(1L) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.ItemFilter_Import.get(1L),
             new Object[] { ItemList.ItemFilter_Export.get(1L) });
 
     }
 
     private void registerBehaviors() {
-        IItemBehaviour<GT_MetaBase_Item> behaviourSprayColorRemover = new Behaviour_Spray_Color_Remover(
+        IItemBehaviour<MetaBaseItem> behaviourSprayColorRemover = new BehaviourSprayColorRemover(
             ItemList.Spray_Empty.get(1L),
             ItemList.Spray_Color_Used_Remover.get(1L),
             ItemList.Spray_Color_Remover.get(1L),
@@ -4502,13 +4491,13 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         addItemBehavior(32000 + Spray_Color_Remover.ID, behaviourSprayColorRemover);
         addItemBehavior(32000 + Spray_Color_Used_Remover.ID, behaviourSprayColorRemover);
 
-        IItemBehaviour<GT_MetaBase_Item> behaviourMatches = new Behaviour_Lighter(
+        IItemBehaviour<MetaBaseItem> behaviourMatches = new BehaviourLighter(
             null,
             ItemList.Tool_Matches.get(1L),
             ItemList.Tool_Matches.get(1L),
             1L);
         addItemBehavior(32000 + Tool_Matches.ID, behaviourMatches);
-        IItemBehaviour<GT_MetaBase_Item> behaviourMatchBox = new Behaviour_Lighter(
+        IItemBehaviour<MetaBaseItem> behaviourMatchBox = new BehaviourLighter(
             null,
             ItemList.Tool_MatchBox_Used.get(1L),
             ItemList.Tool_MatchBox_Full.get(1L),
@@ -4516,7 +4505,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         addItemBehavior(32000 + Tool_MatchBox_Used.ID, behaviourMatchBox);
         addItemBehavior(32000 + Tool_MatchBox_Full.ID, behaviourMatchBox);
 
-        IItemBehaviour<GT_MetaBase_Item> behaviourLighterInvar = new Behaviour_Lighter(
+        IItemBehaviour<MetaBaseItem> behaviourLighterInvar = new BehaviourLighter(
             ItemList.Tool_Lighter_Invar_Empty.get(1L),
             ItemList.Tool_Lighter_Invar_Used.get(1L),
             ItemList.Tool_Lighter_Invar_Full.get(1L),
@@ -4524,7 +4513,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         addItemBehavior(32000 + Tool_Lighter_Invar_Used.ID, behaviourLighterInvar);
         addItemBehavior(32000 + Tool_Lighter_Invar_Full.ID, behaviourLighterInvar);
 
-        IItemBehaviour<GT_MetaBase_Item> behaviourLighterPlatinum = new Behaviour_Lighter(
+        IItemBehaviour<MetaBaseItem> behaviourLighterPlatinum = new BehaviourLighter(
             ItemList.Tool_Lighter_Platinum_Empty.get(1L),
             ItemList.Tool_Lighter_Platinum_Used.get(1L),
             ItemList.Tool_Lighter_Platinum_Full.get(1L),
@@ -4533,7 +4522,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         addItemBehavior(32000 + Tool_Lighter_Platinum_Full.ID, behaviourLighterPlatinum);
 
         for (int i = 0; i < 16; i++) {
-            IItemBehaviour<GT_MetaBase_Item> behaviourSprayColor = new Behaviour_Spray_Color(
+            IItemBehaviour<MetaBaseItem> behaviourSprayColor = new BehaviourSprayColor(
                 ItemList.Spray_Empty.get(1L),
                 ItemList.SPRAY_CAN_DYES_USED[i].get(1L),
                 ItemList.SPRAY_CAN_DYES[i].get(1L),
@@ -4545,45 +4534,45 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
     }
 
     private void setAllElectricStats() {
-        setElectricStats(32000 + Battery_RE_ULV_Tantalum.ID, 1000L, GT_Values.V[0], 0L, -3L, false);
-        setElectricStats(32000 + Battery_SU_LV_Sulfuric_Acid.ID, 18000L, GT_Values.V[1], 1L, -2L, true);
-        setElectricStats(32000 + Battery_SU_LV_Mercury.ID, 32000L, GT_Values.V[1], 1L, -2L, true);
-        setElectricStats(32000 + Battery_RE_LV_Cadmium.ID, 75000L, GT_Values.V[1], 1L, -3L, true);
-        setElectricStats(32000 + Battery_RE_LV_Lithium.ID, 100000L, GT_Values.V[1], 1L, -3L, true);
-        setElectricStats(32000 + Battery_RE_LV_Sodium.ID, 50000L, GT_Values.V[1], 1L, -3L, true);
-        setElectricStats(32000 + Battery_SU_MV_Sulfuric_Acid.ID, 72000L, GT_Values.V[2], 2L, -2L, true);
-        setElectricStats(32000 + Battery_SU_MV_Mercury.ID, 128000L, GT_Values.V[2], 2L, -2L, true);
-        setElectricStats(32000 + Battery_RE_MV_Cadmium.ID, 300000L, GT_Values.V[2], 2L, -3L, true);
-        setElectricStats(32000 + Battery_RE_MV_Lithium.ID, 400000L, GT_Values.V[2], 2L, -3L, true);
-        setElectricStats(32000 + Battery_RE_MV_Sodium.ID, 200000L, GT_Values.V[2], 2L, -3L, true);
-        setElectricStats(32000 + Battery_SU_HV_Sulfuric_Acid.ID, 288000L, GT_Values.V[3], 3L, -2L, true);
-        setElectricStats(32000 + Battery_SU_HV_Mercury.ID, 512000L, GT_Values.V[3], 3L, -2L, true);
-        setElectricStats(32000 + Battery_RE_HV_Cadmium.ID, 1200000L, GT_Values.V[3], 3L, -3L, true);
-        setElectricStats(32000 + Battery_RE_HV_Lithium.ID, 1600000L, GT_Values.V[3], 3L, -3L, true);
-        setElectricStats(32000 + Battery_RE_HV_Sodium.ID, 800000L, GT_Values.V[3], 3L, -3L, true);
-        setElectricStats(32000 + Energy_Lapotronic_Orb.ID, 100000000L, GT_Values.V[5], 5L, -3L, true);
-        setElectricStats(32000 + ID_MetaItem_01.ZPM.ID, 2000000000000L, GT_Values.V[7], 7L, -2L, true);
-        setElectricStats(32000 + Energy_Lapotronic_orb_2.ID, 1000000000L, GT_Values.V[6], 6L, -3L, true);
-        setElectricStats(32000 + ZPM2.ID, Long.MAX_VALUE, GT_Values.V[8], 8L, -3L, true);
-        setElectricStats(32000 + ZPM3.ID, Long.MAX_VALUE, GT_Values.V[12], 12L, -3L, true);
-        setElectricStats(32000 + ZPM4.ID, Long.MAX_VALUE, GT_Values.V[13], 13L, -3L, true);
-        setElectricStats(32000 + ZPM5.ID, Long.MAX_VALUE, GT_Values.V[14], 14L, -3L, true);
-        setElectricStats(32000 + ZPM6.ID, Long.MAX_VALUE, GT_Values.V[15], 15L, -3L, true);
-        setElectricStats(32000 + Energy_Module.ID, 10000000000L, GT_Values.V[7], 7L, -3L, true);
-        setElectricStats(32000 + Energy_Cluster.ID, 100000000000L, GT_Values.V[8], 8L, -3L, true);
-        setElectricStats(32000 + Tool_Cover_Copy_Paste.ID, 400000L, GT_Values.V[2], 2L, -1L, false);
+        setElectricStats(32000 + Battery_RE_ULV_Tantalum.ID, 1000L, GTValues.V[0], 0L, -3L, false);
+        setElectricStats(32000 + Battery_SU_LV_Sulfuric_Acid.ID, 18000L, GTValues.V[1], 1L, -2L, true);
+        setElectricStats(32000 + Battery_SU_LV_Mercury.ID, 32000L, GTValues.V[1], 1L, -2L, true);
+        setElectricStats(32000 + Battery_RE_LV_Cadmium.ID, 75000L, GTValues.V[1], 1L, -3L, true);
+        setElectricStats(32000 + Battery_RE_LV_Lithium.ID, 100000L, GTValues.V[1], 1L, -3L, true);
+        setElectricStats(32000 + Battery_RE_LV_Sodium.ID, 50000L, GTValues.V[1], 1L, -3L, true);
+        setElectricStats(32000 + Battery_SU_MV_Sulfuric_Acid.ID, 72000L, GTValues.V[2], 2L, -2L, true);
+        setElectricStats(32000 + Battery_SU_MV_Mercury.ID, 128000L, GTValues.V[2], 2L, -2L, true);
+        setElectricStats(32000 + Battery_RE_MV_Cadmium.ID, 300000L, GTValues.V[2], 2L, -3L, true);
+        setElectricStats(32000 + Battery_RE_MV_Lithium.ID, 400000L, GTValues.V[2], 2L, -3L, true);
+        setElectricStats(32000 + Battery_RE_MV_Sodium.ID, 200000L, GTValues.V[2], 2L, -3L, true);
+        setElectricStats(32000 + Battery_SU_HV_Sulfuric_Acid.ID, 288000L, GTValues.V[3], 3L, -2L, true);
+        setElectricStats(32000 + Battery_SU_HV_Mercury.ID, 512000L, GTValues.V[3], 3L, -2L, true);
+        setElectricStats(32000 + Battery_RE_HV_Cadmium.ID, 1200000L, GTValues.V[3], 3L, -3L, true);
+        setElectricStats(32000 + Battery_RE_HV_Lithium.ID, 1600000L, GTValues.V[3], 3L, -3L, true);
+        setElectricStats(32000 + Battery_RE_HV_Sodium.ID, 800000L, GTValues.V[3], 3L, -3L, true);
+        setElectricStats(32000 + Energy_Lapotronic_Orb.ID, 100000000L, GTValues.V[5], 5L, -3L, true);
+        setElectricStats(32000 + IDMetaItem01.ZPM.ID, 2000000000000L, GTValues.V[7], 7L, -2L, true);
+        setElectricStats(32000 + Energy_Lapotronic_orb_2.ID, 1000000000L, GTValues.V[6], 6L, -3L, true);
+        setElectricStats(32000 + ZPM2.ID, Long.MAX_VALUE, GTValues.V[8], 8L, -3L, true);
+        setElectricStats(32000 + ZPM3.ID, Long.MAX_VALUE, GTValues.V[12], 12L, -3L, true);
+        setElectricStats(32000 + ZPM4.ID, Long.MAX_VALUE, GTValues.V[13], 13L, -3L, true);
+        setElectricStats(32000 + ZPM5.ID, Long.MAX_VALUE, GTValues.V[14], 14L, -3L, true);
+        setElectricStats(32000 + ZPM6.ID, Long.MAX_VALUE, GTValues.V[15], 15L, -3L, true);
+        setElectricStats(32000 + Energy_Module.ID, 10000000000L, GTValues.V[7], 7L, -3L, true);
+        setElectricStats(32000 + Energy_Cluster.ID, 100000000000L, GTValues.V[8], 8L, -3L, true);
+        setElectricStats(32000 + Tool_Cover_Copy_Paste.ID, 400000L, GTValues.V[2], 2L, -1L, false);
         setElectricStats(32000 + Tool_Cheat.ID, -2000000000L, 1000000000L, -1L, -3L, false);
-        setElectricStats(32000 + Tool_Scanner.ID, 400000L, GT_Values.V[2], 2L, -1L, false);
-        setElectricStats(32000 + BatteryHull_EV_Full.ID, 6400000L, GT_Values.V[4], 4L, -3L, true);
-        setElectricStats(32000 + BatteryHull_IV_Full.ID, 25600000L, GT_Values.V[5], 5L, -3L, true);
-        setElectricStats(32000 + BatteryHull_LuV_Full.ID, 102400000L, GT_Values.V[6], 6L, -3L, true);
-        setElectricStats(32000 + BatteryHull_ZPM_Full.ID, 409600000L, GT_Values.V[7], 7L, -3L, true);
-        setElectricStats(32000 + BatteryHull_UV_Full.ID, 1638400000L, GT_Values.V[8], 8L, -3L, true);
-        setElectricStats(32000 + BatteryHull_UHV_Full.ID, 6553600000L, GT_Values.V[9], 9L, -3L, true);
-        setElectricStats(32000 + BatteryHull_UEV_Full.ID, 26214400000L, GT_Values.V[10], 10L, -3L, true);
-        setElectricStats(32000 + BatteryHull_UIV_Full.ID, 104857600000L, GT_Values.V[11], 11L, -3L, true);
-        setElectricStats(32000 + BatteryHull_UMV_Full.ID, 419430400000L, GT_Values.V[12], 12L, -3L, true);
-        setElectricStats(32000 + BatteryHull_UxV_Full.ID, 1677721600000L, GT_Values.V[13], 13L, -3L, true);
+        setElectricStats(32000 + Tool_Scanner.ID, 400000L, GTValues.V[2], 2L, -1L, false);
+        setElectricStats(32000 + BatteryHull_EV_Full.ID, 6400000L, GTValues.V[4], 4L, -3L, true);
+        setElectricStats(32000 + BatteryHull_IV_Full.ID, 25600000L, GTValues.V[5], 5L, -3L, true);
+        setElectricStats(32000 + BatteryHull_LuV_Full.ID, 102400000L, GTValues.V[6], 6L, -3L, true);
+        setElectricStats(32000 + BatteryHull_ZPM_Full.ID, 409600000L, GTValues.V[7], 7L, -3L, true);
+        setElectricStats(32000 + BatteryHull_UV_Full.ID, 1638400000L, GTValues.V[8], 8L, -3L, true);
+        setElectricStats(32000 + BatteryHull_UHV_Full.ID, 6553600000L, GTValues.V[9], 9L, -3L, true);
+        setElectricStats(32000 + BatteryHull_UEV_Full.ID, 26214400000L, GTValues.V[10], 10L, -3L, true);
+        setElectricStats(32000 + BatteryHull_UIV_Full.ID, 104857600000L, GTValues.V[11], 11L, -3L, true);
+        setElectricStats(32000 + BatteryHull_UMV_Full.ID, 419430400000L, GTValues.V[12], 12L, -3L, true);
+        setElectricStats(32000 + BatteryHull_UxV_Full.ID, 1677721600000L, GTValues.V[13], 13L, -3L, true);
     }
 
     private void registerTieredTooltips() {
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/MetaGeneratedItem02.java
index 857de00e6a..45404e36cd 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
+++ b/src/main/java/gregtech/common/items/MetaGeneratedItem02.java
@@ -1,6 +1,6 @@
 package gregtech.common.items;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ADVANCED_REDSTONE_RECEIVER;
@@ -13,205 +13,205 @@ import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Alcopops;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Apple_Juice;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Beer;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Cave_Johnsons_Grenade_Juice;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Chilly_Sauce;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Cider;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Dark_Beer;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Diablo_Sauce;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Diabolo_Sauce;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Dragon_Blood;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Glen_McKenner;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Golden_Apple_Juice;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Golden_Cider;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Grape_Juice;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Holy_Water;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Hops_Juice;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Hot_Sauce;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Iduns_Apple_Juice;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Lemon_Juice;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Lemonade;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Leninade;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Limoncello;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Milk;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Mineral_Water;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Notches_Brew;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Pirate_Brew;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Potato_Juice;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Purple_Drink;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Reed_Water;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Rum;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Salty_Water;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Scotch;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Snitches_Glitch_Sauce;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Vinegar;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Vodka;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Wheaty_Hops_Juice;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Wheaty_Juice;
-import static gregtech.common.items.ID_MetaItem_02.Bottle_Wine;
-import static gregtech.common.items.ID_MetaItem_02.Cover_AdvancedRedstoneReceiverExternal;
-import static gregtech.common.items.ID_MetaItem_02.Cover_AdvancedRedstoneReceiverInternal;
-import static gregtech.common.items.ID_MetaItem_02.Cover_AdvancedRedstoneTransmitterExternal;
-import static gregtech.common.items.ID_MetaItem_02.Cover_AdvancedRedstoneTransmitterInternal;
-import static gregtech.common.items.ID_MetaItem_02.Cover_WirelessActivityDetector;
-import static gregtech.common.items.ID_MetaItem_02.Cover_WirelessFluidDetector;
-import static gregtech.common.items.ID_MetaItem_02.Cover_WirelessItemDetector;
-import static gregtech.common.items.ID_MetaItem_02.Cover_WirelessNeedsMaintainance;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Argentia;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Aurelia;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Bauxite;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_BobsYerUncleRanks;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Chilly;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Coppon;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Cucumber;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Ferru;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Grapes;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Ilmenite;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Indigo;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Iridium;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Lemon;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_MTomato;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Manganese;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Mica;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_MilkWart;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Naquadah;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Nickel;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_OilBerry;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Onion;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Osmium;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Pitchblende;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Platinum;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Plumbilia;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Rape;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Scheelite;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_TeaLeaf;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Thorium;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Tine;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Tomato;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_UUABerry;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_UUMBerry;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Uraninite;
-import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Zinc;
-import static gregtech.common.items.ID_MetaItem_02.Display_ITS_FREE;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_00;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_01;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_02;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_03;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_04;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_05;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_06;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_07;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_08;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_09;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_10;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_11;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_12;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_13;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_14;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Color_15;
-import static gregtech.common.items.ID_MetaItem_02.Dye_Indigo;
-import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Baguette;
-import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Bun;
-import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Cake;
-import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Pizza_Cheese;
-import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Pizza_Meat;
-import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Pizza_Veggie;
-import static gregtech.common.items.ID_MetaItem_02.Food_Burger_Cheese;
-import static gregtech.common.items.ID_MetaItem_02.Food_Burger_Chum;
-import static gregtech.common.items.ID_MetaItem_02.Food_Burger_Meat;
-import static gregtech.common.items.ID_MetaItem_02.Food_Burger_Veggie;
-import static gregtech.common.items.ID_MetaItem_02.Food_Cheese;
-import static gregtech.common.items.ID_MetaItem_02.Food_ChiliChips;
-import static gregtech.common.items.ID_MetaItem_02.Food_Chum;
-import static gregtech.common.items.ID_MetaItem_02.Food_Chum_On_Stick;
-import static gregtech.common.items.ID_MetaItem_02.Food_Dough;
-import static gregtech.common.items.ID_MetaItem_02.Food_Dough_Chocolate;
-import static gregtech.common.items.ID_MetaItem_02.Food_Dough_Sugar;
-import static gregtech.common.items.ID_MetaItem_02.Food_Flat_Dough;
-import static gregtech.common.items.ID_MetaItem_02.Food_Fries;
-import static gregtech.common.items.ID_MetaItem_02.Food_Large_Sandwich_Bacon;
-import static gregtech.common.items.ID_MetaItem_02.Food_Large_Sandwich_Cheese;
-import static gregtech.common.items.ID_MetaItem_02.Food_Large_Sandwich_Steak;
-import static gregtech.common.items.ID_MetaItem_02.Food_Large_Sandwich_Veggie;
-import static gregtech.common.items.ID_MetaItem_02.Food_Packaged_ChiliChips;
-import static gregtech.common.items.ID_MetaItem_02.Food_Packaged_Fries;
-import static gregtech.common.items.ID_MetaItem_02.Food_Packaged_PotatoChips;
-import static gregtech.common.items.ID_MetaItem_02.Food_PotatoChips;
-import static gregtech.common.items.ID_MetaItem_02.Food_Potato_On_Stick;
-import static gregtech.common.items.ID_MetaItem_02.Food_Potato_On_Stick_Roasted;
-import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Baguette;
-import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Bread;
-import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Bun;
-import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Cake;
-import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Cookie;
-import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Fries;
-import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Pizza_Cheese;
-import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Pizza_Meat;
-import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Pizza_Veggie;
-import static gregtech.common.items.ID_MetaItem_02.Food_Raw_PotatoChips;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sandwich_Bacon;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sandwich_Cheese;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sandwich_Steak;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sandwich_Veggie;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Baguette;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Baguettes;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Bread;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Breads;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Bun;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Buns;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Cheese;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Cucumber;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Lemon;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Onion;
-import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Tomato;
-import static gregtech.common.items.ID_MetaItem_02.GelledToluene;
-import static gregtech.common.items.ID_MetaItem_02.MSFMixture;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Acacia;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Acacia_Green;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Balsa;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Baobab;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Birch;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Cherry;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Chestnut;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Citrus;
-import static gregtech.common.items.ID_MetaItem_02.Plank_DarkOak;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Ebony;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Greenheart;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Jungle;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Kapok;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Larch;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Lime;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Mahagony;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Mahoe;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Maple;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Oak;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Palm;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Papaya;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Pine;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Plum;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Poplar;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Sequoia;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Spruce;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Teak;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Walnut;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Wenge;
-import static gregtech.common.items.ID_MetaItem_02.Plank_Willow;
-import static gregtech.common.items.ID_MetaItem_02.SFMixture;
-import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Cafe_au_lait;
-import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Chocolate_Milk;
-import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Coffee;
-import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Dark_Cafe_au_lait;
-import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Dark_Chocolate_Milk;
-import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Dark_Coffee;
-import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Ice_Tea;
-import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Lait_au_cafe;
-import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Sweet_Tea;
-import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Tea;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
+import static gregtech.common.items.IDMetaItem02.Bottle_Alcopops;
+import static gregtech.common.items.IDMetaItem02.Bottle_Apple_Juice;
+import static gregtech.common.items.IDMetaItem02.Bottle_Beer;
+import static gregtech.common.items.IDMetaItem02.Bottle_Cave_Johnsons_Grenade_Juice;
+import static gregtech.common.items.IDMetaItem02.Bottle_Chilly_Sauce;
+import static gregtech.common.items.IDMetaItem02.Bottle_Cider;
+import static gregtech.common.items.IDMetaItem02.Bottle_Dark_Beer;
+import static gregtech.common.items.IDMetaItem02.Bottle_Diablo_Sauce;
+import static gregtech.common.items.IDMetaItem02.Bottle_Diabolo_Sauce;
+import static gregtech.common.items.IDMetaItem02.Bottle_Dragon_Blood;
+import static gregtech.common.items.IDMetaItem02.Bottle_Glen_McKenner;
+import static gregtech.common.items.IDMetaItem02.Bottle_Golden_Apple_Juice;
+import static gregtech.common.items.IDMetaItem02.Bottle_Golden_Cider;
+import static gregtech.common.items.IDMetaItem02.Bottle_Grape_Juice;
+import static gregtech.common.items.IDMetaItem02.Bottle_Holy_Water;
+import static gregtech.common.items.IDMetaItem02.Bottle_Hops_Juice;
+import static gregtech.common.items.IDMetaItem02.Bottle_Hot_Sauce;
+import static gregtech.common.items.IDMetaItem02.Bottle_Iduns_Apple_Juice;
+import static gregtech.common.items.IDMetaItem02.Bottle_Lemon_Juice;
+import static gregtech.common.items.IDMetaItem02.Bottle_Lemonade;
+import static gregtech.common.items.IDMetaItem02.Bottle_Leninade;
+import static gregtech.common.items.IDMetaItem02.Bottle_Limoncello;
+import static gregtech.common.items.IDMetaItem02.Bottle_Milk;
+import static gregtech.common.items.IDMetaItem02.Bottle_Mineral_Water;
+import static gregtech.common.items.IDMetaItem02.Bottle_Notches_Brew;
+import static gregtech.common.items.IDMetaItem02.Bottle_Pirate_Brew;
+import static gregtech.common.items.IDMetaItem02.Bottle_Potato_Juice;
+import static gregtech.common.items.IDMetaItem02.Bottle_Purple_Drink;
+import static gregtech.common.items.IDMetaItem02.Bottle_Reed_Water;
+import static gregtech.common.items.IDMetaItem02.Bottle_Rum;
+import static gregtech.common.items.IDMetaItem02.Bottle_Salty_Water;
+import static gregtech.common.items.IDMetaItem02.Bottle_Scotch;
+import static gregtech.common.items.IDMetaItem02.Bottle_Snitches_Glitch_Sauce;
+import static gregtech.common.items.IDMetaItem02.Bottle_Vinegar;
+import static gregtech.common.items.IDMetaItem02.Bottle_Vodka;
+import static gregtech.common.items.IDMetaItem02.Bottle_Wheaty_Hops_Juice;
+import static gregtech.common.items.IDMetaItem02.Bottle_Wheaty_Juice;
+import static gregtech.common.items.IDMetaItem02.Bottle_Wine;
+import static gregtech.common.items.IDMetaItem02.Cover_AdvancedRedstoneReceiverExternal;
+import static gregtech.common.items.IDMetaItem02.Cover_AdvancedRedstoneReceiverInternal;
+import static gregtech.common.items.IDMetaItem02.Cover_AdvancedRedstoneTransmitterExternal;
+import static gregtech.common.items.IDMetaItem02.Cover_AdvancedRedstoneTransmitterInternal;
+import static gregtech.common.items.IDMetaItem02.Cover_WirelessActivityDetector;
+import static gregtech.common.items.IDMetaItem02.Cover_WirelessFluidDetector;
+import static gregtech.common.items.IDMetaItem02.Cover_WirelessItemDetector;
+import static gregtech.common.items.IDMetaItem02.Cover_WirelessNeedsMaintainance;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Argentia;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Aurelia;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Bauxite;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_BobsYerUncleRanks;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Chilly;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Coppon;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Cucumber;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Ferru;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Grapes;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Ilmenite;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Indigo;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Iridium;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Lemon;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_MTomato;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Manganese;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Mica;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_MilkWart;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Naquadah;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Nickel;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_OilBerry;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Onion;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Osmium;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Pitchblende;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Platinum;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Plumbilia;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Rape;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Scheelite;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_TeaLeaf;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Thorium;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Tine;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Tomato;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_UUABerry;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_UUMBerry;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Uraninite;
+import static gregtech.common.items.IDMetaItem02.Crop_Drop_Zinc;
+import static gregtech.common.items.IDMetaItem02.Display_ITS_FREE;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_00;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_01;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_02;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_03;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_04;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_05;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_06;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_07;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_08;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_09;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_10;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_11;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_12;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_13;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_14;
+import static gregtech.common.items.IDMetaItem02.Dye_Color_15;
+import static gregtech.common.items.IDMetaItem02.Dye_Indigo;
+import static gregtech.common.items.IDMetaItem02.Food_Baked_Baguette;
+import static gregtech.common.items.IDMetaItem02.Food_Baked_Bun;
+import static gregtech.common.items.IDMetaItem02.Food_Baked_Cake;
+import static gregtech.common.items.IDMetaItem02.Food_Baked_Pizza_Cheese;
+import static gregtech.common.items.IDMetaItem02.Food_Baked_Pizza_Meat;
+import static gregtech.common.items.IDMetaItem02.Food_Baked_Pizza_Veggie;
+import static gregtech.common.items.IDMetaItem02.Food_Burger_Cheese;
+import static gregtech.common.items.IDMetaItem02.Food_Burger_Chum;
+import static gregtech.common.items.IDMetaItem02.Food_Burger_Meat;
+import static gregtech.common.items.IDMetaItem02.Food_Burger_Veggie;
+import static gregtech.common.items.IDMetaItem02.Food_Cheese;
+import static gregtech.common.items.IDMetaItem02.Food_ChiliChips;
+import static gregtech.common.items.IDMetaItem02.Food_Chum;
+import static gregtech.common.items.IDMetaItem02.Food_Chum_On_Stick;
+import static gregtech.common.items.IDMetaItem02.Food_Dough;
+import static gregtech.common.items.IDMetaItem02.Food_Dough_Chocolate;
+import static gregtech.common.items.IDMetaItem02.Food_Dough_Sugar;
+import static gregtech.common.items.IDMetaItem02.Food_Flat_Dough;
+import static gregtech.common.items.IDMetaItem02.Food_Fries;
+import static gregtech.common.items.IDMetaItem02.Food_Large_Sandwich_Bacon;
+import static gregtech.common.items.IDMetaItem02.Food_Large_Sandwich_Cheese;
+import static gregtech.common.items.IDMetaItem02.Food_Large_Sandwich_Steak;
+import static gregtech.common.items.IDMetaItem02.Food_Large_Sandwich_Veggie;
+import static gregtech.common.items.IDMetaItem02.Food_Packaged_ChiliChips;
+import static gregtech.common.items.IDMetaItem02.Food_Packaged_Fries;
+import static gregtech.common.items.IDMetaItem02.Food_Packaged_PotatoChips;
+import static gregtech.common.items.IDMetaItem02.Food_PotatoChips;
+import static gregtech.common.items.IDMetaItem02.Food_Potato_On_Stick;
+import static gregtech.common.items.IDMetaItem02.Food_Potato_On_Stick_Roasted;
+import static gregtech.common.items.IDMetaItem02.Food_Raw_Baguette;
+import static gregtech.common.items.IDMetaItem02.Food_Raw_Bread;
+import static gregtech.common.items.IDMetaItem02.Food_Raw_Bun;
+import static gregtech.common.items.IDMetaItem02.Food_Raw_Cake;
+import static gregtech.common.items.IDMetaItem02.Food_Raw_Cookie;
+import static gregtech.common.items.IDMetaItem02.Food_Raw_Fries;
+import static gregtech.common.items.IDMetaItem02.Food_Raw_Pizza_Cheese;
+import static gregtech.common.items.IDMetaItem02.Food_Raw_Pizza_Meat;
+import static gregtech.common.items.IDMetaItem02.Food_Raw_Pizza_Veggie;
+import static gregtech.common.items.IDMetaItem02.Food_Raw_PotatoChips;
+import static gregtech.common.items.IDMetaItem02.Food_Sandwich_Bacon;
+import static gregtech.common.items.IDMetaItem02.Food_Sandwich_Cheese;
+import static gregtech.common.items.IDMetaItem02.Food_Sandwich_Steak;
+import static gregtech.common.items.IDMetaItem02.Food_Sandwich_Veggie;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Baguette;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Baguettes;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Bread;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Breads;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Bun;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Buns;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Cheese;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Cucumber;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Lemon;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Onion;
+import static gregtech.common.items.IDMetaItem02.Food_Sliced_Tomato;
+import static gregtech.common.items.IDMetaItem02.GelledToluene;
+import static gregtech.common.items.IDMetaItem02.MSFMixture;
+import static gregtech.common.items.IDMetaItem02.Plank_Acacia;
+import static gregtech.common.items.IDMetaItem02.Plank_Acacia_Green;
+import static gregtech.common.items.IDMetaItem02.Plank_Balsa;
+import static gregtech.common.items.IDMetaItem02.Plank_Baobab;
+import static gregtech.common.items.IDMetaItem02.Plank_Birch;
+import static gregtech.common.items.IDMetaItem02.Plank_Cherry;
+import static gregtech.common.items.IDMetaItem02.Plank_Chestnut;
+import static gregtech.common.items.IDMetaItem02.Plank_Citrus;
+import static gregtech.common.items.IDMetaItem02.Plank_DarkOak;
+import static gregtech.common.items.IDMetaItem02.Plank_Ebony;
+import static gregtech.common.items.IDMetaItem02.Plank_Greenheart;
+import static gregtech.common.items.IDMetaItem02.Plank_Jungle;
+import static gregtech.common.items.IDMetaItem02.Plank_Kapok;
+import static gregtech.common.items.IDMetaItem02.Plank_Larch;
+import static gregtech.common.items.IDMetaItem02.Plank_Lime;
+import static gregtech.common.items.IDMetaItem02.Plank_Mahagony;
+import static gregtech.common.items.IDMetaItem02.Plank_Mahoe;
+import static gregtech.common.items.IDMetaItem02.Plank_Maple;
+import static gregtech.common.items.IDMetaItem02.Plank_Oak;
+import static gregtech.common.items.IDMetaItem02.Plank_Palm;
+import static gregtech.common.items.IDMetaItem02.Plank_Papaya;
+import static gregtech.common.items.IDMetaItem02.Plank_Pine;
+import static gregtech.common.items.IDMetaItem02.Plank_Plum;
+import static gregtech.common.items.IDMetaItem02.Plank_Poplar;
+import static gregtech.common.items.IDMetaItem02.Plank_Sequoia;
+import static gregtech.common.items.IDMetaItem02.Plank_Spruce;
+import static gregtech.common.items.IDMetaItem02.Plank_Teak;
+import static gregtech.common.items.IDMetaItem02.Plank_Walnut;
+import static gregtech.common.items.IDMetaItem02.Plank_Wenge;
+import static gregtech.common.items.IDMetaItem02.Plank_Willow;
+import static gregtech.common.items.IDMetaItem02.SFMixture;
+import static gregtech.common.items.IDMetaItem02.ThermosCan_Cafe_au_lait;
+import static gregtech.common.items.IDMetaItem02.ThermosCan_Chocolate_Milk;
+import static gregtech.common.items.IDMetaItem02.ThermosCan_Coffee;
+import static gregtech.common.items.IDMetaItem02.ThermosCan_Dark_Cafe_au_lait;
+import static gregtech.common.items.IDMetaItem02.ThermosCan_Dark_Chocolate_Milk;
+import static gregtech.common.items.IDMetaItem02.ThermosCan_Dark_Coffee;
+import static gregtech.common.items.IDMetaItem02.ThermosCan_Ice_Tea;
+import static gregtech.common.items.IDMetaItem02.ThermosCan_Lait_au_cafe;
+import static gregtech.common.items.IDMetaItem02.ThermosCan_Sweet_Tea;
+import static gregtech.common.items.IDMetaItem02.ThermosCan_Tea;
 
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnumEnchantmentType;
@@ -224,41 +224,41 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
-import gregtech.api.enums.TC_Aspects;
+import gregtech.api.enums.TCAspects;
 import gregtech.api.enums.TierEU;
-import gregtech.api.items.GT_MetaGenerated_Item_X32;
+import gregtech.api.items.MetaGeneratedItemX32;
 import gregtech.api.objects.ItemData;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_FoodStat;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.covers.redstone.GT_Cover_AdvancedRedstoneReceiverExternal;
-import gregtech.common.covers.redstone.GT_Cover_AdvancedRedstoneReceiverInternal;
-import gregtech.common.covers.redstone.GT_Cover_AdvancedRedstoneTransmitterExternal;
-import gregtech.common.covers.redstone.GT_Cover_AdvancedRedstoneTransmitterInternal;
-import gregtech.common.covers.redstone.GT_Cover_WirelessDoesWorkDetector;
-import gregtech.common.covers.redstone.GT_Cover_WirelessFluidDetector;
-import gregtech.common.covers.redstone.GT_Cover_WirelessItemDetector;
-import gregtech.common.covers.redstone.GT_Cover_WirelessMaintenanceDetector;
+import gregtech.api.util.GTFoodStat;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.covers.redstone.CoverAdvancedRedstoneReceiverExternal;
+import gregtech.common.covers.redstone.CoverAdvancedRedstoneReceiverInternal;
+import gregtech.common.covers.redstone.CoverAdvancedRedstoneTransmitterExternal;
+import gregtech.common.covers.redstone.CoverAdvancedRedstoneTransmitterInternal;
+import gregtech.common.covers.redstone.CoverWirelessDoesWorkDetector;
+import gregtech.common.covers.redstone.CoverWirelessFluidDetector;
+import gregtech.common.covers.redstone.CoverWirelessItemDetector;
+import gregtech.common.covers.redstone.CoverWirelessMaintenanceDetector;
 import ic2.api.crops.CropCard;
 import ic2.api.crops.Crops;
 
-public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
+public class MetaGeneratedItem02 extends MetaGeneratedItemX32 {
 
-    public static GT_MetaGenerated_Item_02 INSTANCE;
+    public static MetaGeneratedItem02 INSTANCE;
     private static final String aTextCover = "Usable as Cover";
 
-    public GT_MetaGenerated_Item_02() {
+    public MetaGeneratedItem02() {
         super(
             "metaitem.02",
             OrePrefixes.toolHeadSword,
@@ -300,12 +300,12 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 ThermosCan_Dark_Coffee.ID,
                 "Dark Coffee",
                 "Coffee, dark, without anything else",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.2F,
                     EnumAction.drink,
                     ItemList.ThermosCan_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.moveSpeed.id,
@@ -316,21 +316,21 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     400,
                     1,
                     70),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2L)));
         ItemList.ThermosCan_Dark_Cafe_au_lait.set(
             addItem(
                 ThermosCan_Dark_Cafe_au_lait.ID,
                 "Dark Coffee au lait",
                 "Keeping you awake the whole night",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.2F,
                     EnumAction.drink,
                     ItemList.ThermosCan_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.moveSpeed.id,
@@ -341,21 +341,21 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     400,
                     2,
                     90),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 3L)));
         ItemList.ThermosCan_Coffee.set(
             addItem(
                 ThermosCan_Coffee.ID,
                 "Coffee",
                 "Just the regular morning Coffee",
-                new GT_FoodStat(
+                new GTFoodStat(
                     3,
                     0.4F,
                     EnumAction.drink,
                     ItemList.ThermosCan_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.moveSpeed.id,
@@ -366,21 +366,21 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     400,
                     0,
                     50),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 1L)));
         ItemList.ThermosCan_Cafe_au_lait.set(
             addItem(
                 ThermosCan_Cafe_au_lait.ID,
                 "Cafe au lait",
                 "Sweet Coffee",
-                new GT_FoodStat(
+                new GTFoodStat(
                     3,
                     0.4F,
                     EnumAction.drink,
                     ItemList.ThermosCan_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.moveSpeed.id,
@@ -391,21 +391,21 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     400,
                     1,
                     70),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2L)));
         ItemList.ThermosCan_Lait_au_cafe.set(
             addItem(
                 ThermosCan_Lait_au_cafe.ID,
                 "Lait au cafe",
                 "You want Coffee to your Sugar?",
-                new GT_FoodStat(
+                new GTFoodStat(
                     3,
                     0.4F,
                     EnumAction.drink,
                     ItemList.ThermosCan_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.moveSpeed.id,
@@ -416,108 +416,108 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     400,
                     2,
                     90),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MOTUS, 3L)));
         ItemList.ThermosCan_Dark_Chocolate_Milk.set(
             addItem(
                 ThermosCan_Dark_Chocolate_Milk.ID,
                 "Dark Chocolate Milk",
                 "A bit bitter, better add a bit Sugar",
-                new GT_FoodStat(
+                new GTFoodStat(
                     3,
                     0.4F,
                     EnumAction.drink,
                     ItemList.ThermosCan_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.regeneration.id,
                     50,
                     1,
                     60),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 1L)));
         ItemList.ThermosCan_Chocolate_Milk.set(
             addItem(
                 ThermosCan_Chocolate_Milk.ID,
                 "Chocolate Milk",
                 "Sweet Goodness",
-                new GT_FoodStat(
+                new GTFoodStat(
                     3,
                     0.4F,
                     EnumAction.drink,
                     ItemList.ThermosCan_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.regeneration.id,
                     50,
                     1,
                     90),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 2L)));
         ItemList.ThermosCan_Tea.set(
             addItem(
                 ThermosCan_Tea.ID,
                 "Tea",
                 "Keep calm and carry on",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.2F,
                     EnumAction.drink,
                     ItemList.ThermosCan_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.moveSlowdown.id,
                     300,
                     0,
                     50),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 2L)));
         ItemList.ThermosCan_Sweet_Tea.set(
             addItem(
                 ThermosCan_Sweet_Tea.ID,
                 "Sweet Tea",
                 "How about a Tea Party? In Boston?",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.2F,
                     EnumAction.drink,
                     ItemList.ThermosCan_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 2L)));
         ItemList.ThermosCan_Ice_Tea.set(
             addItem(
                 ThermosCan_Ice_Tea.ID,
                 "Ice Tea",
                 "Better than this purple Junk Drink from failed Potions",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.2F,
                     EnumAction.drink,
                     ItemList.ThermosCan_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.moveSlowdown.id,
                     300,
                     0,
                     50),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 2L)));
 
         ItemList.GelledToluene.set(addItem(GelledToluene.ID, "Gelled Toluene", "Raw Explosive"));
 
@@ -526,52 +526,52 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 Bottle_Purple_Drink.ID,
                 "Purple Drink",
                 "How about Lemonade. Or some Ice Tea? I got Purple Drink!",
-                new GT_FoodStat(
+                new GTFoodStat(
                     8,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.moveSlowdown.id,
                     400,
                     1,
                     90),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VINCULUM, 1L)));
         ItemList.Bottle_Grape_Juice.set(
             addItem(
                 Bottle_Grape_Juice.ID,
                 "Grape Juice",
                 "This has a cleaning effect on your internals.",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.hunger.id,
                     400,
                     1,
                     60),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 1L)));
         ItemList.Bottle_Wine.set(
             addItem(
                 Bottle_Wine.ID,
                 "Wine",
                 "Ordinary",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -586,20 +586,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     200,
                     1,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 1L)));
         ItemList.Bottle_Vinegar.set(
             addItem(
                 Bottle_Vinegar.ID,
                 "Vinegar",
                 "Exquisite",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -618,36 +618,36 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     0,
                     2,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 1L)));
         ItemList.Bottle_Potato_Juice.set(
             addItem(
                 Bottle_Potato_Juice.ID,
                 "Potato Juice",
                 "Ever seen Potato Juice in stores? No? That has a reason.",
-                new GT_FoodStat(
+                new GTFoodStat(
                     3,
                     0.3F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L)));
         ItemList.Bottle_Vodka.set(
             addItem(
                 Bottle_Vodka.ID,
                 "Vodka",
                 "Not to confuse with Water",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -662,20 +662,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     200,
                     1,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.TELUM, 1L)));
         ItemList.Bottle_Leninade.set(
             addItem(
                 Bottle_Leninade.ID,
                 "Leninade",
                 "Let the Communism flow through you!",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -694,77 +694,77 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     0,
                     2,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.TELUM, 2L)));
         ItemList.Bottle_Mineral_Water.set(
             addItem(
                 Bottle_Mineral_Water.ID,
                 "Mineral Water",
                 "The best Stuff you can drink to stay healthy",
-                new GT_FoodStat(
+                new GTFoodStat(
                     1,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.regeneration.id,
                     100,
                     1,
                     10),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 1L)));
         ItemList.Bottle_Salty_Water.set(
             addItem(
                 Bottle_Salty_Water.ID,
                 "Salty Water",
                 "Like Sea Water but less dirty",
                 SubTag.INVISIBLE,
-                new GT_FoodStat(
+                new GTFoodStat(
                     1,
                     0.0F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.hunger.id,
                     400,
                     2,
                     95),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TEMPESTAS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.TEMPESTAS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Bottle_Reed_Water.set(
             addItem(
                 Bottle_Reed_Water.ID,
                 "Reed Water",
                 "I guess this tastes better when fermented",
-                new GT_FoodStat(
+                new GTFoodStat(
                     1,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L)));
         ItemList.Bottle_Rum.set(
             addItem(
                 Bottle_Rum.ID,
                 "Rum",
                 "A buddle o' rum",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.4F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -779,20 +779,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     200,
                     1,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1L)));
         ItemList.Bottle_Pirate_Brew.set(
             addItem(
                 Bottle_Pirate_Brew.ID,
                 "Pirate Brew",
                 "Set the Sails, we are going to Torrentuga!",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.4F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -811,36 +811,36 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     0,
                     2,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 2L)));
         ItemList.Bottle_Hops_Juice.set(
             addItem(
                 Bottle_Hops_Juice.ID,
                 "Hops Juice",
                 "Every Beer has a start",
-                new GT_FoodStat(
+                new GTFoodStat(
                     1,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L)));
         ItemList.Bottle_Dark_Beer.set(
             addItem(
                 Bottle_Dark_Beer.ID,
                 "Dark Beer",
                 "Dark Beer, for the real Men",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.4F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -855,20 +855,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     200,
                     1,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L)));
         ItemList.Bottle_Dragon_Blood.set(
             addItem(
                 Bottle_Dragon_Blood.ID,
                 "Dragon Blood",
                 "FUS RO DAH!",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.4F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -887,36 +887,36 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     0,
                     2,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 2L)));
         ItemList.Bottle_Wheaty_Juice.set(
             addItem(
                 Bottle_Wheaty_Juice.ID,
                 "Wheaty Juice",
                 "Is this liquefied Bread or what?",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L)));
         ItemList.Bottle_Scotch.set(
             addItem(
                 Bottle_Scotch.ID,
                 "Scotch",
                 "Technically this is just a Whisky",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -931,20 +931,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     200,
                     1,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1L)));
         ItemList.Bottle_Glen_McKenner.set(
             addItem(
                 Bottle_Glen_McKenner.ID,
                 "Glen McKenner",
                 "Don't hand to easily surprised people, they will shatter it.",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -963,36 +963,36 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     0,
                     2,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 2L)));
         ItemList.Bottle_Wheaty_Hops_Juice.set(
             addItem(
                 Bottle_Wheaty_Hops_Juice.ID,
                 "Wheaty Hops Juice",
                 "Also known as 'Duff-Lite'",
-                new GT_FoodStat(
+                new GTFoodStat(
                     1,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 2L)));
         ItemList.Bottle_Beer.set(
             addItem(
                 Bottle_Beer.ID,
                 "Beer",
                 "Good old Beer",
-                new GT_FoodStat(
+                new GTFoodStat(
                     6,
                     0.4F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -1007,20 +1007,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     100,
                     0,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 1L)));
         ItemList.Bottle_Chilly_Sauce.set(
             addItem(
                 Bottle_Chilly_Sauce.ID,
                 "Chilly Sauce",
                 "Spicy",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -1031,20 +1031,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     1000,
                     0,
                     60),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Bottle_Hot_Sauce.set(
             addItem(
                 Bottle_Hot_Sauce.ID,
                 "Hot Sauce",
                 "Very Spicy, I guess?",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -1055,20 +1055,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     2000,
                     0,
                     70),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 2L)));
         ItemList.Bottle_Diabolo_Sauce.set(
             addItem(
                 Bottle_Diabolo_Sauce.ID,
                 "Diabolo Sauce",
                 "As if the Devil made this Sauce",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -1079,20 +1079,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     3000,
                     0,
                     80),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 3L)));
         ItemList.Bottle_Diablo_Sauce.set(
             addItem(
                 Bottle_Diablo_Sauce.ID,
                 "Diablo Sauce",
                 "Diablo always comes back!",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -1103,21 +1103,21 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     4000,
                     0,
                     90),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 4L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 4L)));
         ItemList.Bottle_Snitches_Glitch_Sauce.set(
             addItem(
                 Bottle_Snitches_Glitch_Sauce.ID,
                 "Old Man Snitches glitched Diablo Sauce",
                 "[Missing No]",
                 SubTag.INVISIBLE,
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.1F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -1128,40 +1128,40 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     9999,
                     9,
                     999),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 5L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 5L)));
         ItemList.Bottle_Apple_Juice.set(
             addItem(
                 Bottle_Apple_Juice.ID,
                 "Apple Juice",
                 "Made of the Apples from our best Oak Farms",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.hunger.id,
                     400,
                     0,
                     20),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L)));
         ItemList.Bottle_Cider.set(
             addItem(
                 Bottle_Cider.ID,
                 "Cider",
                 "If you have nothing better to do with your Apples",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -1176,20 +1176,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     200,
                     1,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1L)));
         ItemList.Bottle_Golden_Apple_Juice.set(
             addItem(
                 Bottle_Golden_Apple_Juice.ID,
                 "Golden Apple Juice",
                 "A golden Apple in liquid form",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.hunger.id,
@@ -1204,20 +1204,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     100,
                     1,
                     100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 1L)));
         ItemList.Bottle_Golden_Cider.set(
             addItem(
                 Bottle_Golden_Cider.ID,
                 "Golden Cider",
                 "More Resistance, less Regeneration",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.confusion.id,
@@ -1232,20 +1232,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     200,
                     1,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1L)));
         ItemList.Bottle_Iduns_Apple_Juice.set(
             addItem(
                 Bottle_Iduns_Apple_Juice.ID,
                 "Idun's Apple Juice",
                 "So you got the Idea of using Notch Apples for a drink?",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.regeneration.id,
@@ -1264,20 +1264,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     6000,
                     0,
                     100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 9L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 9L)));
         ItemList.Bottle_Notches_Brew.set(
             addItem(
                 Bottle_Notches_Brew.ID,
                 "Notches Brew",
                 "This is just overpowered",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.regeneration.id,
@@ -1300,40 +1300,40 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     0,
                     2,
                     20),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 9L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 9L)));
         ItemList.Bottle_Lemon_Juice.set(
             addItem(
                 Bottle_Lemon_Juice.ID,
                 "Lemon Juice",
                 "Maybe adding Sugar will make it less sour",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.4F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.digSpeed.id,
                     1200,
                     0,
                     60),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 1L)));
         ItemList.Bottle_Limoncello.set(
             addItem(
                 Bottle_Limoncello.ID,
                 "Limoncello",
                 "An alcoholic Drink which tastes like Lemons",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.4F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.digSpeed.id,
@@ -1344,40 +1344,40 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     200,
                     1,
                     5),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 1L)));
         ItemList.Bottle_Lemonade.set(
             addItem(
                 Bottle_Lemonade.ID,
                 "Lemonade",
                 "Cold and refreshing Lemonade",
-                new GT_FoodStat(
+                new GTFoodStat(
                     4,
                     0.3F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.digSpeed.id,
                     900,
                     1,
                     90),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 1L)));
         ItemList.Bottle_Alcopops.set(
             addItem(
                 Bottle_Alcopops.ID,
                 "Alcopops",
                 "Don't let your Children drink this junk!",
-                new GT_FoodStat(
+                new GTFoodStat(
                     2,
                     0.2F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.digSpeed.id,
@@ -1388,188 +1388,188 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     300,
                     2,
                     20),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VENENUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VINCULUM, 1L)));
         ItemList.Bottle_Cave_Johnsons_Grenade_Juice.set(
             addItem(
                 Bottle_Cave_Johnsons_Grenade_Juice.ID,
                 "Cave Johnson's Grenade Juice",
                 "When life gives you Lemons, make Life take them Lemons back!",
-                new GT_FoodStat(
+                new GTFoodStat(
                     0,
                     0.0F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false).setExplosive(),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MORTUUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 1L)));
         ItemList.Bottle_Milk.set(
             addItem(
                 Bottle_Milk.ID,
                 "Milk",
                 "Got Milk?",
                 OrePrefixes.bottle.get(Materials.Milk),
-                new GT_FoodStat(
+                new GTFoodStat(
                     0,
                     0.0F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false).setMilk(),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 1L)));
         ItemList.Bottle_Holy_Water.set(
             addItem(
                 Bottle_Holy_Water.ID,
                 "Holy Water",
                 "May the holy Planks be with you",
                 OrePrefixes.bottle.get(Materials.HolyWater),
-                new GT_FoodStat(
+                new GTFoodStat(
                     0,
                     0.0F,
                     EnumAction.drink,
                     ItemList.Bottle_Empty.get(1L),
-                    GregTech_API.sDrinksAlwaysDrinkable,
+                    GregTechAPI.sDrinksAlwaysDrinkable,
                     false,
                     false,
                     Potion.poison.id,
                     100,
                     1,
                     100).setMilk(),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AURAM, 1L)));
 
         ItemList.Food_Potato_On_Stick.set(
             addItem(
                 Food_Potato_On_Stick.ID,
                 "Potato on a Stick",
                 "Totally looks like a Crab Claw",
-                new GT_FoodStat(1, 0.3F, EnumAction.eat, new ItemStack(Items.stick, 1), false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+                new GTFoodStat(1, 0.3F, EnumAction.eat, new ItemStack(Items.stick, 1), false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Food_Potato_On_Stick_Roasted.set(
             addItem(
                 Food_Potato_On_Stick_Roasted.ID,
                 "Roasted Potato on a Stick",
                 "Still looks like a Crab Claw",
-                new GT_FoodStat(6, 0.6F, EnumAction.eat, new ItemStack(Items.stick, 1), false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(6, 0.6F, EnumAction.eat, new ItemStack(Items.stick, 1), false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Raw_Fries.set(
             addItem(
                 Food_Raw_Fries.ID,
                 "Potato Strips",
                 "It's Potato in Stripe Form",
-                new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)));
+                new GTFoodStat(1, 0.3F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L)));
         ItemList.Food_Fries.set(
             addItem(
                 Food_Fries.ID,
                 "Fries",
                 "Not to confuse with Fry the Delivery Boy",
-                new GT_FoodStat(7, 0.5F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(7, 0.5F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Packaged_Fries.set(
             addItem(
                 Food_Packaged_Fries.ID,
                 "Fries",
                 "Ketchup not included",
-                new GT_FoodStat(
+                new GTFoodStat(
                     7,
                     0.5F,
                     EnumAction.eat,
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 1L),
                     false,
                     true,
                     false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Raw_PotatoChips.set(
             addItem(
                 Food_Raw_PotatoChips.ID,
                 "Potato Chips (Raw)",
                 "Just like a Potato",
-                new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)));
+                new GTFoodStat(1, 0.3F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L)));
         ItemList.Food_PotatoChips.set(
             addItem(
                 Food_PotatoChips.ID,
                 "Potato Chips",
                 "Crunchy",
-                new GT_FoodStat(7, 0.5F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(7, 0.5F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_ChiliChips.set(
             addItem(
                 Food_ChiliChips.ID,
                 "Chili Chips",
                 "Spicy",
-                new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(7, 0.6F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Packaged_PotatoChips.set(
             addItem(
                 Food_Packaged_PotatoChips.ID,
                 "Bag of Potato Chips",
                 "Full of delicious Air",
-                new GT_FoodStat(
+                new GTFoodStat(
                     7,
                     0.5F,
                     EnumAction.eat,
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1L),
                     false,
                     true,
                     false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Packaged_ChiliChips.set(
             addItem(
                 Food_Packaged_ChiliChips.ID,
                 "Bag of Chili Chips",
                 "Stop making noises Baj!",
-                new GT_FoodStat(
+                new GTFoodStat(
                     7,
                     0.6F,
                     EnumAction.eat,
-                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1L),
+                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1L),
                     false,
                     true,
                     false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Chum.set(
             addItem(
                 Food_Chum.ID,
                 "Chum",
                 "Chum is Fum!",
-                new GT_FoodStat(
+                new GTFoodStat(
                     5,
                     0.2F,
                     EnumAction.eat,
@@ -1585,15 +1585,15 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     300,
                     1,
                     80),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Chum_On_Stick.set(
             addItem(
                 Food_Chum_On_Stick.ID,
                 "Chum on a Stick",
                 "Don't forget to try our Chum-balaya",
-                new GT_FoodStat(
+                new GTFoodStat(
                     5,
                     0.2F,
                     EnumAction.eat,
@@ -1609,77 +1609,77 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     300,
                     1,
                     80),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Dough_Sugar.set(
             addItem(
                 Food_Dough_Sugar.ID,
                 "Sugary Dough",
                 "Don't eat the Dough before it is baken",
-                new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Food_Dough_Chocolate.set(
             addItem(
                 Food_Dough_Chocolate.ID,
                 "Chocolate Dough",
                 "I said don't eat the Dough!",
-                new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Food_Raw_Cookie.set(
             addItem(
                 Food_Raw_Cookie.ID,
                 "Cookie shaped Dough",
                 "For baking Cookies",
-                new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
 
         ItemList.Food_Sliced_Buns.set(
             addItem(
                 Food_Sliced_Buns.ID,
                 "Buns",
                 "Pre Sliced",
-                new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(3, 0.5F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Burger_Veggie.set(
             addItem(
                 Food_Burger_Veggie.ID,
                 "Veggieburger",
                 "No matter how you call this, this is NOT a Burger!",
-                new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(3, 0.5F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Burger_Cheese.set(
             addItem(
                 Food_Burger_Cheese.ID,
                 "Cheeseburger",
                 "Cheesy!",
-                new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
+                new GTFoodStat(3, 0.5F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
                 new ItemData(Materials.Cheese, 907200L)));
         ItemList.Food_Burger_Meat.set(
             addItem(
                 Food_Burger_Meat.ID,
                 "Hamburger",
                 "The Mc Burger Queen Burger",
-                new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(3, 0.5F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.CORPUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Burger_Chum.set(
             addItem(
                 Food_Burger_Chum.ID,
                 "Chumburger",
                 "Fum is Chum!",
-                new GT_FoodStat(
+                new GTFoodStat(
                     5,
                     0.2F,
                     EnumAction.eat,
@@ -1695,162 +1695,162 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     300,
                     1,
                     80),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
 
         ItemList.Food_Sliced_Breads.set(
             addItem(
                 Food_Sliced_Breads.ID,
                 "Breads",
                 "Pre Sliced",
-                new GT_FoodStat(5, 0.6F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(5, 0.6F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Sandwich_Veggie.set(
             addItem(
                 Food_Sandwich_Veggie.ID,
                 "Veggie Sandwich",
                 "Meatless",
-                new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(7, 0.6F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Sandwich_Cheese.set(
             addItem(
                 Food_Sandwich_Cheese.ID,
                 "Cheese Sandwich",
                 "Say Cheese!",
-                new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(7, 0.6F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Sandwich_Bacon.set(
             addItem(
                 Food_Sandwich_Bacon.ID,
                 "Bacon Sandwich",
                 "The best Sandwich ever!",
-                new GT_FoodStat(10, 0.8F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(10, 0.8F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.CORPUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Sandwich_Steak.set(
             addItem(
                 Food_Sandwich_Steak.ID,
                 "Steak Sandwich",
                 "Not a 'Steam Sandwich'",
-                new GT_FoodStat(10, 0.8F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(10, 0.8F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.CORPUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Sliced_Baguettes.set(
             addItem(
                 Food_Sliced_Baguettes.ID,
                 "Baguettes",
                 "Pre Sliced",
-                new GT_FoodStat(8, 0.5F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(8, 0.5F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Large_Sandwich_Veggie.set(
             addItem(
                 Food_Large_Sandwich_Veggie.ID,
                 "Large Veggie Sandwich",
                 "Just not worth it",
-                new GT_FoodStat(15, 0.8F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(15, 0.8F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Large_Sandwich_Cheese.set(
             addItem(
                 Food_Large_Sandwich_Cheese.ID,
                 "Large Cheese Sandwich",
                 "I need another cheesy tooltip for this",
-                new GT_FoodStat(15, 0.8F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(15, 0.8F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Large_Sandwich_Bacon.set(
             addItem(
                 Food_Large_Sandwich_Bacon.ID,
                 "Large Bacon Sandwich",
                 "For Men! (and manly Women)",
-                new GT_FoodStat(20, 1.0F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(20, 1.0F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.CORPUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Large_Sandwich_Steak.set(
             addItem(
                 Food_Large_Sandwich_Steak.ID,
                 "Large Steak Sandwich",
                 "Yes, I once accidentially called it 'Steam Sandwich'",
-                new GT_FoodStat(20, 1.0F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(20, 1.0F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.CORPUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Raw_Pizza_Veggie.set(
             addItem(
                 Food_Raw_Pizza_Veggie.ID,
                 "Raw Veggie Pizza",
                 "Into the Oven with it!",
-                new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(1, 0.2F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Raw_Pizza_Cheese.set(
             addItem(
                 Food_Raw_Pizza_Cheese.ID,
                 "Raw Cheese Pizza",
                 "Into the Oven with it!",
-                new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(2, 0.2F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Raw_Pizza_Meat.set(
             addItem(
                 Food_Raw_Pizza_Meat.ID,
                 "Raw Mince Meat Pizza",
                 "Into the Oven with it!",
-                new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(2, 0.2F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.CORPUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
 
         ItemList.Food_Baked_Pizza_Veggie.set(
             addItem(
                 Food_Baked_Pizza_Veggie.ID,
                 "Veggie Pizza",
                 "The next they want is Gluten Free Pizzas...",
-                new GT_FoodStat(3, 0.3F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(3, 0.3F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Baked_Pizza_Cheese.set(
             addItem(
                 Food_Baked_Pizza_Cheese.ID,
                 "Cheese Pizza",
                 "Pizza Magarita",
-                new GT_FoodStat(4, 0.4F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(4, 0.4F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Baked_Pizza_Meat.set(
             addItem(
                 Food_Baked_Pizza_Meat.ID,
                 "Mince Meat Pizza",
                 "Emo Pizza, it cuts itself!",
-                new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(5, 0.5F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.CORPUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
 
         ItemList.Dye_Indigo.set(
             addItem(
                 Dye_Indigo.ID,
                 "Indigo Dye",
                 "Blue Dye",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 1L),
                 Dyes.dyeBlue));
 
         int[] Dye_Colors = new int[] { Dye_Color_00.ID, Dye_Color_01.ID, Dye_Color_02.ID, Dye_Color_03.ID,
@@ -1864,93 +1864,85 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     "",
                     Dyes.get(i)
                         .name(),
-                    new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L)));
+                    new TCAspects.TC_AspectStack(TCAspects.SENSUS, 1L)));
         }
 
         ItemList.Plank_Oak
-            .set(addItem(Plank_Oak.ID, "Oak Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            .set(addItem(Plank_Oak.ID, "Oak Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Spruce.set(
-            addItem(Plank_Spruce.ID, "Spruce Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
-        ItemList.Plank_Birch.set(
-            addItem(Plank_Birch.ID, "Birch Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Spruce.ID, "Spruce Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
+        ItemList.Plank_Birch
+            .set(addItem(Plank_Birch.ID, "Birch Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Jungle.set(
-            addItem(Plank_Jungle.ID, "Jungle Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Jungle.ID, "Jungle Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Acacia.set(
-            addItem(Plank_Acacia.ID, "Acacia Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Acacia.ID, "Acacia Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_DarkOak.set(
-            addItem(
-                Plank_DarkOak.ID,
-                "Dark Oak Plank",
-                aTextCover,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
-        ItemList.Plank_Larch.set(
-            addItem(Plank_Larch.ID, "Larch Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_DarkOak.ID, "Dark Oak Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
+        ItemList.Plank_Larch
+            .set(addItem(Plank_Larch.ID, "Larch Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Teak
-            .set(addItem(Plank_Teak.ID, "Teak Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            .set(addItem(Plank_Teak.ID, "Teak Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Acacia_Green.set(
             addItem(
                 Plank_Acacia_Green.ID,
                 "Green Acacia Plank",
                 aTextCover,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Lime
-            .set(addItem(Plank_Lime.ID, "Lime Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            .set(addItem(Plank_Lime.ID, "Lime Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Chestnut.set(
             addItem(
                 Plank_Chestnut.ID,
                 "Chestnut Plank",
                 aTextCover,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
-        ItemList.Plank_Wenge.set(
-            addItem(Plank_Wenge.ID, "Wenge Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
+        ItemList.Plank_Wenge
+            .set(addItem(Plank_Wenge.ID, "Wenge Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Baobab.set(
-            addItem(Plank_Baobab.ID, "Baobab Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Baobab.ID, "Baobab Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Sequoia.set(
-            addItem(
-                Plank_Sequoia.ID,
-                "Sequoia Plank",
-                aTextCover,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
-        ItemList.Plank_Kapok.set(
-            addItem(Plank_Kapok.ID, "Kapok Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
-        ItemList.Plank_Ebony.set(
-            addItem(Plank_Ebony.ID, "Ebony Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Sequoia.ID, "Sequoia Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
+        ItemList.Plank_Kapok
+            .set(addItem(Plank_Kapok.ID, "Kapok Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
+        ItemList.Plank_Ebony
+            .set(addItem(Plank_Ebony.ID, "Ebony Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Mahagony.set(
             addItem(
                 Plank_Mahagony.ID,
                 "Mahagony Plank",
                 aTextCover,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
-        ItemList.Plank_Balsa.set(
-            addItem(Plank_Balsa.ID, "Balsa Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
+        ItemList.Plank_Balsa
+            .set(addItem(Plank_Balsa.ID, "Balsa Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Willow.set(
-            addItem(Plank_Willow.ID, "Willow Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Willow.ID, "Willow Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Walnut.set(
-            addItem(Plank_Walnut.ID, "Walnut Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Walnut.ID, "Walnut Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Greenheart.set(
             addItem(
                 Plank_Greenheart.ID,
                 "Greenheart Plank",
                 aTextCover,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Cherry.set(
-            addItem(Plank_Cherry.ID, "Cherry Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
-        ItemList.Plank_Mahoe.set(
-            addItem(Plank_Mahoe.ID, "Mahoe Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Cherry.ID, "Cherry Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
+        ItemList.Plank_Mahoe
+            .set(addItem(Plank_Mahoe.ID, "Mahoe Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Poplar.set(
-            addItem(Plank_Poplar.ID, "Poplar Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Poplar.ID, "Poplar Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Palm
-            .set(addItem(Plank_Palm.ID, "Palm Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            .set(addItem(Plank_Palm.ID, "Palm Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Papaya.set(
-            addItem(Plank_Papaya.ID, "Papaya Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Papaya.ID, "Papaya Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Pine
-            .set(addItem(Plank_Pine.ID, "Pine Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            .set(addItem(Plank_Pine.ID, "Pine Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Plum
-            .set(addItem(Plank_Plum.ID, "Plum Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
-        ItemList.Plank_Maple.set(
-            addItem(Plank_Maple.ID, "Maple Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            .set(addItem(Plank_Plum.ID, "Plum Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
+        ItemList.Plank_Maple
+            .set(addItem(Plank_Maple.ID, "Maple Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.Plank_Citrus.set(
-            addItem(Plank_Citrus.ID, "Citrus Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+            addItem(Plank_Citrus.ID, "Citrus Plank", aTextCover, new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
         ItemList.SFMixture.set(addItem(SFMixture.ID, "Super Fuel Binder", "Raw Material"));
         ItemList.MSFMixture.set(addItem(MSFMixture.ID, "Magic Super Fuel Binder", "Raw Material"));
 
@@ -1959,116 +1951,116 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 Crop_Drop_Plumbilia.ID,
                 "Plumbilia Leaf",
                 "Source of Lead",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 1L)));
         ItemList.Crop_Drop_Argentia.set(
             addItem(
                 Crop_Drop_Argentia.ID,
                 "Argentia Leaf",
                 "Source of Silver",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1L)));
         ItemList.Crop_Drop_Indigo.set(
             addItem(
                 Crop_Drop_Indigo.ID,
                 "Indigo Blossom",
                 "Used for making Blue Dye",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 1L)));
         ItemList.Crop_Drop_Ferru.set(
             addItem(
                 Crop_Drop_Ferru.ID,
                 "Ferru Leaf",
                 "Source of Iron",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2L)));
         ItemList.Crop_Drop_Aurelia.set(
             addItem(
                 Crop_Drop_Aurelia.ID,
                 "Aurelia Leaf",
                 "Source of Gold",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1L)));
         ItemList.Crop_Drop_TeaLeaf.set(
             addItem(
                 Crop_Drop_TeaLeaf.ID,
                 "Tea Leaf",
                 "Source of Tea",
                 "cropTea",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 1L)));
 
         ItemList.Crop_Drop_OilBerry.set(
             addItem(
                 Crop_Drop_OilBerry.ID,
                 "Oil Berry",
                 "Oil in Berry form",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L)));
         ItemList.Crop_Drop_BobsYerUncleRanks.set(
             addItem(
                 Crop_Drop_BobsYerUncleRanks.ID,
                 "Bobs-Yer-Uncle-Berry",
                 "Source of Emeralds",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1L)));
         ItemList.Crop_Drop_UUMBerry.set(
             addItem(
                 Crop_Drop_UUMBerry.ID,
                 "UUM Berry",
                 "UUM in Berry form",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L)));
         ItemList.Crop_Drop_UUABerry.set(
             addItem(
                 Crop_Drop_UUABerry.ID,
                 "UUA Berry",
                 "UUA in Berry form",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L)));
 
         ItemList.Crop_Drop_MilkWart.set(
             addItem(
                 Crop_Drop_MilkWart.ID,
                 "Milk Wart",
                 "Source of Milk",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 1L)));
 
         ItemList.Crop_Drop_Coppon.set(
             addItem(
                 Crop_Drop_Coppon.ID,
                 "Coppon Fiber",
                 "ORANGE WOOOOOOOL!!!",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 1L)));
 
         ItemList.Crop_Drop_Tine.set(
             addItem(
                 Crop_Drop_Tine.ID,
                 "Tine Twig",
                 "Source of Tin",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
 
         ItemList.Crop_Drop_Mica.set(
             addItem(
                 Crop_Drop_Mica.ID,
                 "Micadia Twig",
                 "Source of Mica",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.ARBOR, 1L)));
 
         ItemList.Crop_Drop_Bauxite.set(addItem(Crop_Drop_Bauxite.ID, "Bauxia Leaf", "Source of Aluminium"));
         ItemList.Crop_Drop_Ilmenite.set(addItem(Crop_Drop_Ilmenite.ID, "Titania Leaf", "Source of Titanium"));
@@ -2090,37 +2082,37 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 "Chilly Pepper",
                 "It is red and hot",
                 "cropChilipepper",
-                new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, Potion.confusion.id, 200, 1, 40),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, Potion.confusion.id, 200, 1, 40),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Crop_Drop_Lemon.set(
             addItem(
                 Crop_Drop_Lemon.ID,
                 "Lemon",
                 "Don't make Lemonade",
                 "cropLemon",
-                new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.3F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Crop_Drop_Tomato.set(
             addItem(
                 Crop_Drop_Tomato.ID,
                 "Tomato",
                 "Solid Ketchup",
                 "cropTomato",
-                new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.2F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Crop_Drop_MTomato.set(
             addItem(
                 Crop_Drop_MTomato.ID,
                 "Max Tomato",
                 "Full Health in one Tomato",
                 "cropTomato",
-                new GT_FoodStat(
+                new GTFoodStat(
                     9,
                     1.0F,
                     EnumAction.eat,
@@ -2132,47 +2124,47 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                     100,
                     100,
                     100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 3L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.SANO, 3L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Crop_Drop_Grapes.set(
             addItem(
                 Crop_Drop_Grapes.ID,
                 "Grapes",
                 "Source of Wine",
                 "cropGrape",
-                new GT_FoodStat(2, 0.3F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(2, 0.3F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Crop_Drop_Onion.set(
             addItem(
                 Crop_Drop_Onion.ID,
                 "Onion",
                 "Taking over the whole Taste",
                 "cropOnion",
-                new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(2, 0.2F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Crop_Drop_Cucumber.set(
             addItem(
                 Crop_Drop_Cucumber.ID,
                 "Cucumber",
                 "Not a Sea Cucumber!",
                 "cropCucumber",
-                new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.2F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Crop_Drop_Rape.set(
             addItem(
                 Crop_Drop_Rape.ID,
                 "Rape",
                 "Also known as Canola.",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.MESSIS, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1L)));
 
         ItemList.Food_Cheese.set(
             addItem(
@@ -2180,212 +2172,212 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 "Cheese",
                 "Click the Cheese",
                 "foodCheese",
-                new GT_FoodStat(3, 0.6F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L)));
+                new GTFoodStat(3, 0.6F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 2L)));
         ItemList.Food_Dough.set(
             addItem(
                 Food_Dough.ID,
                 "Dough",
                 "For making Breads",
                 "foodDough",
-                new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Food_Flat_Dough.set(
             addItem(
                 Food_Flat_Dough.ID,
                 "Flattened Dough",
                 "For making Pizza",
-                new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Food_Raw_Bread.set(
             addItem(
                 Food_Raw_Bread.ID,
                 "Dough",
                 "In Bread Shape",
-                new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.2F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Food_Raw_Bun.set(
             addItem(
                 Food_Raw_Bun.ID,
                 "Dough",
                 "In Bun Shape",
-                new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Food_Raw_Baguette.set(
             addItem(
                 Food_Raw_Baguette.ID,
                 "Dough",
                 "In Baguette Shape",
-                new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.3F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Food_Baked_Bun.set(
             addItem(
                 Food_Baked_Bun.ID,
                 "Bun",
                 "Do not teleport Bread!",
-                new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(3, 0.5F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Baked_Baguette.set(
             addItem(
                 Food_Baked_Baguette.ID,
                 "Baguette",
                 "I teleported nothing BUT Bread!!!",
-                new GT_FoodStat(8, 0.5F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(8, 0.5F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Sliced_Bread.set(
             addItem(
                 Food_Sliced_Bread.ID,
                 "Sliced Bread",
                 "Just half a Bread",
-                new GT_FoodStat(2, 0.3F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(2, 0.3F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Sliced_Bun.set(
             addItem(
                 Food_Sliced_Bun.ID,
                 "Sliced Bun",
                 "Just half a Bun",
-                new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(1, 0.3F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Sliced_Baguette.set(
             addItem(
                 Food_Sliced_Baguette.ID,
                 "Sliced Baguette",
                 "Just half a Baguette",
-                new GT_FoodStat(4, 0.3F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)));
+                new GTFoodStat(4, 0.3F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1L)));
         ItemList.Food_Raw_Cake.set(
             addItem(
                 Food_Raw_Cake.ID,
                 "Cake Bottom",
                 "For making Cake",
-                new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(2, 0.2F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Food_Baked_Cake.set(
             addItem(
                 Food_Baked_Cake.ID,
                 "Baked Cake Bottom",
                 "I know I promised you an actual Cake, but well...",
-                new GT_FoodStat(3, 0.3F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(3, 0.3F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
         ItemList.Food_Sliced_Lemon.set(
             addItem(
                 Food_Sliced_Lemon.ID,
                 "Lemon Slice",
                 "Ideal to put on your Drink",
-                new GT_FoodStat(1, 0.075F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)));
+                new GTFoodStat(1, 0.075F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L)));
         ItemList.Food_Sliced_Tomato.set(
             addItem(
                 Food_Sliced_Tomato.ID,
                 "Tomato Slice",
                 "Solid Ketchup",
-                new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)));
+                new GTFoodStat(1, 0.05F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L)));
         ItemList.Food_Sliced_Onion.set(
             addItem(
                 Food_Sliced_Onion.ID,
                 "Onion Slice",
                 "ONIONS, UNITE!",
-                new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)));
+                new GTFoodStat(1, 0.05F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L)));
         ItemList.Food_Sliced_Cucumber.set(
             addItem(
                 Food_Sliced_Cucumber.ID,
                 "Cucumber Slice",
                 "QUEWWW-CUMMM-BERRR!!!",
-                new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)));
+                new GTFoodStat(1, 0.05F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.HERBA, 1L)));
 
         ItemList.Food_Sliced_Cheese.set(
             addItem(
                 Food_Sliced_Cheese.ID,
                 "Cheese Slice",
                 "ALIEN ATTACK!!!, throw the CHEEEEESE!!!",
-                new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)));
+                new GTFoodStat(1, 0.1F, EnumAction.eat, null, false, true, false),
+                new TCAspects.TC_AspectStack(TCAspects.FAMES, 1L)));
 
         ItemList.Cover_AdvancedRedstoneTransmitterExternal.set(
             addItem(
                 Cover_AdvancedRedstoneTransmitterExternal.ID,
                 "Advanced Redstone Transmitter (External)",
                 "Transfers Redstone signals wirelessly/n Can only connect with advanced wireless covers",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L)));
         ItemList.Cover_AdvancedRedstoneTransmitterInternal.set(
             addItem(
                 Cover_AdvancedRedstoneTransmitterInternal.ID,
                 "Advanced Redstone Transmitter (Internal)",
                 "Transfers Redstone signals wirelessly/n Can only connect with advanced wireless covers",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L)));
         ItemList.Cover_AdvancedRedstoneReceiverExternal.set(
             addItem(
                 Cover_AdvancedRedstoneReceiverExternal.ID,
                 "Advanced Redstone Receiver (External)",
                 "Transfers Redstone signals wirelessly/n Can only connect with advanced wireless covers",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L)));
         ItemList.Cover_AdvancedRedstoneReceiverInternal.set(
             addItem(
                 Cover_AdvancedRedstoneReceiverInternal.ID,
                 "Advanced Redstone Receiver (Internal)",
                 "Transfers Redstone signals wirelessly/n Can only connect with advanced wireless covers",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L)));
 
         ItemList.Cover_WirelessFluidDetector.set(
             addItem(
                 Cover_WirelessFluidDetector.ID,
                 "Wireless Fluid Detector Cover",
                 "Transfers Fluid Amount as Redstone wirelessly/n Can only connect with advanced wireless covers",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L)));
         ItemList.Cover_WirelessItemDetector.set(
             addItem(
                 Cover_WirelessItemDetector.ID,
                 "Wireless Item Detector Cover",
                 "Transfers Item Amount as Redstone wirelessly/n Can only connect with advanced wireless covers",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.TERRA, 1L)));
 
         ItemList.Cover_WirelessNeedsMaintainance.set(
             addItem(
                 Cover_WirelessNeedsMaintainance.ID,
                 "Wireless Needs Maintenance Cover",
                 "Transfers Maintenance Issues as Redstone wirelessly/n Can only connect with advanced wireless covers",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 3L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 3L)));
 
         ItemList.Cover_WirelessActivityDetector.set(
             addItem(
                 Cover_WirelessActivityDetector.ID,
                 "Wireless Activity Detector Cover",
                 "Transfers Activity as Redstone wirelessly/n Can only connect with advanced wireless covers",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.SENSUS, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.TERRA, 1L)));
 
         ItemList.Display_ITS_FREE.set(
             addItem(
@@ -2393,17 +2385,17 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
                 "ITS FREE",
                 "(or at least almost free)",
                 SubTag.INVISIBLE,
-                new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)));
+                new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1L)));
 
         try {
             CropCard tCrop;
-            GT_Utility.getField(tCrop = Crops.instance.getCropList()[13], "mDrop")
+            GTUtility.getField(tCrop = Crops.instance.getCropList()[13], "mDrop")
                 .set(tCrop, ItemList.Crop_Drop_Ferru.get(1L));
-            GT_Utility.getField(tCrop = Crops.instance.getCropList()[14], "mDrop")
+            GTUtility.getField(tCrop = Crops.instance.getCropList()[14], "mDrop")
                 .set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L));
         } catch (Throwable e) {
-            if (GT_Values.D1) {
-                e.printStackTrace(GT_Log.err);
+            if (GTValues.D1) {
+                e.printStackTrace(GTLog.err);
             }
         }
 
@@ -2433,16 +2425,16 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
     @Override
     public boolean isItemStackUsable(ItemStack aStack) {
         int aDamage = aStack.getItemDamage();
-        Materials aMaterial = GregTech_API.sGeneratedMaterials[(aDamage % 1000)];
+        Materials aMaterial = GregTechAPI.sGeneratedMaterials[(aDamage % 1000)];
         if ((aDamage >= 25000) && (aDamage < 27000) && (aMaterial != null) && (aMaterial.mEnchantmentTools != null)) {
             Enchantment tEnchant = aMaterial.mEnchantmentTools == Enchantment.fortune ? Enchantment.looting
                 : aMaterial.mEnchantmentTools;
             if (tEnchant.type == EnumEnchantmentType.weapon) {
-                NBTTagCompound tNBT = GT_Utility.ItemNBT.getNBT(aStack);
+                NBTTagCompound tNBT = GTUtility.ItemNBT.getNBT(aStack);
                 if (!tNBT.getBoolean("GT.HasBeenUpdated")) {
                     tNBT.setBoolean("GT.HasBeenUpdated", true);
-                    GT_Utility.ItemNBT.setNBT(aStack, tNBT);
-                    GT_Utility.ItemNBT.addEnchantment(aStack, tEnchant, aMaterial.mEnchantmentToolsLevel);
+                    GTUtility.ItemNBT.setNBT(aStack, tNBT);
+                    GTUtility.ItemNBT.addEnchantment(aStack, tEnchant, aMaterial.mEnchantmentToolsLevel);
                 }
             }
         }
@@ -2501,29 +2493,29 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
     }
 
     public void initCraftingShapedRecipes() {
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Plank_Oak.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 0) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Plank_Spruce.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 1) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Plank_Birch.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 2) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Plank_Jungle.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 3) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Plank_Acacia.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 4) });
-        GT_ModHandler.addCraftingRecipe(
+        GTModHandler.addCraftingRecipe(
             ItemList.Plank_DarkOak.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
+            GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 5) });
     }
 
@@ -2531,8 +2523,8 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
         RA.stdBuilder()
             .itemInputs(
                 ItemList.Cover_RedstoneTransmitterExternal.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_MV)
@@ -2540,8 +2532,8 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
         RA.stdBuilder()
             .itemInputs(
                 ItemList.Cover_RedstoneReceiverExternal.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_MV)
@@ -2550,7 +2542,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             .itemInputs(
                 ItemList.Cover_FluidDetector.get(1L),
                 ItemList.Emitter_EV.get(1L),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Cover_WirelessFluidDetector.get(1L))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_MV)
@@ -2559,7 +2551,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             .itemInputs(
                 ItemList.Cover_ItemDetector.get(1L),
                 ItemList.Emitter_EV.get(1L),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Cover_WirelessItemDetector.get(1L))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_MV)
@@ -2568,7 +2560,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             .itemInputs(
                 ItemList.Cover_NeedsMaintainance.get(1L),
                 ItemList.Emitter_EV.get(1L),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Cover_WirelessNeedsMaintainance.get(1L))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_MV)
@@ -2577,7 +2569,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             .itemInputs(
                 ItemList.Cover_ActivityDetector.get(1L),
                 ItemList.Emitter_EV.get(1L),
-                GT_Utility.getIntegratedCircuit(1))
+                GTUtility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Cover_WirelessActivityDetector.get(1L))
             .duration(2 * MINUTES + 40 * SECONDS)
             .eut(TierEU.RECIPE_MV)
@@ -2585,16 +2577,16 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
     }
 
     public void initCraftingShapelessRecipes() {
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L),
             new Object[] { ItemList.Cover_AdvancedRedstoneReceiverInternal.get(1L) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Cover_AdvancedRedstoneReceiverInternal.get(1L),
             new Object[] { ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L),
             new Object[] { ItemList.Cover_AdvancedRedstoneTransmitterInternal.get(1L) });
-        GT_ModHandler.addShapelessCraftingRecipe(
+        GTModHandler.addShapelessCraftingRecipe(
             ItemList.Cover_AdvancedRedstoneTransmitterInternal.get(1L),
             new Object[] { ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L) });
     }
@@ -2686,13 +2678,13 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             .addTo(extractorRecipes);
         RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_Plumbilia.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
         RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_Argentia.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
@@ -2704,19 +2696,19 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             .addTo(extractorRecipes);
         RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_MilkWart.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
         RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_Coppon.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
         RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_Tine.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L))
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(extractorRecipes);
@@ -2812,21 +2804,21 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
     public void initMaceratorRecipes() {
         RA.stdBuilder()
             .itemInputs(ItemList.Food_Sliced_Cheese.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cheese, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cheese, 1L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
         RA.stdBuilder()
             .itemInputs(ItemList.Dye_Cocoa.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
         RA.stdBuilder()
             .itemInputs(ItemList.Crop_Drop_Tine.get(1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
@@ -2846,15 +2838,15 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             .addTo(maceratorRecipes);
 
         RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("crop", 1L))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
+            .itemInputs(GTModHandler.getIC2Item("crop", 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
 
         RA.stdBuilder()
             .itemInputs(new ItemStack(Items.stick, 1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L))
             .duration(20 * SECONDS)
             .eut(2)
             .addTo(maceratorRecipes);
@@ -2869,227 +2861,227 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
 
         RA.stdBuilder()
             .itemInputs(ItemList.Tesseract.get(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 8L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 8L))
             .duration(5 * SECONDS)
             .eut(TierEU.RECIPE_UIV)
             .addTo(maceratorRecipes);
     }
 
     public void registerCovers() {
-        GregTech_API.registerCover(ItemList.Plank_Oak.get(1L), TextureFactory.of(Blocks.planks, 0), null);
-        GregTech_API.registerCover(ItemList.Plank_Spruce.get(1L), TextureFactory.of(Blocks.planks, 1), null);
-        GregTech_API.registerCover(ItemList.Plank_Birch.get(1L), TextureFactory.of(Blocks.planks, 2), null);
-        GregTech_API.registerCover(ItemList.Plank_Jungle.get(1L), TextureFactory.of(Blocks.planks, 3), null);
-        GregTech_API.registerCover(ItemList.Plank_Acacia.get(1L), TextureFactory.of(Blocks.planks, 4), null);
-        GregTech_API.registerCover(ItemList.Plank_DarkOak.get(1L), TextureFactory.of(Blocks.planks, 5), null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(ItemList.Plank_Oak.get(1L), TextureFactory.of(Blocks.planks, 0), null);
+        GregTechAPI.registerCover(ItemList.Plank_Spruce.get(1L), TextureFactory.of(Blocks.planks, 1), null);
+        GregTechAPI.registerCover(ItemList.Plank_Birch.get(1L), TextureFactory.of(Blocks.planks, 2), null);
+        GregTechAPI.registerCover(ItemList.Plank_Jungle.get(1L), TextureFactory.of(Blocks.planks, 3), null);
+        GregTechAPI.registerCover(ItemList.Plank_Acacia.get(1L), TextureFactory.of(Blocks.planks, 4), null);
+        GregTechAPI.registerCover(ItemList.Plank_DarkOak.get(1L), TextureFactory.of(Blocks.planks, 5), null);
+        GregTechAPI.registerCover(
             ItemList.Plank_Larch.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 0, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 0, new ItemStack(Blocks.planks, 1, 0))),
                 0),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Teak.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 1, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 1, new ItemStack(Blocks.planks, 1, 0))),
                 1),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Acacia_Green.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 2, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 2, new ItemStack(Blocks.planks, 1, 0))),
                 2),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Lime.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 3, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 3, new ItemStack(Blocks.planks, 1, 0))),
                 3),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Chestnut.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 4, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 4, new ItemStack(Blocks.planks, 1, 0))),
                 4),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Wenge.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 5, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 5, new ItemStack(Blocks.planks, 1, 0))),
                 5),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Baobab.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 6, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 6, new ItemStack(Blocks.planks, 1, 0))),
                 6),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Sequoia.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 7, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 7, new ItemStack(Blocks.planks, 1, 0))),
                 7),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Kapok.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 8, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 8, new ItemStack(Blocks.planks, 1, 0))),
                 8),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Ebony.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 9, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 9, new ItemStack(Blocks.planks, 1, 0))),
                 9),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Mahagony.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 10, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 10, new ItemStack(Blocks.planks, 1, 0))),
                 10),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Balsa.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 11, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 11, new ItemStack(Blocks.planks, 1, 0))),
                 11),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Willow.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 12, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 12, new ItemStack(Blocks.planks, 1, 0))),
                 12),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Walnut.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 13, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 13, new ItemStack(Blocks.planks, 1, 0))),
                 13),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Greenheart.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 14, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 14, new ItemStack(Blocks.planks, 1, 0))),
                 14),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Cherry.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 15, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 15, new ItemStack(Blocks.planks, 1, 0))),
                 15),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Mahoe.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 16, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 16, new ItemStack(Blocks.planks, 1, 0))),
                 0),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Poplar.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 17, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 17, new ItemStack(Blocks.planks, 1, 0))),
                 1),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Palm.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 18, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 18, new ItemStack(Blocks.planks, 1, 0))),
                 2),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Papaya.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 19, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 19, new ItemStack(Blocks.planks, 1, 0))),
                 3),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Pine.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 20, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 20, new ItemStack(Blocks.planks, 1, 0))),
                 4),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Plum.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 21, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 21, new ItemStack(Blocks.planks, 1, 0))),
                 5),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Maple.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 22, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 22, new ItemStack(Blocks.planks, 1, 0))),
                 6),
             null);
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Plank_Citrus.get(1L),
             TextureFactory.of(
-                GT_Utility.getBlockFromStack(
-                    GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 23, new ItemStack(Blocks.planks, 1, 0))),
+                GTUtility.getBlockFromStack(
+                    GTModHandler.getModItem(Forestry.ID, "planks", 1L, 23, new ItemStack(Blocks.planks, 1, 0))),
                 7),
             null);
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)),
-            new GT_Cover_AdvancedRedstoneTransmitterExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)));
+            new CoverAdvancedRedstoneTransmitterExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_AdvancedRedstoneTransmitterInternal.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)),
-            new GT_Cover_AdvancedRedstoneTransmitterInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)));
+            new CoverAdvancedRedstoneTransmitterInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)),
-            new GT_Cover_AdvancedRedstoneReceiverExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)));
+            new CoverAdvancedRedstoneReceiverExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_AdvancedRedstoneReceiverInternal.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)),
-            new GT_Cover_AdvancedRedstoneReceiverInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)));
+            new CoverAdvancedRedstoneReceiverInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_WirelessFluidDetector.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR)),
-            new GT_Cover_WirelessFluidDetector(TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR)));
+            new CoverWirelessFluidDetector(TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_WirelessItemDetector.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR)),
-            new GT_Cover_WirelessItemDetector(TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR)));
+            new CoverWirelessItemDetector(TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_WirelessActivityDetector.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_ACTIVITYDETECTOR)),
-            new GT_Cover_WirelessDoesWorkDetector(TextureFactory.of(OVERLAY_WIRELESS_ACTIVITYDETECTOR)));
+            new CoverWirelessDoesWorkDetector(TextureFactory.of(OVERLAY_WIRELESS_ACTIVITYDETECTOR)));
 
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_WirelessNeedsMaintainance.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_MAINTENANCE_DETECTOR)),
-            new GT_Cover_WirelessMaintenanceDetector(TextureFactory.of(OVERLAY_WIRELESS_MAINTENANCE_DETECTOR)));
+            new CoverWirelessMaintenanceDetector(TextureFactory.of(OVERLAY_WIRELESS_MAINTENANCE_DETECTOR)));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/MetaGeneratedItem03.java
index 7d24a9e339..f06448d175 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
+++ b/src/main/java/gregtech/common/items/MetaGeneratedItem03.java
@@ -6,271 +6,271 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_METRICS_TRANSMITTER
 import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_UEV;
 import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_UHV;
 import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_UIV;
-import static gregtech.client.GT_TooltipHandler.Tier.EV;
-import static gregtech.client.GT_TooltipHandler.Tier.HV;
-import static gregtech.client.GT_TooltipHandler.Tier.IV;
-import static gregtech.client.GT_TooltipHandler.Tier.LV;
-import static gregtech.client.GT_TooltipHandler.Tier.LuV;
-import static gregtech.client.GT_TooltipHandler.Tier.MAX;
-import static gregtech.client.GT_TooltipHandler.Tier.MV;
-import static gregtech.client.GT_TooltipHandler.Tier.UEV;
-import static gregtech.client.GT_TooltipHandler.Tier.UHV;
-import static gregtech.client.GT_TooltipHandler.Tier.UIV;
-import static gregtech.client.GT_TooltipHandler.Tier.ULV;
-import static gregtech.client.GT_TooltipHandler.Tier.UMV;
-import static gregtech.client.GT_TooltipHandler.Tier.UV;
-import static gregtech.client.GT_TooltipHandler.Tier.UXV;
-import static gregtech.client.GT_TooltipHandler.Tier.ZPM;
-import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
-import static gregtech.common.items.ID_MetaItem_03.Activated_Carbon_Filter_Mesh;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Biomainframe;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Bioprocessor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Biowarecomputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Biowaresupercomputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Bio;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Bio_Ultra;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Coated_Basic;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Epoxy_Advanced;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Fiberglass_Advanced;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Multifiberglass_Elite;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Optical;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Phenolic_Good;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Plastic;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Plastic_Advanced;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Wetware;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Wetware_Extreme;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_BioCPU;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_Biocell;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_CPU;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_CrystalCPU;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_CrystalSoC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_CrystalSoC2;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_HPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_ILC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_LPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_NAND;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_NOR;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_NPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_NanoCPU;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_NeuroCPU;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_Optical;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_PIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_PPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_QPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_QuantumCPU;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_Ram;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_Simple_SoC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_SoC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_SoC2;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_Stemcell;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_UHPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_ULPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_CosmicAssembly;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_CosmicComputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_CosmicMainframe;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_CosmicProcessor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Crystalcomputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Crystalmainframe;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Crystalprocessor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Elitenanocomputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_ExoticAssembly;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_ExoticComputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_ExoticMainframe;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_ExoticProcessor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Integrated_Good;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Masterquantumcomputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Microprocessor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Nanocomputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Nanoprocessor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Neuroprocessor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_OpticalAssembly;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_OpticalComputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_OpticalMainframe;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_OpticalProcessor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_CapacitorASMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_CapacitorSMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_CapacitorXSMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_Chip_Bioware;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_Coil;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_DiodeASMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_DiodeSMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_DiodeXSMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_GlassFiber;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_Glass_Tube;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_InductorASMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_InductorSMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_InductorXSMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_PetriDish;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_RawCrystalChip;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_RawCrystalParts;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_Reinforced_Glass_Tube;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_ResistorASMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_ResistorSMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_ResistorXSMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_TransistorASMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_TransistorSMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_TransistorXSMD;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Processor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Quantumcomputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Quantummainframe;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Quantumprocessor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot2;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot3;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot4;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot5;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot6;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer2;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer3;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer4;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer5;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer6;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer7;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_TranscendentAssembly;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_TranscendentComputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_TranscendentMainframe;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_TranscendentProcessor;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Ultimatecrystalcomputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_Bioware;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_CPU;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_HPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_ILC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_LPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_NAND;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_NOR;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_NPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_NanoCPU;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_PIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_PPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_QPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_QuantumCPU;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_Ram;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_Simple_SoC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_SoC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_SoC2;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_UHPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_ULPIC;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wetwarecomputer;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wetwaremainframe;
-import static gregtech.common.items.ID_MetaItem_03.Circuit_Wetwaresupercomputer;
-import static gregtech.common.items.ID_MetaItem_03.Cover_Metrics_Transmitter;
-import static gregtech.common.items.ID_MetaItem_03.Cover_SolarPanel_UEV;
-import static gregtech.common.items.ID_MetaItem_03.Cover_SolarPanel_UHV;
-import static gregtech.common.items.ID_MetaItem_03.Cover_SolarPanel_UIV;
-import static gregtech.common.items.ID_MetaItem_03.EV_Coil;
-import static gregtech.common.items.ID_MetaItem_03.GalliumArsenideCrystal;
-import static gregtech.common.items.ID_MetaItem_03.GalliumArsenideCrystalSmallPart;
-import static gregtech.common.items.ID_MetaItem_03.HV_Coil;
-import static gregtech.common.items.ID_MetaItem_03.IV_Coil;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_AUTOMATION;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_1;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_2;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_3;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_4;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_5;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_6;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_7;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_8;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_8_Upgraded;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_COOLER;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_DESERT;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_DRYER;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_FLOWERING;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Frame;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_HEATER;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_HELL;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_HUMIDIFIER;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_JUNGLE;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_LIFESPAN;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_LIGHT;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_OCEAN;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_PLAINS;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_POLLEN;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_PRODUCTION;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_SEAL;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_SIEVE;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_SKY;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_STABILIZER;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_TERRITORY;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_UNLIGHT;
-import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_WINTER;
-import static gregtech.common.items.ID_MetaItem_03.KevlarFiber;
-import static gregtech.common.items.ID_MetaItem_03.LV_Coil;
-import static gregtech.common.items.ID_MetaItem_03.LuV_Coil;
-import static gregtech.common.items.ID_MetaItem_03.MV_Coil;
-import static gregtech.common.items.ID_MetaItem_03.NandChip;
-import static gregtech.common.items.ID_MetaItem_03.NuclearStar;
-import static gregtech.common.items.ID_MetaItem_03.Optical_Cpu_Containment_Housing;
-import static gregtech.common.items.ID_MetaItem_03.Optically_Compatible_Memory;
-import static gregtech.common.items.ID_MetaItem_03.Optically_Perfected_CPU;
-import static gregtech.common.items.ID_MetaItem_03.Phononic_Seed_Crystal;
-import static gregtech.common.items.ID_MetaItem_03.Quark_Catalyst_Housing;
-import static gregtech.common.items.ID_MetaItem_03.Quark_Creation_Catalyst_Bottom;
-import static gregtech.common.items.ID_MetaItem_03.Quark_Creation_Catalyst_Charm;
-import static gregtech.common.items.ID_MetaItem_03.Quark_Creation_Catalyst_Down;
-import static gregtech.common.items.ID_MetaItem_03.Quark_Creation_Catalyst_Strange;
-import static gregtech.common.items.ID_MetaItem_03.Quark_Creation_Catalyst_Top;
-import static gregtech.common.items.ID_MetaItem_03.Quark_Creation_Catalyst_Unaligned;
-import static gregtech.common.items.ID_MetaItem_03.Quark_Creation_Catalyst_Up;
-import static gregtech.common.items.ID_MetaItem_03.Relativistic_Heat_Capacitor;
-import static gregtech.common.items.ID_MetaItem_03.Spinneret;
-import static gregtech.common.items.ID_MetaItem_03.Thermal_Superconductor;
-import static gregtech.common.items.ID_MetaItem_03.Timepiece;
-import static gregtech.common.items.ID_MetaItem_03.Transdimensional_Alignment_Matrix;
-import static gregtech.common.items.ID_MetaItem_03.Tube_Wires;
-import static gregtech.common.items.ID_MetaItem_03.UHV_Coil;
-import static gregtech.common.items.ID_MetaItem_03.ULV_Coil;
-import static gregtech.common.items.ID_MetaItem_03.UV_Coil;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Axe;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Block;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Bolt;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Bottle;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Casing;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Cell;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_File;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Gear;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Hammer;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Hoe;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Ingot;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pickaxe;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pipe_Huge;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pipe_Large;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pipe_Medium;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pipe_Small;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pipe_Tiny;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Plate;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Ring;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Rod;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Rotor;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Saw;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Shovel;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Small_Gear;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Sword;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_ToolHeadDrill;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Turbine_Blade;
-import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Wire;
-import static gregtech.common.items.ID_MetaItem_03.WovenKevlar;
-import static gregtech.common.items.ID_MetaItem_03.ZPM_Coil;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import static gregtech.client.GTTooltipHandler.Tier.EV;
+import static gregtech.client.GTTooltipHandler.Tier.HV;
+import static gregtech.client.GTTooltipHandler.Tier.IV;
+import static gregtech.client.GTTooltipHandler.Tier.LV;
+import static gregtech.client.GTTooltipHandler.Tier.LuV;
+import static gregtech.client.GTTooltipHandler.Tier.MAX;
+import static gregtech.client.GTTooltipHandler.Tier.MV;
+import static gregtech.client.GTTooltipHandler.Tier.UEV;
+import static gregtech.client.GTTooltipHandler.Tier.UHV;
+import static gregtech.client.GTTooltipHandler.Tier.UIV;
+import static gregtech.client.GTTooltipHandler.Tier.ULV;
+import static gregtech.client.GTTooltipHandler.Tier.UMV;
+import static gregtech.client.GTTooltipHandler.Tier.UV;
+import static gregtech.client.GTTooltipHandler.Tier.UXV;
+import static gregtech.client.GTTooltipHandler.Tier.ZPM;
+import static gregtech.client.GTTooltipHandler.registerTieredTooltip;
+import static gregtech.common.items.IDMetaItem03.Activated_Carbon_Filter_Mesh;
+import static gregtech.common.items.IDMetaItem03.Circuit_Biomainframe;
+import static gregtech.common.items.IDMetaItem03.Circuit_Bioprocessor;
+import static gregtech.common.items.IDMetaItem03.Circuit_Biowarecomputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_Biowaresupercomputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Bio;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Bio_Ultra;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Coated_Basic;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Epoxy_Advanced;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Fiberglass_Advanced;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Multifiberglass_Elite;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Optical;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Phenolic_Good;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Plastic;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Plastic_Advanced;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Wetware;
+import static gregtech.common.items.IDMetaItem03.Circuit_Board_Wetware_Extreme;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_BioCPU;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_Biocell;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_CPU;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_CrystalCPU;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_CrystalSoC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_CrystalSoC2;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_HPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_ILC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_LPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_NAND;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_NOR;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_NPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_NanoCPU;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_NeuroCPU;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_Optical;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_PIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_PPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_QPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_QuantumCPU;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_Ram;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_Simple_SoC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_SoC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_SoC2;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_Stemcell;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_UHPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Chip_ULPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_CosmicAssembly;
+import static gregtech.common.items.IDMetaItem03.Circuit_CosmicComputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_CosmicMainframe;
+import static gregtech.common.items.IDMetaItem03.Circuit_CosmicProcessor;
+import static gregtech.common.items.IDMetaItem03.Circuit_Crystalcomputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_Crystalmainframe;
+import static gregtech.common.items.IDMetaItem03.Circuit_Crystalprocessor;
+import static gregtech.common.items.IDMetaItem03.Circuit_Elitenanocomputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_ExoticAssembly;
+import static gregtech.common.items.IDMetaItem03.Circuit_ExoticComputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_ExoticMainframe;
+import static gregtech.common.items.IDMetaItem03.Circuit_ExoticProcessor;
+import static gregtech.common.items.IDMetaItem03.Circuit_Integrated_Good;
+import static gregtech.common.items.IDMetaItem03.Circuit_Masterquantumcomputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_Microprocessor;
+import static gregtech.common.items.IDMetaItem03.Circuit_Nanocomputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_Nanoprocessor;
+import static gregtech.common.items.IDMetaItem03.Circuit_Neuroprocessor;
+import static gregtech.common.items.IDMetaItem03.Circuit_OpticalAssembly;
+import static gregtech.common.items.IDMetaItem03.Circuit_OpticalComputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_OpticalMainframe;
+import static gregtech.common.items.IDMetaItem03.Circuit_OpticalProcessor;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_CapacitorASMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_CapacitorSMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_CapacitorXSMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_Chip_Bioware;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_Coil;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_DiodeASMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_DiodeSMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_DiodeXSMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_GlassFiber;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_Glass_Tube;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_InductorASMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_InductorSMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_InductorXSMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_PetriDish;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_RawCrystalChip;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_RawCrystalParts;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_Reinforced_Glass_Tube;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_ResistorASMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_ResistorSMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_ResistorXSMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_TransistorASMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_TransistorSMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Parts_TransistorXSMD;
+import static gregtech.common.items.IDMetaItem03.Circuit_Processor;
+import static gregtech.common.items.IDMetaItem03.Circuit_Quantumcomputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_Quantummainframe;
+import static gregtech.common.items.IDMetaItem03.Circuit_Quantumprocessor;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Ingot;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Ingot2;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Ingot3;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Ingot4;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Ingot5;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Ingot6;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Wafer;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Wafer2;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Wafer3;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Wafer4;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Wafer5;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Wafer6;
+import static gregtech.common.items.IDMetaItem03.Circuit_Silicon_Wafer7;
+import static gregtech.common.items.IDMetaItem03.Circuit_TranscendentAssembly;
+import static gregtech.common.items.IDMetaItem03.Circuit_TranscendentComputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_TranscendentMainframe;
+import static gregtech.common.items.IDMetaItem03.Circuit_TranscendentProcessor;
+import static gregtech.common.items.IDMetaItem03.Circuit_Ultimatecrystalcomputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_Bioware;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_CPU;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_HPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_ILC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_LPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_NAND;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_NOR;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_NPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_NanoCPU;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_PIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_PPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_QPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_QuantumCPU;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_Ram;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_Simple_SoC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_SoC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_SoC2;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_UHPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wafer_ULPIC;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wetwarecomputer;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wetwaremainframe;
+import static gregtech.common.items.IDMetaItem03.Circuit_Wetwaresupercomputer;
+import static gregtech.common.items.IDMetaItem03.Cover_Metrics_Transmitter;
+import static gregtech.common.items.IDMetaItem03.Cover_SolarPanel_UEV;
+import static gregtech.common.items.IDMetaItem03.Cover_SolarPanel_UHV;
+import static gregtech.common.items.IDMetaItem03.Cover_SolarPanel_UIV;
+import static gregtech.common.items.IDMetaItem03.EV_Coil;
+import static gregtech.common.items.IDMetaItem03.GalliumArsenideCrystal;
+import static gregtech.common.items.IDMetaItem03.GalliumArsenideCrystalSmallPart;
+import static gregtech.common.items.IDMetaItem03.HV_Coil;
+import static gregtech.common.items.IDMetaItem03.IV_Coil;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_AUTOMATION;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_Acceleration_1;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_Acceleration_2;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_Acceleration_3;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_Acceleration_4;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_Acceleration_5;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_Acceleration_6;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_Acceleration_7;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_Acceleration_8;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_Acceleration_8_Upgraded;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_COOLER;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_DESERT;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_DRYER;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_FLOWERING;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_Frame;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_HEATER;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_HELL;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_HUMIDIFIER;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_JUNGLE;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_LIFESPAN;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_LIGHT;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_OCEAN;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_PLAINS;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_POLLEN;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_PRODUCTION;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_SEAL;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_SIEVE;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_SKY;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_STABILIZER;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_TERRITORY;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_UNLIGHT;
+import static gregtech.common.items.IDMetaItem03.IndustrialApiary_Upgrade_WINTER;
+import static gregtech.common.items.IDMetaItem03.KevlarFiber;
+import static gregtech.common.items.IDMetaItem03.LV_Coil;
+import static gregtech.common.items.IDMetaItem03.LuV_Coil;
+import static gregtech.common.items.IDMetaItem03.MV_Coil;
+import static gregtech.common.items.IDMetaItem03.NandChip;
+import static gregtech.common.items.IDMetaItem03.NuclearStar;
+import static gregtech.common.items.IDMetaItem03.Optical_Cpu_Containment_Housing;
+import static gregtech.common.items.IDMetaItem03.Optically_Compatible_Memory;
+import static gregtech.common.items.IDMetaItem03.Optically_Perfected_CPU;
+import static gregtech.common.items.IDMetaItem03.Phononic_Seed_Crystal;
+import static gregtech.common.items.IDMetaItem03.Quark_Catalyst_Housing;
+import static gregtech.common.items.IDMetaItem03.Quark_Creation_Catalyst_Bottom;
+import static gregtech.common.items.IDMetaItem03.Quark_Creation_Catalyst_Charm;
+import static gregtech.common.items.IDMetaItem03.Quark_Creation_Catalyst_Down;
+import static gregtech.common.items.IDMetaItem03.Quark_Creation_Catalyst_Strange;
+import static gregtech.common.items.IDMetaItem03.Quark_Creation_Catalyst_Top;
+import static gregtech.common.items.IDMetaItem03.Quark_Creation_Catalyst_Unaligned;
+import static gregtech.common.items.IDMetaItem03.Quark_Creation_Catalyst_Up;
+import static gregtech.common.items.IDMetaItem03.Relativistic_Heat_Capacitor;
+import static gregtech.common.items.IDMetaItem03.Spinneret;
+import static gregtech.common.items.IDMetaItem03.Thermal_Superconductor;
+import static gregtech.common.items.IDMetaItem03.Timepiece;
+import static gregtech.common.items.IDMetaItem03.Transdimensional_Alignment_Matrix;
+import static gregtech.common.items.IDMetaItem03.Tube_Wires;
+import static gregtech.common.items.IDMetaItem03.UHV_Coil;
+import static gregtech.common.items.IDMetaItem03.ULV_Coil;
+import static gregtech.common.items.IDMetaItem03.UV_Coil;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Axe;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Block;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Bolt;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Bottle;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Casing;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Cell;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_File;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Gear;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Hammer;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Hoe;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Ingot;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Pickaxe;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Pipe_Huge;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Pipe_Large;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Pipe_Medium;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Pipe_Small;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Pipe_Tiny;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Plate;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Ring;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Rod;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Rotor;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Saw;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Shovel;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Small_Gear;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Sword;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_ToolHeadDrill;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Turbine_Blade;
+import static gregtech.common.items.IDMetaItem03.White_Dwarf_Shape_Extruder_Wire;
+import static gregtech.common.items.IDMetaItem03.WovenKevlar;
+import static gregtech.common.items.IDMetaItem03.ZPM_Coil;
+
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.items.GT_MetaGenerated_Item_X32;
+import gregtech.api.enums.TCAspects;
+import gregtech.api.items.MetaGeneratedItemX32;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.covers.GT_Cover_Metrics_Transmitter;
-import gregtech.common.covers.GT_Cover_SolarPanel;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.common.covers.CoverMetricsTransmitter;
+import gregtech.common.covers.CoverSolarPanel;
 
-public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
+public class MetaGeneratedItem03 extends MetaGeneratedItemX32 {
 
-    public static GT_MetaGenerated_Item_03 INSTANCE;
+    public static MetaGeneratedItem03 INSTANCE;
 
-    public GT_MetaGenerated_Item_03() {
+    public MetaGeneratedItem03() {
         super(
             "metaitem.03",
             OrePrefixes.___placeholder___,
@@ -867,25 +867,25 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
                 Cover_SolarPanel_UHV.ID,
                 "Solar Panel (UHV)",
                 "Ultimate High Voltage Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 128L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 128L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 128L)));
         ItemList.Cover_SolarPanel_UEV.set(
             addItem(
                 Cover_SolarPanel_UEV.ID,
                 "Solar Panel (UEV)",
                 "Ultimate Extreme Voltage Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 256L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 256L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 256L)));
         ItemList.Cover_SolarPanel_UIV.set(
             addItem(
                 Cover_SolarPanel_UIV.ID,
                 "Solar Panel (UIV)",
                 "Ultimate Insane Voltage Solar Panel (Needs cleaning with right click)",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 512L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 512L)));
+                new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 512L),
+                new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 512L)));
 
         ItemList.ULV_Coil.set(addItem(ULV_Coil.ID, "Ultra Low Voltage Coil", "Primitive Coil", o));
         ItemList.LV_Coil.set(addItem(LV_Coil.ID, "Low Voltage Coil", "Basic Coil", o));
@@ -1113,7 +1113,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
                     "Creates a GregTech Advanced Sensor Card when attached",
                     "Works across dimensions or if machine is dismantled",
                     "Removing this cover will destroy the linked card",
-                    GT_Values.AuthorQuerns)));
+                    GTValues.AuthorQuerns)));
 
         ItemList.ActivatedCarbonFilterMesh.set(
             addItem(
@@ -1386,40 +1386,40 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
     }
 
     private void registerAllAnimatedTooltips() {
-        addItemTooltip(ItemList.Transdimensional_Alignment_Matrix.get(1), GT_Values.AuthorCloud);
+        addItemTooltip(ItemList.Transdimensional_Alignment_Matrix.get(1), GTValues.AuthorCloud);
     }
 
     private void initOreDictUnificatorEntries() {
-        GT_OreDictUnificator
+        GTOreDictUnificator
             .set(OrePrefixes.componentCircuit, Materials.Resistor, ItemList.Circuit_Parts_Resistor.get(1L));
-        GT_OreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Diode, ItemList.Circuit_Parts_Diode.get(1L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Diode, ItemList.Circuit_Parts_Diode.get(1L));
+        GTOreDictUnificator
             .set(OrePrefixes.componentCircuit, Materials.Transistor, ItemList.Circuit_Parts_Transistor.get(1L));
-        GT_OreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Inductor, ItemList.Circuit_Parts_Coil.get(1L));
-        GT_OreDictUnificator
+        GTOreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Inductor, ItemList.Circuit_Parts_Coil.get(1L));
+        GTOreDictUnificator
             .set(OrePrefixes.componentCircuit, Materials.Capacitor, ItemList.Circuit_Parts_Capacitor.get(1L));
 
-        GT_OreDictUnificator.addAssociation(
+        GTOreDictUnificator.addAssociation(
             OrePrefixes.componentCircuit,
             Materials.Resistor,
             ItemList.Circuit_Parts_ResistorSMD.get(1L),
             true);
-        GT_OreDictUnificator.addAssociation(
+        GTOreDictUnificator.addAssociation(
             OrePrefixes.componentCircuit,
             Materials.Diode,
             ItemList.Circuit_Parts_DiodeSMD.get(1L),
             true);
-        GT_OreDictUnificator.addAssociation(
+        GTOreDictUnificator.addAssociation(
             OrePrefixes.componentCircuit,
             Materials.Transistor,
             ItemList.Circuit_Parts_TransistorSMD.get(1L),
             true);
-        GT_OreDictUnificator.addAssociation(
+        GTOreDictUnificator.addAssociation(
             OrePrefixes.componentCircuit,
             Materials.Capacitor,
             ItemList.Circuit_Parts_CapacitorSMD.get(1L),
             true);
-        GT_OreDictUnificator.addAssociation(
+        GTOreDictUnificator.addAssociation(
             OrePrefixes.componentCircuit,
             Materials.Inductor,
             ItemList.Circuit_Parts_InductorSMD.get(1L),
@@ -1462,22 +1462,22 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
     }
 
     private void registerCovers() {
-        GregTech_API.registerCover(
+        GregTechAPI.registerCover(
             ItemList.Cover_Metrics_Transmitter.get(1L),
             TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_METRICS_TRANSMITTER)),
-            new GT_Cover_Metrics_Transmitter(TextureFactory.of(OVERLAY_METRICS_TRANSMITTER)));
-        GregTech_API.registerCover(
+            new CoverMetricsTransmitter(TextureFactory.of(OVERLAY_METRICS_TRANSMITTER)));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_UHV.get(1L),
             TextureFactory.of(SOLARPANEL_UHV),
-            new GT_Cover_SolarPanel(2097152));
-        GregTech_API.registerCover(
+            new CoverSolarPanel(2097152));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_UEV.get(1L),
             TextureFactory.of(SOLARPANEL_UEV),
-            new GT_Cover_SolarPanel(8388608));
-        GregTech_API.registerCover(
+            new CoverSolarPanel(8388608));
+        GregTechAPI.registerCover(
             ItemList.Cover_SolarPanel_UIV.get(1L),
             TextureFactory.of(SOLARPANEL_UIV),
-            new GT_Cover_SolarPanel(33554432));
+            new CoverSolarPanel(33554432));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/MetaGeneratedItem98.java
index 0dab2af2cf..875b7f7b5a 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java
+++ b/src/main/java/gregtech/common/items/MetaGeneratedItem98.java
@@ -24,17 +24,17 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaGeneratedItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 
 /** This class holds cells for non-GT fluids. */
-public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
+public class MetaGeneratedItem98 extends MetaGeneratedItem {
 
-    public static GT_MetaGenerated_Item_98 INSTANCE;
+    public static MetaGeneratedItem98 INSTANCE;
 
     /**
      * Registered fluids.
@@ -134,7 +134,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
          */
         public ItemStack get() {
             trySetStack();
-            return GT_Utility.copy(mStack);
+            return GTUtility.copy(mStack);
         }
 
         /**
@@ -156,12 +156,12 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
          */
         public ItemStack get(int aStackSize) {
             trySetStack();
-            return GT_Utility.copyAmount(aStackSize, mStack);
+            return GTUtility.copyAmount(aStackSize, mStack);
         }
 
         private void trySetStack() {
             if (mStack == null) {
-                mStack = new ItemStack(GT_MetaGenerated_Item_98.INSTANCE, 1, mId);
+                mStack = new ItemStack(MetaGeneratedItem98.INSTANCE, 1, mId);
             }
         }
     }
@@ -205,7 +205,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
 
     private final EnumMap<CellType, IIconContainer> iconContainerMap;
 
-    private GT_MetaGenerated_Item_98() {
+    private MetaGeneratedItem98() {
         // For some reason, fluid cells will be rendered only if the metadata ID is less than the
         // offset. So we will specify maximum offset here.
         // See: GT_MetaGenerated_Item_Renderer.java
@@ -220,7 +220,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
      * cell icons seem to be deleted some time between load and post-load, so we must pre-cache them.
      */
     public static synchronized void preInit() {
-        if (INSTANCE == null) INSTANCE = new GT_MetaGenerated_Item_98();
+        if (INSTANCE == null) INSTANCE = new MetaGeneratedItem98();
 
         // We'll just steal the icons from Water. They are all the same anyway (except _NULL is broken for cells).
         for (CellType cellType : CellType.values()) {
@@ -279,13 +279,13 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
         FluidContainerRegistry
             .registerFluidContainer(new FluidContainerRegistry.FluidContainerData(fluidStack, aCell.mStack, emptyCell));
 
-        GT_LanguageManager.addStringLocalization(
+        GTLanguageManager.addStringLocalization(
             getUnlocalizedName(aCell.mStack) + ".name",
             cellType.prefix.mLocalizedMaterialPre + fluid.getLocalizedName(fluidStack)
                 + cellType.prefix.mLocalizedMaterialPost);
 
         int color = fluid.getColor();
-        short[] rgba = GT_Util.getRGBaArray(color);
+        short[] rgba = GTUtil.getRGBaArray(color);
 
         registeredFluidDataMap.put(id, new RegisteredFluidData(rgba, iconContainerMap.get(cellType)));
     }
@@ -298,8 +298,8 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
 
         // Register IC2 steam cell and Railcraft steam cell as synonyms.
         // There is no steam material, so we'll use Water.cellMolten instead.
-        GT_OreDictUnificator.add(OrePrefixes.cellMolten, Materials.Water, GT_ModHandler.getIC2Item("steamCell", 1L));
-        GT_OreDictUnificator.add(OrePrefixes.cellMolten, Materials.Water, FluidCell.STEAM.getNoCopy());
+        GTOreDictUnificator.add(OrePrefixes.cellMolten, Materials.Water, GTModHandler.getIC2Item("steamCell", 1L));
+        GTOreDictUnificator.add(OrePrefixes.cellMolten, Materials.Water, FluidCell.STEAM.getNoCopy());
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java b/src/main/java/gregtech/common/items/MetaGeneratedItem99.java
index 08d6f23164..e776a5eb26 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java
+++ b/src/main/java/gregtech/common/items/MetaGeneratedItem99.java
@@ -1,6 +1,6 @@
 package gregtech.common.items;
 
-import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.GTValues.M;
 import static gregtech.api.enums.OrePrefixes.cellMolten;
 
 import java.util.BitSet;
@@ -15,18 +15,18 @@ import com.google.common.collect.ImmutableList;
 
 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.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.items.MetaGeneratedItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
 
-public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item {
+public class MetaGeneratedItem99 extends MetaGeneratedItem {
 
-    public static GT_MetaGenerated_Item_99 INSTANCE;
+    public static MetaGeneratedItem99 INSTANCE;
 
     /**
      * Ore prefixes appear in this list in the order in which they will be assigned ID blocks.
@@ -51,12 +51,12 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item {
      */
     private final BitSet enabled = new BitSet();
 
-    public GT_MetaGenerated_Item_99() {
+    public MetaGeneratedItem99() {
         super("metaitem.99", (short) (10_000 + NUM_CRACKED_CELL_TYPES * 1_000), (short) 0);
 
         INSTANCE = this;
 
-        for (Materials tMaterial : GregTech_API.sGeneratedMaterials) {
+        for (Materials tMaterial : GregTechAPI.sGeneratedMaterials) {
             if (tMaterial == null || tMaterial.mMetaItemSubID < 0 || tMaterial.mMetaItemSubID >= 1_000) {
                 continue;
             }
@@ -84,17 +84,17 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item {
         ItemStack tStack = new ItemStack(this, 1, i);
         enabled.set(i);
 
-        GT_LanguageManager.addStringLocalization(
+        GTLanguageManager.addStringLocalization(
             getUnlocalizedName(tStack) + ".name",
             cellMolten.getDefaultLocalNameFormatForItem(tMaterial));
-        GT_LanguageManager.addStringLocalization(
+        GTLanguageManager.addStringLocalization(
             getUnlocalizedName(tStack) + ".tooltip",
             tMaterial.getToolTip(cellMolten.mMaterialAmount / M));
 
         if (cellMolten.mIsUnificatable) {
-            GT_OreDictUnificator.set(cellMolten, tMaterial, tStack);
+            GTOreDictUnificator.set(cellMolten, tMaterial, tStack);
         } else {
-            GT_OreDictUnificator.registerOre(cellMolten.get(tMaterial), tStack);
+            GTOreDictUnificator.registerOre(cellMolten.get(tMaterial), tStack);
         }
     }
 
@@ -104,17 +104,17 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item {
             ItemStack tStack = new ItemStack(this, 1, offset + i);
             enabled.set(offset + i);
 
-            GT_LanguageManager.addStringLocalization(
+            GTLanguageManager.addStringLocalization(
                 getUnlocalizedName(tStack) + ".name",
                 prefix.getDefaultLocalNameFormatForItem(tMaterial));
-            GT_LanguageManager.addStringLocalization(
+            GTLanguageManager.addStringLocalization(
                 getUnlocalizedName(tStack) + ".tooltip",
                 tMaterial.getToolTip(prefix.mMaterialAmount / M));
 
             if (prefix.mIsUnificatable) {
-                GT_OreDictUnificator.set(prefix, tMaterial, tStack);
+                GTOreDictUnificator.set(prefix, tMaterial, tStack);
             } else {
-                GT_OreDictUnificator.registerOre(prefix.get(tMaterial), tStack);
+                GTOreDictUnificator.registerOre(prefix.get(tMaterial), tStack);
             }
 
             offset += 1_000;
@@ -126,7 +126,7 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item {
         if (damage < 0) {
             return null;
         }
-        return GregTech_API.sGeneratedMaterials[damage % 1_000];
+        return GregTechAPI.sGeneratedMaterials[damage % 1_000];
     }
 
     /** Returns null for item damage out of bounds. */
diff --git a/src/main/java/gregtech/common/items/MetaGeneratedTool01.java b/src/main/java/gregtech/common/items/MetaGeneratedTool01.java
new file mode 100644
index 0000000000..11c3fa104e
--- /dev/null
+++ b/src/main/java/gregtech/common/items/MetaGeneratedTool01.java
@@ -0,0 +1,738 @@
+package gregtech.common.items;
+
+import static gregtech.common.items.IDMetaTool01.AXE;
+import static gregtech.common.items.IDMetaTool01.BRANCHCUTTER;
+import static gregtech.common.items.IDMetaTool01.BUTCHERYKNIFE;
+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.CROWBAR;
+import static gregtech.common.items.IDMetaTool01.DRILL_HV;
+import static gregtech.common.items.IDMetaTool01.DRILL_LV;
+import static gregtech.common.items.IDMetaTool01.DRILL_MV;
+import static gregtech.common.items.IDMetaTool01.FILE;
+import static gregtech.common.items.IDMetaTool01.HARDHAMMER;
+import static gregtech.common.items.IDMetaTool01.HOE;
+import static gregtech.common.items.IDMetaTool01.JACKHAMMER;
+import static gregtech.common.items.IDMetaTool01.KNIFE;
+import static gregtech.common.items.IDMetaTool01.MORTAR;
+import static gregtech.common.items.IDMetaTool01.PICKAXE;
+import static gregtech.common.items.IDMetaTool01.PLOW;
+import static gregtech.common.items.IDMetaTool01.PLUNGER;
+import static gregtech.common.items.IDMetaTool01.POCKET_BRANCHCUTTER;
+import static gregtech.common.items.IDMetaTool01.POCKET_FILE;
+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_SCREWDRIVER;
+import static gregtech.common.items.IDMetaTool01.POCKET_WIRECUTTER;
+import static gregtech.common.items.IDMetaTool01.ROLLING_PIN;
+import static gregtech.common.items.IDMetaTool01.SAW;
+import static gregtech.common.items.IDMetaTool01.SCOOP;
+import static gregtech.common.items.IDMetaTool01.SCREWDRIVER;
+import static gregtech.common.items.IDMetaTool01.SCREWDRIVER_HV;
+import static gregtech.common.items.IDMetaTool01.SCREWDRIVER_LV;
+import static gregtech.common.items.IDMetaTool01.SCREWDRIVER_MV;
+import static gregtech.common.items.IDMetaTool01.SENSE;
+import static gregtech.common.items.IDMetaTool01.SHOVEL;
+import static gregtech.common.items.IDMetaTool01.SOFTMALLET;
+import static gregtech.common.items.IDMetaTool01.SOLDERING_IRON_HV;
+import static gregtech.common.items.IDMetaTool01.SOLDERING_IRON_LV;
+import static gregtech.common.items.IDMetaTool01.SOLDERING_IRON_MV;
+import static gregtech.common.items.IDMetaTool01.SWORD;
+import static gregtech.common.items.IDMetaTool01.TURBINE;
+import static gregtech.common.items.IDMetaTool01.TURBINE_HUGE;
+import static gregtech.common.items.IDMetaTool01.TURBINE_LARGE;
+import static gregtech.common.items.IDMetaTool01.TURBINE_SMALL;
+import static gregtech.common.items.IDMetaTool01.UNIVERSALSPADE;
+import static gregtech.common.items.IDMetaTool01.WIRECUTTER;
+import static gregtech.common.items.IDMetaTool01.WRENCH;
+import static gregtech.common.items.IDMetaTool01.WRENCH_HV;
+import static gregtech.common.items.IDMetaTool01.WRENCH_LV;
+import static gregtech.common.items.IDMetaTool01.WRENCH_MV;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TCAspects;
+import gregtech.api.enums.ToolDictNames;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.common.tools.ToolAxe;
+import gregtech.common.tools.ToolBranchCutter;
+import gregtech.common.tools.ToolButcheryKnife;
+import gregtech.common.tools.ToolBuzzSaw;
+import gregtech.common.tools.ToolChainsawHV;
+import gregtech.common.tools.ToolChainsawLV;
+import gregtech.common.tools.ToolChainsawMV;
+import gregtech.common.tools.ToolCrowbar;
+import gregtech.common.tools.ToolDrillHV;
+import gregtech.common.tools.ToolDrillLV;
+import gregtech.common.tools.ToolDrillMV;
+import gregtech.common.tools.ToolFile;
+import gregtech.common.tools.ToolHardHammer;
+import gregtech.common.tools.ToolHoe;
+import gregtech.common.tools.ToolJackHammer;
+import gregtech.common.tools.ToolKnife;
+import gregtech.common.tools.ToolMortar;
+import gregtech.common.tools.ToolPickaxe;
+import gregtech.common.tools.ToolPlow;
+import gregtech.common.tools.ToolPlunger;
+import gregtech.common.tools.ToolRollingPin;
+import gregtech.common.tools.ToolSaw;
+import gregtech.common.tools.ToolScoop;
+import gregtech.common.tools.ToolScrewdriver;
+import gregtech.common.tools.ToolScrewdriverLV;
+import gregtech.common.tools.ToolSense;
+import gregtech.common.tools.ToolShovel;
+import gregtech.common.tools.ToolSoftHammer;
+import gregtech.common.tools.ToolSolderingIron;
+import gregtech.common.tools.ToolSword;
+import gregtech.common.tools.ToolTurbineHuge;
+import gregtech.common.tools.ToolTurbineLarge;
+import gregtech.common.tools.ToolTurbineNormal;
+import gregtech.common.tools.ToolTurbineSmall;
+import gregtech.common.tools.ToolUniversalSpade;
+import gregtech.common.tools.ToolWireCutter;
+import gregtech.common.tools.ToolWrench;
+import gregtech.common.tools.ToolWrenchHV;
+import gregtech.common.tools.ToolWrenchLV;
+import gregtech.common.tools.ToolWrenchMV;
+import gregtech.common.tools.pocket.ToolPocketBranchCutter;
+import gregtech.common.tools.pocket.ToolPocketFile;
+import gregtech.common.tools.pocket.ToolPocketKnife;
+import gregtech.common.tools.pocket.ToolPocketMultitool;
+import gregtech.common.tools.pocket.ToolPocketSaw;
+import gregtech.common.tools.pocket.ToolPocketScrewdriver;
+import gregtech.common.tools.pocket.ToolPocketWireCutter;
+
+public class MetaGeneratedTool01 extends MetaGeneratedTool {
+
+    public static MetaGeneratedTool01 INSTANCE;
+
+    public MetaGeneratedTool01() {
+        super("metatool.01");
+        INSTANCE = this;
+        addTool(
+            SWORD.ID,
+            "Sword",
+            "",
+            new ToolSword(),
+            ToolDictNames.craftingToolSword,
+            ToolDictNames.craftingToolBlade,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.TELUM, 4L));
+        addTool(
+            PICKAXE.ID,
+            "Pickaxe",
+            "",
+            new ToolPickaxe(),
+            ToolDictNames.craftingToolPickaxe,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
+        addTool(
+            SHOVEL.ID,
+            "Shovel",
+            "",
+            new ToolShovel(),
+            ToolDictNames.craftingToolShovel,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
+        addTool(
+            AXE.ID,
+            "Axe",
+            "",
+            new ToolAxe(),
+            ToolDictNames.craftingToolAxe,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.METO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2L));
+        addTool(
+            HOE.ID,
+            "Hoe",
+            "",
+            new ToolHoe(),
+            ToolDictNames.craftingToolHoe,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.MESSIS, 4L));
+        addTool(
+            SAW.ID,
+            "Saw",
+            "Can also harvest Ice",
+            new ToolSaw(),
+            ToolDictNames.craftingToolSaw,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.METO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2L));
+        GregTechAPI.registerTool(
+            addTool(
+                HARDHAMMER.ID,
+                "Hammer",
+                "Crushes Ores instead of harvesting them",
+                new ToolHardHammer(),
+                ToolDictNames.craftingToolHardHammer,
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sHardHammerList);
+        GregTechAPI.registerTool(
+            addTool(
+                SOFTMALLET.ID,
+                "Soft Mallet",
+                "",
+                new ToolSoftHammer(),
+                ToolDictNames.craftingToolSoftHammer,
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.LIMUS, 4L)),
+            GregTechAPI.sSoftHammerList);
+        GregTechAPI.registerTool(
+            addTool(
+                WRENCH.ID,
+                "Wrench",
+                "Hold Leftclick to dismantle Machines",
+                new ToolWrench(),
+                ToolDictNames.craftingToolWrench,
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sWrenchList);
+        addTool(
+            FILE.ID,
+            "File",
+            "",
+            new ToolFile(),
+            ToolDictNames.craftingToolFile,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L));
+        GregTechAPI.registerTool(
+            addTool(
+                CROWBAR.ID,
+                "Crowbar",
+                "Dismounts Covers and Rotates Rails",
+                new ToolCrowbar(),
+                ToolDictNames.craftingToolCrowbar,
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.TELUM, 2L)),
+            GregTechAPI.sCrowbarList);
+        GregTechAPI.registerTool(
+            addTool(
+                SCREWDRIVER.ID,
+                "Screwdriver",
+                "Adjusts Covers and Machines",
+                new ToolScrewdriver(),
+                ToolDictNames.craftingToolScrewdriver,
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sScrewdriverList);
+        addTool(
+            MORTAR.ID,
+            "Mortar",
+            "",
+            new ToolMortar(),
+            ToolDictNames.craftingToolMortar,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 2L));
+        GregTechAPI.registerTool(
+            addTool(
+                WIRECUTTER.ID,
+                "Wire Cutter",
+                "",
+                new ToolWireCutter(),
+                ToolDictNames.craftingToolWireCutter,
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sWireCutterList);
+        addTool(
+            SCOOP.ID,
+            "Scoop",
+            "",
+            new ToolScoop(),
+            ToolDictNames.craftingToolScoop,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.BESTIA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.PANNUS, 2L));
+        addTool(
+            BRANCHCUTTER.ID,
+            "Branch Cutter",
+            "",
+            new ToolBranchCutter(),
+            ToolDictNames.craftingToolBranchCutter,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.METO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.HERBA, 2L));
+        GregTechAPI.registerTool(
+            addTool(
+                UNIVERSALSPADE.ID,
+                "Universal Spade",
+                "",
+                new ToolUniversalSpade(),
+                ToolDictNames.craftingToolBlade,
+                ToolDictNames.craftingToolShovel,
+                ToolDictNames.craftingToolCrowbar,
+                ToolDictNames.craftingToolSaw,
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.TELUM, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.METO, 1L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 1L)),
+            GregTechAPI.sCrowbarList);
+        addTool(
+            KNIFE.ID,
+            "Knife",
+            "",
+            new ToolKnife(),
+            ToolDictNames.craftingToolBlade,
+            ToolDictNames.craftingToolKnife,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.TELUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.CORPUS, 2L));
+        addTool(
+            BUTCHERYKNIFE.ID,
+            "Butchery Knife",
+            "Has a slow Attack Rate",
+            new ToolButcheryKnife(),
+            ToolDictNames.craftingToolBlade,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.CORPUS, 4L));
+
+        addTool(
+            SENSE.ID,
+            "Sense",
+            "Because a Scythe doesn't make Sense",
+            new ToolSense(),
+            ToolDictNames.craftingToolBlade,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.METO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.HERBA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.MORTUUS, 2L));
+        addTool(
+            PLOW.ID,
+            "Plow",
+            "Used to get rid of Snow",
+            new ToolPlow(),
+            ToolDictNames.craftingToolPlow,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.METO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.GELUM, 2L));
+        addTool(
+            PLUNGER.ID,
+            "Plunger",
+            "",
+            new ToolPlunger(),
+            ToolDictNames.craftingToolPlunger,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.VACUOS, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ITER, 2L));
+        addTool(
+            ROLLING_PIN.ID,
+            "Rolling Pin",
+            "",
+            new ToolRollingPin(),
+            ToolDictNames.craftingToolRollingPin,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.LIMUS, 4L));
+
+        addTool(
+            DRILL_LV.ID,
+            "Drill (LV)",
+            "",
+            new ToolDrillLV(),
+            ToolDictNames.craftingToolMiningDrill,
+            new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
+        addTool(
+            DRILL_MV.ID,
+            "Drill (MV)",
+            "",
+            new ToolDrillMV(),
+            ToolDictNames.craftingToolMiningDrill,
+            new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
+        addTool(
+            DRILL_HV.ID,
+            "Drill (HV)",
+            "",
+            new ToolDrillHV(),
+            ToolDictNames.craftingToolMiningDrill,
+            new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
+        addTool(
+            CHAINSAW_LV.ID,
+            "Chainsaw (LV)",
+            "Can also harvest Ice",
+            new ToolChainsawLV(),
+            ToolDictNames.craftingToolSaw,
+            new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.METO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2L));
+        addTool(
+            CHAINSAW_MV.ID,
+            "Chainsaw (MV)",
+            "Can also harvest Ice",
+            new ToolChainsawMV(),
+            ToolDictNames.craftingToolSaw,
+            new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.METO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2L));
+        addTool(
+            CHAINSAW_HV.ID,
+            "Chainsaw (HV)",
+            "Can also harvest Ice",
+            new ToolChainsawHV(),
+            ToolDictNames.craftingToolSaw,
+            new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.METO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2L));
+        GregTechAPI.registerTool(
+            addTool(
+                WRENCH_LV.ID,
+                "Wrench (LV)",
+                "Hold Left Button to dismantle Machines",
+                new ToolWrenchLV(),
+                ToolDictNames.craftingToolWrench,
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sWrenchList);
+        GregTechAPI.registerTool(
+            addTool(
+                WRENCH_MV.ID,
+                "Wrench (MV)",
+                "Hold Left Button to dismantle Machines",
+                new ToolWrenchMV(),
+                ToolDictNames.craftingToolWrench,
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sWrenchList);
+        GregTechAPI.registerTool(
+            addTool(
+                WRENCH_HV.ID,
+                "Wrench (HV)",
+                "Hold Left Button to dismantle Machines",
+                new ToolWrenchHV(),
+                ToolDictNames.craftingToolWrench,
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 4L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sWrenchList);
+        GregTechAPI.registerTool(
+            addTool(
+                JACKHAMMER.ID,
+                "JackHammer (HV)",
+                "Breaks Rocks into pieces",
+                new ToolJackHammer(),
+                ToolDictNames.craftingToolJackHammer,
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 2L)),
+            GregTechAPI.sJackhammerList);
+        addTool(
+            BUZZSAW_LV.ID,
+            "Buzzsaw (LV)",
+            "Not suitable for harvesting Blocks",
+            new ToolBuzzSaw(),
+            ToolDictNames.craftingToolSaw,
+            new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2L));
+        addTool(
+            BUZZSAW_MV.ID,
+            "Buzzsaw (MV)",
+            "Not suitable for harvesting Blocks",
+            new ToolBuzzSaw(),
+            ToolDictNames.craftingToolSaw,
+            new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2L));
+        addTool(
+            BUZZSAW_HV.ID,
+            "Buzzsaw (HV)",
+            "Not suitable for harvesting Blocks",
+            new ToolBuzzSaw(),
+            ToolDictNames.craftingToolSaw,
+            new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+            new TCAspects.TC_AspectStack(TCAspects.ARBOR, 2L));
+        GregTechAPI.registerTool(
+            addTool(
+                SCREWDRIVER_LV.ID,
+                "Screwdriver (LV)",
+                "Adjusts Covers and Machines",
+                new ToolScrewdriverLV(),
+                ToolDictNames.craftingToolScrewdriver,
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sScrewdriverList);
+        GregTechAPI.registerTool(
+            addTool(
+                SCREWDRIVER_MV.ID,
+                "Screwdriver (MV)",
+                "Adjusts Covers and Machines",
+                new ToolScrewdriverLV(),
+                ToolDictNames.craftingToolScrewdriver,
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sScrewdriverList);
+        GregTechAPI.registerTool(
+            addTool(
+                SCREWDRIVER_HV.ID,
+                "Screwdriver (HV)",
+                "Adjusts Covers and Machines",
+                new ToolScrewdriverLV(),
+                ToolDictNames.craftingToolScrewdriver,
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sScrewdriverList);
+        GregTechAPI.registerTool(
+            addTool(
+                SOLDERING_IRON_LV.ID,
+                "Soldering Iron (LV)",
+                "Fixes burned out Circuits. Needs soldering materials in inventory.",
+                new ToolSolderingIron(),
+                ToolDictNames.craftingToolSolderingIron,
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sSolderingToolList);
+        GregTechAPI.registerTool(
+            addTool(
+                SOLDERING_IRON_MV.ID,
+                "Soldering Iron (MV)",
+                "Fixes burned out Circuits. Needs soldering materials in inventory.",
+                new ToolSolderingIron(),
+                ToolDictNames.craftingToolSolderingIron,
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sSolderingToolList);
+        GregTechAPI.registerTool(
+            addTool(
+                SOLDERING_IRON_HV.ID,
+                "Soldering Iron (HV)",
+                "Fixes burned out Circuits. Needs soldering materials in inventory.",
+                new ToolSolderingIron(),
+                ToolDictNames.craftingToolSolderingIron,
+                new TCAspects.TC_AspectStack(TCAspects.MACHINA, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)),
+            GregTechAPI.sSolderingToolList);
+
+        addTool(TURBINE_SMALL.ID, "Small Turbine", "Turbine Rotors for your power station", new ToolTurbineSmall());
+        addTool(TURBINE.ID, "Turbine", "Turbine Rotors for your power station", new ToolTurbineNormal());
+        addTool(TURBINE_LARGE.ID, "Large Turbine", "Turbine Rotors for your power station", new ToolTurbineLarge());
+        addTool(TURBINE_HUGE.ID, "Huge Turbine", "Turbine Rotors for your power station", new ToolTurbineHuge());
+
+        addTool(
+            POCKET_MULTITOOL.ID,
+            "Pocket Multitool",
+            "6 useful Tools in one!",
+            new ToolPocketMultitool(POCKET_KNIFE.ID),
+            null,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 6),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 3),
+            new TCAspects.TC_AspectStack(TCAspects.ORDO, 3));
+        addTool(
+            POCKET_KNIFE.ID,
+            "Pocket Multitool (Knife)",
+            "",
+            new ToolPocketKnife(POCKET_SAW.ID),
+            ToolDictNames.craftingToolKnife,
+            ToolDictNames.craftingToolBlade,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 6),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 3),
+            new TCAspects.TC_AspectStack(TCAspects.ORDO, 3));
+        addTool(
+            POCKET_SAW.ID,
+            "Pocket Multitool (Saw)",
+            "Can also harvest Ice",
+            new ToolPocketSaw(POCKET_FILE.ID),
+            ToolDictNames.craftingToolSaw,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 6),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 3),
+            new TCAspects.TC_AspectStack(TCAspects.ORDO, 3));
+        addTool(
+            POCKET_FILE.ID,
+            "Pocket Multitool (File)",
+            "",
+            new ToolPocketFile(POCKET_SCREWDRIVER.ID),
+            ToolDictNames.craftingToolFile,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 6),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 3),
+            new TCAspects.TC_AspectStack(TCAspects.ORDO, 3));
+        GregTechAPI.registerTool(
+            addTool(
+                POCKET_SCREWDRIVER.ID,
+                "Pocket Multitool (Screwdriver)",
+                "Adjusts Covers and Machines",
+                new ToolPocketScrewdriver(POCKET_WIRECUTTER.ID),
+                ToolDictNames.craftingToolScrewdriver,
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 6),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 3),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 3)),
+            GregTechAPI.sScrewdriverList);
+        GregTechAPI.registerTool(
+            addTool(
+                POCKET_WIRECUTTER.ID,
+                "Pocket Multitool (Wire Cutter)",
+                "",
+                new ToolPocketWireCutter(POCKET_BRANCHCUTTER.ID),
+                ToolDictNames.craftingToolWireCutter,
+                new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 6),
+                new TCAspects.TC_AspectStack(TCAspects.FABRICO, 3),
+                new TCAspects.TC_AspectStack(TCAspects.ORDO, 3)),
+            GregTechAPI.sWireCutterList);
+        addTool(
+            POCKET_BRANCHCUTTER.ID,
+            "Pocket Multitool (Branch Cutter)",
+            "",
+            new ToolPocketBranchCutter(POCKET_MULTITOOL.ID),
+            ToolDictNames.craftingToolBranchCutter,
+            new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 6),
+            new TCAspects.TC_AspectStack(TCAspects.FABRICO, 3),
+            new TCAspects.TC_AspectStack(TCAspects.ORDO, 3));
+        initCraftingShapedRecipes();
+        initCraftingShapelessRecipes();
+    }
+
+    private void initCraftingShapelessRecipes() {
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) });
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.clay, 1) });
+        GTModHandler.addShapelessCraftingRecipe(
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.wheat, 1) });
+        GTModHandler.addShapelessCraftingRecipe(
+            new ItemStack(Items.flint, 1),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.gravel, 1) });
+        GTModHandler.addShapelessCraftingRecipe(
+            new ItemStack(Items.blaze_powder, 2),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.blaze_rod, 1) });
+    }
+
+    private void initCraftingShapedRecipes() {
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Flint, Materials.Stone, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { " I ", "SIS", "SSS", 'I', new ItemStack(Items.flint, 1), 'S', OrePrefixes.stone });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Bronze, Materials.Stone, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Bronze), 'S', OrePrefixes.stone });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Iron, Materials.Stone, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Iron), 'S', OrePrefixes.stone });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Steel, Materials.Stone, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Steel), 'S', OrePrefixes.stone });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.WroughtIron, Materials.Stone, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.WroughtIron), 'S',
+                OrePrefixes.stone });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.RedSteel, Materials.Stone, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.RedSteel), 'S',
+                OrePrefixes.stone });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.BlueSteel, Materials.Stone, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.BlueSteel), 'S',
+                OrePrefixes.stone });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.BlackSteel, Materials.Stone, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.BlackSteel), 'S',
+                OrePrefixes.stone });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.DamascusSteel, Materials.Stone, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.DamascusSteel), 'S',
+                OrePrefixes.stone });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Thaumium, Materials.Stone, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Thaumium), 'S',
+                OrePrefixes.stone });
+
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.Wood, Materials.Wood, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.plank.get(Materials.Wood), 'S',
+                OrePrefixes.stick.get(Materials.Wood) });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.Plastic, Materials.Plastic, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.Plastic), 'S',
+                OrePrefixes.stick.get(Materials.Plastic) });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.Aluminium, Materials.Aluminium, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.Aluminium), 'S',
+                OrePrefixes.stick.get(Materials.Aluminium) });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.StainlessSteel, Materials.StainlessSteel, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.StainlessSteel), 'S',
+                OrePrefixes.stick.get(Materials.StainlessSteel) });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.IronWood, Materials.IronWood, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.IronWood), 'S',
+                OrePrefixes.stick.get(Materials.IronWood) });
+
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(SWORD.ID, 1, Materials.Flint, Materials.Wood, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "F", "F", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
+                new ItemStack(Items.flint, 1) });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(PICKAXE.ID, 1, Materials.Flint, Materials.Wood, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "FFF", " S ", " S ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
+                new ItemStack(Items.flint, 1) });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(SHOVEL.ID, 1, Materials.Flint, Materials.Wood, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "F", "S", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
+                new ItemStack(Items.flint, 1) });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(AXE.ID, 1, Materials.Flint, Materials.Wood, null),
+            GTModHandler.RecipeBits.MIRRORED | GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "FF", "FS", " S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
+                new ItemStack(Items.flint, 1) });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(HOE.ID, 1, Materials.Flint, Materials.Wood, null),
+            GTModHandler.RecipeBits.MIRRORED | GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "FF", " S", " S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
+                new ItemStack(Items.flint, 1) });
+        GTModHandler.addCraftingRecipe(
+            INSTANCE.getToolWithStats(KNIFE.ID, 1, Materials.Flint, Materials.Wood, null),
+            GTModHandler.RecipeBits.NOT_REMOVABLE,
+            new Object[] { "F", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', new ItemStack(Items.flint, 1) });
+    }
+}
diff --git a/src/main/java/gregtech/common/items/PollenType.java b/src/main/java/gregtech/common/items/PollenType.java
index 3cd9484b69..85b87b54c4 100644
--- a/src/main/java/gregtech/common/items/PollenType.java
+++ b/src/main/java/gregtech/common/items/PollenType.java
@@ -1,7 +1,7 @@
 package gregtech.common.items;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 public enum PollenType {
 
@@ -23,7 +23,7 @@ public enum PollenType {
     }
 
     public String getName() {
-        return GT_LanguageManager.addStringLocalization(
+        return GTLanguageManager.addStringLocalization(
             "pollen." + this.name,
             this.name.substring(0, 1)
                 .toUpperCase() + this.name.substring(1) + " Pollen");
diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java
index e6f08b0cfa..746f2d0916 100644
--- a/src/main/java/gregtech/common/items/PropolisType.java
+++ b/src/main/java/gregtech/common/items/PropolisType.java
@@ -1,7 +1,7 @@
 package gregtech.common.items;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
 public enum PropolisType {
 
@@ -34,7 +34,7 @@ public enum PropolisType {
 
     public String getName() {
         // return "gt.comb."+this.name;
-        return GT_LanguageManager.addStringLocalization(
+        return GTLanguageManager.addStringLocalization(
             "propolis." + this.name,
             this.name.substring(0, 1)
                 .toUpperCase() + this.name.substring(1) + " Propolis");
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java b/src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java
index 4241e07e4b..b39135fed2 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java
@@ -13,28 +13,28 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IItemBehaviour;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 
-public class Behaviour_Cover_Tool extends Behaviour_None {
+public class BehaviourCoverTool extends BehaviourNone {
 
-    public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Cover_Tool();
-    private final String mTooltip = GT_LanguageManager
+    public static final IItemBehaviour<MetaBaseItem> INSTANCE = new BehaviourCoverTool();
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.cover_copy_paste", "Can copy/paste cover data.");
 
-    private ISerializableObject mStoredData = GregTech_API.sNoBehavior.createDataObject();
+    private ISerializableObject mStoredData = GregTechAPI.sNoBehavior.createDataObject();
     private int mCoverType;
     private int mTickRateAddition = 0;
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
@@ -55,24 +55,24 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
                 aItem.discharge(aStack, 25.0D, Integer.MAX_VALUE, true, false, false);
             }
         }
-        GT_Utility.doSoundAtClient(SoundResource.IC2_TOOLS_OD_SCANNER, 1, 1.0F, aX, aY, aZ);
+        GTUtility.doSoundAtClient(SoundResource.IC2_TOOLS_OD_SCANNER, 1, 1.0F, aX, aY, aZ);
         return aPlayer instanceof EntityPlayerMP;
     }
 
     private void initDataFromNBT(NBTTagCompound aNBT) {
         if (aNBT != null) {
             mCoverType = aNBT.getInteger("mCoverType");
-            GT_CoverBehaviorBase<?> tBehavior = GregTech_API.getCoverBehaviorNew(mCoverType);
+            CoverBehaviorBase<?> tBehavior = GregTechAPI.getCoverBehaviorNew(mCoverType);
             NBTBase tData = aNBT.getTag("mCoverData");
             if (tData != null) mStoredData = tBehavior.createDataObject(tData);
-            else mStoredData = GregTech_API.sNoBehavior.createDataObject();
+            else mStoredData = GregTechAPI.sNoBehavior.createDataObject();
             mTickRateAddition = aNBT.hasKey("mTickRateAddition") ? aNBT.getInteger("mTickRateAddition") : 0;
         }
     }
 
     private void saveDataToNBT(NBTTagCompound aNBT) {
         aNBT.setInteger("mCoverType", mCoverType);
-        if (mStoredData == null) mStoredData = GregTech_API.sNoBehavior.createDataObject();
+        if (mStoredData == null) mStoredData = GregTechAPI.sNoBehavior.createDataObject();
         aNBT.setTag("mCoverData", mStoredData.saveDataToNBT());
         aNBT.setInteger("mTickRateAddition", mTickRateAddition);
     }
@@ -84,7 +84,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
             aNBT.setInteger("dataLinesCount", tSize);
             for (int i = 0; i < tSize; i++) {
                 aNBT.setString("dataLines" + i, (String) aList.get(i));
-                GT_Utility.sendChatToPlayer(aPlayer, (String) aList.get(i));
+                GTUtility.sendChatToPlayer(aPlayer, (String) aList.get(i));
             }
         }
     }
@@ -94,15 +94,15 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
         float hitY, float hitZ, List aList) {
         aList.add(
             "----- X: " + EnumChatFormatting.AQUA
-                + GT_Utility.formatNumbers(aX)
+                + GTUtility.formatNumbers(aX)
                 + EnumChatFormatting.RESET
                 + " Y: "
                 + EnumChatFormatting.AQUA
-                + GT_Utility.formatNumbers(aY)
+                + GTUtility.formatNumbers(aY)
                 + EnumChatFormatting.RESET
                 + " Z: "
                 + EnumChatFormatting.AQUA
-                + GT_Utility.formatNumbers(aZ)
+                + GTUtility.formatNumbers(aZ)
                 + EnumChatFormatting.RESET
                 + " D: "
                 + EnumChatFormatting.AQUA
@@ -111,8 +111,8 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
                 + " -----");
         if (aTileEntity instanceof ICoverable tCoverable) {
             final ForgeDirection tSide = tCoverable.getCoverItemAtSide(side) != null ? side
-                : tCoverable.getCoverItemAtSide(GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null
-                    ? GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)
+                : tCoverable.getCoverItemAtSide(GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null
+                    ? GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)
                     : ForgeDirection.UNKNOWN;
             if (tSide != ForgeDirection.UNKNOWN) {
                 if (tCoverable.getCoverBehaviorAtSideNew(tSide)
@@ -129,19 +129,19 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
                                 .getDisplayName()
                             + EnumChatFormatting.RESET);
                 } else {
-                    mStoredData = GregTech_API.sNoBehavior.createDataObject();
+                    mStoredData = GregTechAPI.sNoBehavior.createDataObject();
                     mCoverType = 0;
                     mTickRateAddition = 0;
                     aList.add("Copy unavailable for this cover type");
                 }
             } else {
-                mStoredData = GregTech_API.sNoBehavior.createDataObject();
+                mStoredData = GregTechAPI.sNoBehavior.createDataObject();
                 mCoverType = 0;
                 mTickRateAddition = 0;
                 aList.add("No Cover Found");
             }
         } else {
-            mStoredData = GregTech_API.sNoBehavior.createDataObject();
+            mStoredData = GregTechAPI.sNoBehavior.createDataObject();
             mCoverType = 0;
             mTickRateAddition = 0;
             aList.add("No Cover Found");
@@ -152,12 +152,12 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
         EntityPlayer aPlayer) {
         if (aTileEntity instanceof ICoverable tCoverable) {
             if (mCoverType == 0 || mStoredData == null) {
-                GT_Utility.sendChatToPlayer(aPlayer, "Please Copy a Valid Cover First.");
+                GTUtility.sendChatToPlayer(aPlayer, "Please Copy a Valid Cover First.");
                 return;
             }
             final ForgeDirection tSide = tCoverable.getCoverItemAtSide(side) != null ? side
-                : tCoverable.getCoverItemAtSide(GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null
-                    ? GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)
+                : tCoverable.getCoverItemAtSide(GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null
+                    ? GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)
                     : ForgeDirection.UNKNOWN;
             if (tSide != ForgeDirection.UNKNOWN) {
                 int tCoverID = tCoverable.getCoverIDAtSide(tSide);
@@ -165,18 +165,18 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
                     tCoverable.setCoverDataAtSide(tSide, mStoredData);
                     tCoverable.getCoverInfoAtSide(tSide)
                         .setTickRateAddition(mTickRateAddition);
-                    GT_Utility.sendChatToPlayer(aPlayer, "Cover Data Pasted.");
+                    GTUtility.sendChatToPlayer(aPlayer, "Cover Data Pasted.");
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Not Matched Cover.");
+                    GTUtility.sendChatToPlayer(aPlayer, "Not Matched Cover.");
                 }
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, "No Cover Found.");
+                GTUtility.sendChatToPlayer(aPlayer, "No Cover Found.");
             }
         }
     }
 
     @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) {
         try {
             final NBTTagCompound tNBT = aStack.getTagCompound();
             final int tSize = tNBT.getInteger("dataLinesCount");
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java b/src/main/java/gregtech/common/items/behaviors/BehaviourCrowbar.java
index 97d3da4ca3..76c215bfd0 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourCrowbar.java
@@ -10,27 +10,27 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_Crowbar extends Behaviour_None {
+public class BehaviourCrowbar extends BehaviourNone {
 
     private final int mVanillaCosts;
     private final int mEUCosts;
 
-    public Behaviour_Crowbar(int aVanillaCosts, int aEUCosts) {
+    public BehaviourCrowbar(int aVanillaCosts, int aEUCosts) {
         this.mVanillaCosts = aVanillaCosts;
         this.mEUCosts = aEUCosts;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
         }
-        if (GT_ModHandler.getModItem(Railcraft.ID, "fluid.creosote.bucket", 1L) != null) {
+        if (GTModHandler.getModItem(Railcraft.ID, "fluid.creosote.bucket", 1L) != null) {
             return false;
         }
         Block aBlock = aWorld.getBlock(aX, aY, aZ);
@@ -39,20 +39,20 @@ public class Behaviour_Crowbar extends Behaviour_None {
         }
         byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
         if (aBlock == Blocks.rail) {
-            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
+            if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
                 aWorld.isRemote = true;
                 aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 1) % 10, 0);
                 aWorld.isRemote = false;
-                GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ);
+                GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
         if ((aBlock == Blocks.detector_rail) || (aBlock == Blocks.activator_rail) || (aBlock == Blocks.golden_rail)) {
-            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
+            if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
                 aWorld.isRemote = true;
                 aWorld.setBlock(aX, aY, aZ, aBlock, aMeta / 8 * 8 + (aMeta % 8 + 1) % 6, 0);
                 aWorld.isRemote = false;
-                GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ);
+                GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java b/src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java
index ae0627446c..c5d045ecd0 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java
@@ -6,17 +6,17 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_DataOrb extends Behaviour_None {
+public class BehaviourDataOrb extends BehaviourNone {
 
     public static void copyInventory(ItemStack[] aInventory, ItemStack[] aNewContent, int aIndexlength) {
         for (int i = 0; i < aIndexlength; i++) {
             if (aNewContent[i] == null) {
                 aInventory[i] = null;
             } else {
-                aInventory[i] = GT_Utility.copyOrNull(aNewContent[i]);
+                aInventory[i] = GTUtility.copyOrNull(aNewContent[i]);
             }
         }
     }
@@ -68,7 +68,7 @@ public class Behaviour_DataOrb extends Behaviour_None {
             NBTTagCompound tag = tNBT_ItemList.getCompoundTagAt(i);
             byte slot = tag.getByte("Slot");
             if (slot >= 0) {
-                tInventory[slot] = GT_Utility.loadItem(tag);
+                tInventory[slot] = GTUtility.loadItem(tag);
             }
         }
         return tInventory;
@@ -95,7 +95,7 @@ public class Behaviour_DataOrb extends Behaviour_None {
     }
 
     @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) {
         if (!(getDataTitle(aStack).length() == 0)) {
             aList.add(getDataTitle(aStack));
             aList.add(getDataName(aStack));
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java b/src/main/java/gregtech/common/items/behaviors/BehaviourDataStick.java
index e9db3195c2..63462b8d9b 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourDataStick.java
@@ -4,27 +4,27 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_DataStick extends Behaviour_None {
+public class BehaviourDataStick extends BehaviourNone {
 
     @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
-        String tString = GT_Utility.ItemNBT.getBookTitle(aStack);
-        if (GT_Utility.isStringValid(tString)) {
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
+        String tString = GTUtility.ItemNBT.getBookTitle(aStack);
+        if (GTUtility.isStringValid(tString)) {
             aList.add(tString);
         }
-        tString = GT_Utility.ItemNBT.getBookAuthor(aStack);
-        if (GT_Utility.isStringValid(tString)) {
+        tString = GTUtility.ItemNBT.getBookAuthor(aStack);
+        if (GTUtility.isStringValid(tString)) {
             aList.add("by " + tString);
         }
-        short tMapID = GT_Utility.ItemNBT.getMapID(aStack);
+        short tMapID = GTUtility.ItemNBT.getMapID(aStack);
         if (tMapID >= 0) {
             aList.add("Map ID: " + tMapID);
         }
-        tString = GT_Utility.ItemNBT.getPunchCardData(aStack);
-        if (GT_Utility.isStringValid(tString)) {
+        tString = GTUtility.ItemNBT.getPunchCardData(aStack);
+        if (GTUtility.isStringValid(tString)) {
             aList.add("Punch Card Data");
             int i = 0;
             int j = tString.length();
@@ -32,7 +32,7 @@ public class Behaviour_DataStick extends Behaviour_None {
                 aList.add(tString.substring(i, Math.min(i + 64, j)));
             }
         }
-        short sTier = GT_Utility.ItemNBT.getNBT(aStack)
+        short sTier = GTUtility.ItemNBT.getNBT(aStack)
             .getShort("rocket_tier");
         if (sTier > 0 && sTier < 100) {
             aList.add("Rocket Schematic Tier: " + sTier);
@@ -43,7 +43,7 @@ public class Behaviour_DataStick extends Behaviour_None {
                 case 102 -> aList.add("Astro-Miner Schematic");
             }
         }
-        long lastUpdate = GT_Utility.ItemNBT.getNBT(aStack)
+        long lastUpdate = GTUtility.ItemNBT.getNBT(aStack)
             .getLong("lastUpdate");
         if (lastUpdate != 0) aList.add(String.format("Last update at: %tc", lastUpdate));
 
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java b/src/main/java/gregtech/common/items/behaviors/BehaviourHoe.java
index 167eccdf49..ca9166b581 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourHoe.java
@@ -11,24 +11,24 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.UseHoeEvent;
 
 import cpw.mods.fml.common.eventhandler.Event;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder;
 
-public class Behaviour_Hoe extends Behaviour_None {
+public class BehaviourHoe extends BehaviourNone {
 
     private final int mCosts;
-    private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.hoe", "Can till Dirt");
+    private final String mTooltip = GTLanguageManager.addStringLocalization("gt.behaviour.hoe", "Can till Dirt");
 
-    public Behaviour_Hoe(int aCosts) {
+    public BehaviourHoe(int aCosts) {
         this.mCosts = aCosts;
     }
 
     @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 (!aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) {
             return false;
         }
@@ -38,12 +38,12 @@ public class Behaviour_Hoe extends Behaviour_None {
         }
         if (event.getResult() == Event.Result.ALLOW) {
             if (!aPlayer.capabilities.isCreativeMode) {
-                ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts);
+                ((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts);
             }
             return true;
         }
         Block aBlock = aWorld.getBlock(aX, aY, aZ);
-        if ((ordinalSide != 0) && (GT_Utility.isBlockAir(aWorld, aX, aY + 1, aZ))
+        if ((ordinalSide != 0) && (GTUtility.isBlockAir(aWorld, aX, aY + 1, aZ))
             && ((aBlock == Blocks.grass) || (aBlock == Blocks.dirt))) {
             new WorldSpawnedEventBuilder.SoundEventBuilder()
                 .setVolume((Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F)
@@ -57,7 +57,7 @@ public class Behaviour_Hoe extends Behaviour_None {
             }
             aWorld.setBlock(aX, aY, aZ, Blocks.farmland);
             if (!aPlayer.capabilities.isCreativeMode) {
-                ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts);
+                ((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts);
             }
             return true;
         }
@@ -65,7 +65,7 @@ public class Behaviour_Hoe extends Behaviour_None {
     }
 
     @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);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java b/src/main/java/gregtech/common/items/behaviors/BehaviourLighter.java
index a4c26e2254..9c9c8ab9f0 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourLighter.java
@@ -14,25 +14,24 @@ 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.api.items.MetaBaseItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_Lighter extends Behaviour_None {
+public class BehaviourLighter extends BehaviourNone {
 
     private final ItemStack mEmptyLighter;
     private final ItemStack mUsedLighter;
     private final ItemStack mFullLighter;
     private final long mFuelAmount;
-    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_Lighter(ItemStack aEmptyLighter, ItemStack aUsedLighter, ItemStack aFullLighter,
-        long aFuelAmount) {
+    public BehaviourLighter(ItemStack aEmptyLighter, ItemStack aUsedLighter, ItemStack aFullLighter, long aFuelAmount) {
         this.mFullLighter = aFullLighter;
         this.mUsedLighter = aUsedLighter;
         this.mEmptyLighter = aEmptyLighter;
@@ -40,16 +39,16 @@ public class Behaviour_Lighter extends Behaviour_None {
     }
 
     @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.stackSize != 1)) {
             return false;
         }
         boolean rOutput = false;
         if ((aEntity instanceof EntityCreeper)) {
             prepare(aStack);
-            long tFuelAmount = GT_Utility.ItemNBT.getLighterFuel(aStack);
-            if (GT_Utility.areStacksEqual(aStack, this.mUsedLighter, true)) {
-                GT_Utility.sendSoundToPlayers(
+            long tFuelAmount = GTUtility.ItemNBT.getLighterFuel(aStack);
+            if (GTUtility.areStacksEqual(aStack, this.mUsedLighter, true)) {
+                GTUtility.sendSoundToPlayers(
                     aPlayer.worldObj,
                     SoundResource.FIRE_IGNITE,
                     1.0F,
@@ -63,7 +62,7 @@ public class Behaviour_Lighter extends Behaviour_None {
                 }
                 rOutput = true;
             }
-            GT_Utility.ItemNBT.setLighterFuel(aStack, tFuelAmount);
+            GTUtility.ItemNBT.setLighterFuel(aStack, tFuelAmount);
             if (tFuelAmount <= 0L) {
                 useUp(aStack);
             }
@@ -72,13 +71,13 @@ public class Behaviour_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) {
         return false;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if ((aWorld.isRemote) || (aStack.stackSize != 1)) {
             return false;
@@ -88,21 +87,21 @@ public class Behaviour_Lighter extends Behaviour_None {
         aX += side.offsetX;
         aY += side.offsetY;
         aZ += side.offsetZ;
-        if ((!GT_Utility.isBlockAir(aWorld, aX, aY, aZ))
+        if ((!GTUtility.isBlockAir(aWorld, aX, aY, aZ))
             || (!aPlayer.canPlayerEdit(aX, aY, aZ, side.ordinal(), aStack))) {
             return false;
         }
         prepare(aStack);
-        long tFuelAmount = GT_Utility.ItemNBT.getLighterFuel(aStack);
-        if (GT_Utility.areStacksEqual(aStack, this.mUsedLighter, true)) {
-            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
+        long tFuelAmount = GTUtility.ItemNBT.getLighterFuel(aStack);
+        if (GTUtility.areStacksEqual(aStack, this.mUsedLighter, true)) {
+            GTUtility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
             aWorld.setBlock(aX, aY, aZ, Blocks.fire);
             if (!aPlayer.capabilities.isCreativeMode) {
                 tFuelAmount -= 1L;
             }
             rOutput = true;
         }
-        GT_Utility.ItemNBT.setLighterFuel(aStack, tFuelAmount);
+        GTUtility.ItemNBT.setLighterFuel(aStack, tFuelAmount);
         if (tFuelAmount <= 0L) {
             useUp(aStack);
         }
@@ -110,10 +109,10 @@ public class Behaviour_Lighter extends Behaviour_None {
     }
 
     private void prepare(ItemStack aStack) {
-        if (GT_Utility.areStacksEqual(aStack, this.mFullLighter, true)) {
+        if (GTUtility.areStacksEqual(aStack, this.mFullLighter, true)) {
             aStack.func_150996_a(this.mUsedLighter.getItem());
             Items.feather.setDamage(aStack, Items.feather.getDamage(this.mUsedLighter));
-            GT_Utility.ItemNBT.setLighterFuel(aStack, this.mFuelAmount);
+            GTUtility.ItemNBT.setLighterFuel(aStack, this.mFuelAmount);
         }
     }
 
@@ -127,11 +126,11 @@ public class Behaviour_Lighter extends Behaviour_None {
     }
 
     @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);
         NBTTagCompound tNBT = aStack.getTagCompound();
         long tFuelAmount = tNBT == null ? this.mFuelAmount
-            : GT_Utility.areStacksEqual(aStack, this.mFullLighter, true) ? this.mFuelAmount
+            : GTUtility.areStacksEqual(aStack, this.mFullLighter, true) ? this.mFuelAmount
                 : tNBT.getLong("GT.LighterFuel");
         aList.add(this.mTooltipUses + " " + tFuelAmount);
         aList.add(this.mTooltipUnstackable);
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_None.java b/src/main/java/gregtech/common/items/behaviors/BehaviourNone.java
index c31ddc723d..f8b5f74b72 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_None.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourNone.java
@@ -17,53 +17,53 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.MetaBaseItem;
 
-public class Behaviour_None implements IItemBehaviour<GT_MetaBase_Item> {
+public class BehaviourNone implements IItemBehaviour<MetaBaseItem> {
 
     @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) {
         return false;
     }
 
     @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) {
         return false;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         return false;
     }
 
     @Override
-    public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
+    public ItemStack onItemRightClick(MetaBaseItem aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
         return 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) {
         return aList;
     }
 
     @Override
-    public void onUpdate(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer,
+    public void onUpdate(MetaBaseItem aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer,
         boolean aIsInHand) {}
 
     @Override
-    public boolean isItemStackUsable(GT_MetaBase_Item aItem, ItemStack aStack) {
+    public boolean isItemStackUsable(MetaBaseItem aItem, ItemStack aStack) {
         return true;
     }
 
     @Override
-    public boolean canDispense(GT_MetaBase_Item aItem, IBlockSource aSource, ItemStack aStack) {
+    public boolean canDispense(MetaBaseItem aItem, IBlockSource aSource, ItemStack aStack) {
         return false;
     }
 
     @Override
-    public ItemStack onDispense(GT_MetaBase_Item aItem, IBlockSource aSource, ItemStack aStack) {
+    public ItemStack onDispense(MetaBaseItem aItem, IBlockSource aSource, ItemStack aStack) {
         EnumFacing enumfacing = BlockDispenser.func_149937_b(aSource.getBlockMetadata());
         IPosition iposition = BlockDispenser.func_149939_a(aSource);
         ItemStack itemstack1 = aStack.splitStack(1);
@@ -72,18 +72,18 @@ public class Behaviour_None implements IItemBehaviour<GT_MetaBase_Item> {
     }
 
     @Override
-    public boolean hasProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack) {
+    public boolean hasProjectile(MetaBaseItem aItem, SubTag aProjectileType, ItemStack aStack) {
         return false;
     }
 
     @Override
-    public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
+    public EntityArrow getProjectile(MetaBaseItem aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
         double aX, double aY, double aZ) {
         return null;
     }
 
     @Override
-    public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
+    public EntityArrow getProjectile(MetaBaseItem aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
         EntityLivingBase aEntity, float aSpeed) {
         return null;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerEssentia.java
index 867eb25103..910ea2d2d4 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerEssentia.java
@@ -9,32 +9,32 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import thaumcraft.api.aspects.IEssentiaTransport;
 
-public class Behaviour_Plunger_Essentia extends Behaviour_None {
+public class BehaviourPlungerEssentia extends BehaviourNone {
 
     private final int mCosts;
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.plunger.essentia", "Clears Essentia from Containers and Tubes");
 
-    public Behaviour_Plunger_Essentia(int aCosts) {
+    public BehaviourPlungerEssentia(int aCosts) {
         this.mCosts = aCosts;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
         }
         TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (((aTileEntity instanceof IEssentiaTransport)) && ((aPlayer.capabilities.isCreativeMode)
-            || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
-            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ);
+        if (((aTileEntity instanceof IEssentiaTransport))
+            && ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts)))) {
+            GTUtility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ);
             for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) {
                 ((IEssentiaTransport) aTileEntity).takeEssentia(
                     ((IEssentiaTransport) aTileEntity).getEssentiaType(tDirection),
@@ -47,7 +47,7 @@ public class Behaviour_Plunger_Essentia extends Behaviour_None {
     }
 
     @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);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerFluid.java
index c62cb5c4e5..b406b27b15 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerFluid.java
@@ -12,24 +12,24 @@ import net.minecraftforge.fluids.IFluidHandler;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_Plunger_Fluid extends Behaviour_None {
+public class BehaviourPlungerFluid extends BehaviourNone {
 
     private final int mCosts;
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.plunger.fluid", "Clears 1000 Liters of Fluid from Tanks");
 
-    public Behaviour_Plunger_Fluid(int aCosts) {
+    public BehaviourPlungerFluid(int aCosts) {
         this.mCosts = aCosts;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
@@ -39,9 +39,9 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None {
             for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) {
                 if (((IFluidHandler) aTileEntity).drain(tDirection, 1000, false) != null) {
                     if ((aPlayer.capabilities.isCreativeMode)
-                        || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+                        || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) {
                         ((IFluidHandler) aTileEntity).drain(tDirection, 1000, true);
-                        GT_Utility.sendSoundToPlayers(
+                        GTUtility.sendSoundToPlayers(
                             aWorld,
                             SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE,
                             1.0F,
@@ -56,10 +56,10 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None {
         }
         if (aTileEntity instanceof IGregTechTileEntity tTileEntity) {
             IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity();
-            if (mTileEntity instanceof GT_MetaTileEntity_BasicTank machine) {
+            if (mTileEntity instanceof MTEBasicTank machine) {
                 if (machine.mFluid != null && machine.mFluid.amount > 0)
                     machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000);
-                GT_Utility
+                GTUtility
                     .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ);
                 return true;
             }
@@ -68,7 +68,7 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None {
     }
 
     @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);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerItem.java
index a5fa868a00..c0db5c76b4 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerItem.java
@@ -14,23 +14,23 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntityItemPipe;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_Plunger_Item extends Behaviour_None {
+public class BehaviourPlungerItem extends BehaviourNone {
 
     private final int mCosts;
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.plunger.item", "Clears Items from Pipes");
 
-    public Behaviour_Plunger_Item(int aCosts) {
+    public BehaviourPlungerItem(int aCosts) {
         this.mCosts = aCosts;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
@@ -39,7 +39,7 @@ public class Behaviour_Plunger_Item extends Behaviour_None {
         if (aTileEntity instanceof IGregTechTileEntity gtTE) {
             IMetaTileEntity tMetaTileEntity = gtTE.getMetaTileEntity();
             if ((tMetaTileEntity instanceof IMetaTileEntityItemPipe)) {
-                for (IMetaTileEntityItemPipe tTileEntity : GT_Utility
+                for (IMetaTileEntityItemPipe tTileEntity : GTUtility
                     .sortMapByValuesAcending(
                         IMetaTileEntityItemPipe.Util
                             .scanPipes((IMetaTileEntityItemPipe) tMetaTileEntity, new HashMap<>(), 0L, false, true))
@@ -48,7 +48,7 @@ public class Behaviour_Plunger_Item extends Behaviour_None {
                     for (int j = tTileEntity.getSizeInventory(); i < j; i++) {
                         if (tTileEntity.isValidSlot(i)) {
                             if ((tTileEntity.getStackInSlot(i) != null) && ((aPlayer.capabilities.isCreativeMode)
-                                || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
+                                || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts)))) {
                                 final ItemStack tStack = tTileEntity.decrStackSize(i, 64);
                                 if (tStack != null) {
                                     final EntityItem tEntity = new EntityItem(
@@ -61,7 +61,7 @@ public class Behaviour_Plunger_Item extends Behaviour_None {
                                     tEntity.motionY = 0.0D;
                                     tEntity.motionZ = 0.0D;
                                     aWorld.spawnEntityInWorld(tEntity);
-                                    GT_Utility.sendSoundToPlayers(
+                                    GTUtility.sendSoundToPlayers(
                                         aWorld,
                                         SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE,
                                         1.0F,
@@ -81,7 +81,7 @@ public class Behaviour_Plunger_Item extends Behaviour_None {
     }
 
     @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);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_PrintedPages.java b/src/main/java/gregtech/common/items/behaviors/BehaviourPrintedPages.java
index e3c4d58525..0716ffae7e 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_PrintedPages.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourPrintedPages.java
@@ -5,10 +5,10 @@ import java.util.List;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_PrintedPages extends Behaviour_None {
+public class BehaviourPrintedPages extends BehaviourNone {
 
     public static String getTitle(ItemStack aStack) {
         NBTTagCompound tNBT = aStack.getTagCompound();
@@ -27,11 +27,11 @@ public class Behaviour_PrintedPages extends Behaviour_None {
     }
 
     @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
-        if (GT_Utility.isStringValid(getTitle(aStack))) {
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
+        if (GTUtility.isStringValid(getTitle(aStack))) {
             aList.add(getTitle(aStack));
         }
-        if (GT_Utility.isStringValid(getAuthor(aStack))) {
+        if (GTUtility.isStringValid(getAuthor(aStack))) {
             aList.add("by " + getAuthor(aStack));
         }
         return aList;
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java b/src/main/java/gregtech/common/items/behaviors/BehaviourProspecting.java
index e64722fb87..98aed597f9 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourProspecting.java
@@ -13,34 +13,34 @@ 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.objects.XSTR;
-import gregtech.api.util.GT_LanguageManager;
-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_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.BlockOresAbstract;
+import gregtech.common.blocks.TileEntityOres;
 
-public class Behaviour_Prospecting extends Behaviour_None {
+public class BehaviourProspecting extends BehaviourNone {
 
     private final int mVanillaCosts;
     private final int mEUCosts;
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.prospecting", "Usable for Prospecting");
 
-    public Behaviour_Prospecting(int aVanillaCosts, int aEUCosts) {
+    public BehaviourProspecting(int aVanillaCosts, int aEUCosts) {
         this.mVanillaCosts = aVanillaCosts;
         this.mEUCosts = aEUCosts;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
@@ -51,32 +51,32 @@ public class Behaviour_Prospecting extends Behaviour_None {
         }
         byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
 
-        ItemData tAssociation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta));
+        ItemData tAssociation = GTOreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta));
         if (tAssociation != null && tAssociation.mPrefix != null
             && tAssociation.mMaterial != null
             && tAssociation.mPrefix.toString()
                 .startsWith("ore")) {
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
-                GT_Utility.trans("100", "This is ") + tAssociation.mMaterial.mMaterial.mDefaultLocalName
-                    + GT_Utility.trans("101", " Ore."));
-            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
+                GTUtility.trans("100", "This is ") + tAssociation.mMaterial.mMaterial.mDefaultLocalName
+                    + GTUtility.trans("101", " Ore."));
+            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, Blocks.netherrack)
             || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone)
-            || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockStones)
-            || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)
-            || aBlock == GregTech_API.sBlockOresUb1
-            || aBlock == GregTech_API.sBlockOresUb2
-            || aBlock == GregTech_API.sBlockOresUb3
-            || aBlock == GregTech_API.sBlockOres1) {
-            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);
+            || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockStones)
+            || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockGranites)
+            || aBlock == GregTechAPI.sBlockOresUb1
+            || aBlock == GregTechAPI.sBlockOresUb2
+            || aBlock == GregTechAPI.sBlockOresUb3
+            || aBlock == GregTechAPI.sBlockOres1) {
+            if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
+                GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ);
                 int tMetaID;
-                int tQuality = aItem instanceof GT_MetaGenerated_Tool ? aItem.getHarvestLevel(aStack, "") : 0;
+                int tQuality = aItem instanceof MetaGeneratedTool ? aItem.getHarvestLevel(aStack, "") : 0;
                 int tX = aX, tY = aY, tZ = aZ;
                 Block tBlock;
                 for (int i = 0, j = 6 + tQuality; i < j; i++) {
@@ -86,25 +86,24 @@ public class Behaviour_Prospecting extends Behaviour_None {
 
                     tBlock = aWorld.getBlock(tX, tY, tZ);
                     if (tBlock == Blocks.lava || tBlock == Blocks.flowing_lava) {
-                        GT_Utility
-                            .sendChatToPlayer(aPlayer, GT_Utility.trans("102", "There is Lava behind this Rock."));
+                        GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("102", "There is Lava behind this Rock."));
                         break;
                     }
                     if (tBlock instanceof BlockLiquid || tBlock instanceof IFluidBlock) {
-                        GT_Utility
-                            .sendChatToPlayer(aPlayer, GT_Utility.trans("103", "There is a Liquid behind this Rock."));
+                        GTUtility
+                            .sendChatToPlayer(aPlayer, GTUtility.trans("103", "There is a Liquid behind this Rock."));
                         break;
                     }
-                    if (tBlock == Blocks.monster_egg || !GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ)) {
-                        GT_Utility.sendChatToPlayer(
+                    if (tBlock == Blocks.monster_egg || !GTUtility.hasBlockHitBox(aWorld, tX, tY, tZ)) {
+                        GTUtility.sendChatToPlayer(
                             aPlayer,
-                            GT_Utility.trans("104", "There is an Air Pocket behind this Rock."));
+                            GTUtility.trans("104", "There is an Air Pocket behind this Rock."));
                         break;
                     }
                     if (tBlock != aBlock) {
-                        if (i < 4) GT_Utility.sendChatToPlayer(
+                        if (i < 4) GTUtility.sendChatToPlayer(
                             aPlayer,
-                            GT_Utility.trans("105", "Material is changing behind this Rock."));
+                            GTUtility.trans("105", "Material is changing behind this Rock."));
                         break;
                     }
                 }
@@ -115,36 +114,36 @@ public class Behaviour_Prospecting extends Behaviour_None {
                     tY = aY - 4 - tQuality + tRandom.nextInt(j);
                     tZ = aZ - 4 - tQuality + tRandom.nextInt(j);
                     tBlock = aWorld.getBlock(tX, tY, tZ);
-                    if (tBlock instanceof GT_Block_Ores_Abstract) {
+                    if (tBlock instanceof BlockOresAbstract) {
                         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,
-                                    GT_Utility.trans("106", "Found traces of ") + tMaterial.mDefaultLocalName
-                                        + GT_Utility.trans("101", " Ore."));
+                                    GTUtility.trans("106", "Found traces of ") + tMaterial.mDefaultLocalName
+                                        + GTUtility.trans("101", " Ore."));
                                 return true;
                             }
                         }
                     } else {
                         tMetaID = aWorld.getBlockMetadata(tX, tY, tZ);
-                        tAssociation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
+                        tAssociation = GTOreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
                         if (tAssociation != null && tAssociation.mPrefix != null
                             && tAssociation.mMaterial != null
                             && tAssociation.mPrefix.toString()
                                 .startsWith("ore")) {
-                            GT_Utility.sendChatToPlayer(
+                            GTUtility.sendChatToPlayer(
                                 aPlayer,
-                                GT_Utility.trans("106", "Found traces of ")
+                                GTUtility.trans("106", "Found traces of ")
                                     + tAssociation.mMaterial.mMaterial.mDefaultLocalName
-                                    + GT_Utility.trans("101", " Ore."));
+                                    + GTUtility.trans("101", " Ore."));
                             return true;
                         }
                     }
                 }
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("107", "No Ores found."));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("107", "No Ores found."));
                 return true;
             }
         }
@@ -152,7 +151,7 @@ public class Behaviour_Prospecting extends Behaviour_None {
     }
 
     @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);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java b/src/main/java/gregtech/common/items/behaviors/BehaviourScanner.java
index 22b708e384..75e702a3a7 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourScanner.java
@@ -13,42 +13,42 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_Scanner extends Behaviour_None {
+public class BehaviourScanner extends BehaviourNone {
 
-    public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Scanner();
-    private final String mTooltip = GT_LanguageManager
+    public static final IItemBehaviour<MetaBaseItem> INSTANCE = new BehaviourScanner();
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.scanning", "Can scan Blocks in World");
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         final NBTTagCompound tNBT = aStack.getTagCompound();
         if (((aPlayer instanceof EntityPlayerMP)) && (aItem.canUse(aStack, 20000.0D))) {
             final ArrayList<String> tList = new ArrayList<>();
             if (aItem.use(
                 aStack,
-                GT_Utility.getCoordinateScan(tList, aPlayer, aWorld, 1, aX, aY, aZ, side, hitX, hitY, hitZ),
+                GTUtility.getCoordinateScan(tList, aPlayer, aWorld, 1, aX, aY, aZ, side, hitX, hitY, hitZ),
                 aPlayer)) {
                 final int tList_sS = tList.size();
                 tNBT.setInteger("dataLinesCount", tList_sS);
                 for (int i = 0; i < tList_sS; i++) {
                     tNBT.setString("dataLines" + i, tList.get(i));
-                    GT_Utility.sendChatToPlayer(aPlayer, tList.get(i));
+                    GTUtility.sendChatToPlayer(aPlayer, tList.get(i));
                 }
             }
             return true;
         }
-        GT_Utility.doSoundAtClient(SoundResource.IC2_TOOLS_OD_SCANNER, 1, 1.0F, aX, aY, aZ);
+        GTUtility.doSoundAtClient(SoundResource.IC2_TOOLS_OD_SCANNER, 1, 1.0F, aX, aY, aZ);
         // doGuiAtClient()
         return aPlayer instanceof EntityPlayerMP;
     }
 
     @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) {
         try {
             NBTTagCompound tNBT = aStack.getTagCompound();
             int lines = tNBT.getInteger("dataLinesCount");
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java b/src/main/java/gregtech/common/items/behaviors/BehaviourScoop.java
index 65be65a96d..9f727dd8cc 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourScoop.java
@@ -10,28 +10,27 @@ import net.minecraft.item.ItemStack;
 import forestry.api.lepidopterology.EnumFlutterType;
 import forestry.api.lepidopterology.IButterfly;
 import forestry.api.lepidopterology.IEntityButterfly;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTLanguageManager;
 
-public class Behaviour_Scoop extends Behaviour_None {
+public class BehaviourScoop extends BehaviourNone {
 
     private final int mCosts;
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.scoop", "Catches Butterflies on Leftclick");
 
-    public Behaviour_Scoop(int aCosts) {
+    public BehaviourScoop(int aCosts) {
         this.mCosts = aCosts;
     }
 
     @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 ((aEntity instanceof IEntityButterfly)) {
             if (aPlayer.worldObj.isRemote) {
                 return true;
             }
-            if ((aPlayer.capabilities.isCreativeMode)
-                || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+            if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) {
                 IButterfly tButterfly = ((IEntityButterfly) aEntity).getButterfly();
                 tButterfly.getGenome()
                     .getPrimary()
@@ -56,7 +55,7 @@ public class Behaviour_Scoop extends Behaviour_None {
     }
 
     @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);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Screwdriver.java b/src/main/java/gregtech/common/items/behaviors/BehaviourScrewdriver.java
index d940226b84..599398349f 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Screwdriver.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourScrewdriver.java
@@ -8,22 +8,22 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_Screwdriver extends Behaviour_None {
+public class BehaviourScrewdriver extends BehaviourNone {
 
     private final int mVanillaCosts;
     private final int mEUCosts;
 
-    public Behaviour_Screwdriver(int aVanillaCosts, int aEUCosts) {
+    public BehaviourScrewdriver(int aVanillaCosts, int aEUCosts) {
         this.mVanillaCosts = aVanillaCosts;
         this.mEUCosts = aEUCosts;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
@@ -34,16 +34,16 @@ public class Behaviour_Screwdriver extends Behaviour_None {
         }
         byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
         if ((aBlock == Blocks.unpowered_repeater) || (aBlock == Blocks.powered_repeater)) {
-            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
+            if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
                 aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aMeta / 4 * 4 + (aMeta % 4 + 1) % 4, 3);
-                GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, aX, aY, aZ);
+                GTUtility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
         if ((aBlock == Blocks.unpowered_comparator) || (aBlock == Blocks.powered_comparator)) {
-            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
+            if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
                 aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aMeta / 4 * 4 + (aMeta % 4 + 1) % 4, 3);
-                GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, aX, aY, aZ);
+                GTUtility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSense.java
index b2ab0031ad..eb55802207 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSense.java
@@ -8,23 +8,23 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTLanguageManager;
 import ic2.api.crops.ICropTile;
 
-public class Behaviour_Sense extends Behaviour_None {
+public class BehaviourSense extends BehaviourNone {
 
     private final int mCosts;
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.sense", "Rightclick to harvest Crop Sticks");
 
-    public Behaviour_Sense(int aCosts) {
+    public BehaviourSense(int aCosts) {
         this.mCosts = aCosts;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
@@ -38,7 +38,7 @@ public class Behaviour_Sense extends Behaviour_None {
                             && (((tTileEntity = aWorld.getTileEntity(aX + i, aY + j, aZ + k)) instanceof ICropTile))
                             && (((ICropTile) tTileEntity).harvest(true))
                             && (!aPlayer.capabilities.isCreativeMode)) {
-                            ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts / 20);
+                            ((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts / 20);
                         }
                     }
                 }
@@ -49,7 +49,7 @@ public class Behaviour_Sense extends Behaviour_None {
     }
 
     @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);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_SensorKit.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSensorKit.java
index b12159d058..70ec04551e 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_SensorKit.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSensorKit.java
@@ -13,18 +13,18 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_SensorKit extends Behaviour_None {
+public class BehaviourSensorKit extends BehaviourNone {
 
-    private final String mTooltip = GT_LanguageManager.addStringLocalization(
+    private final String mTooltip = GTLanguageManager.addStringLocalization(
         "gt.behaviour.sensorkit.tooltip",
         "Used to display Information using the Mod Nuclear Control");
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if ((aPlayer instanceof EntityPlayerMP)) {
             TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
@@ -33,7 +33,7 @@ public class Behaviour_SensorKit extends Behaviour_None {
             }
             if (((tTileEntity instanceof IGregTechDeviceInformation))
                 && (((IGregTechDeviceInformation) tTileEntity).isGivingInformation())) {
-                GT_Utility.setStack(aStack, ItemList.NC_SensorCard.get(aStack.stackSize));
+                GTUtility.setStack(aStack, ItemList.NC_SensorCard.get(aStack.stackSize));
                 NBTTagCompound tNBT = aStack.getTagCompound();
                 if (tNBT == null) {
                     tNBT = new NBTTagCompound();
@@ -49,7 +49,7 @@ public class Behaviour_SensorKit extends Behaviour_None {
     }
 
     @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);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSoftHammer.java
index 159a0c4b27..83e458276d 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSoftHammer.java
@@ -10,23 +10,23 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_SoftHammer extends Behaviour_None {
+public class BehaviourSoftHammer extends BehaviourNone {
 
     private final int mCosts;
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.softhammer", "Activates and Deactivates Machines");
 
-    public Behaviour_SoftHammer(int aCosts) {
+    public BehaviourSoftHammer(int aCosts) {
         this.mCosts = aCosts;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
@@ -37,52 +37,47 @@ public class Behaviour_SoftHammer extends Behaviour_None {
         }
         byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
         if (aBlock == Blocks.lit_redstone_lamp) {
-            if ((aPlayer.capabilities.isCreativeMode)
-                || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+            if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) {
                 aWorld.isRemote = true;
                 aWorld.setBlock(aX, aY, aZ, Blocks.redstone_lamp, 0, 0);
                 aWorld.isRemote = false;
-                GT_Utility
+                GTUtility
                     .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
         if (aBlock == Blocks.redstone_lamp) {
-            if ((aPlayer.capabilities.isCreativeMode)
-                || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+            if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) {
                 aWorld.isRemote = true;
                 aWorld.setBlock(aX, aY, aZ, Blocks.lit_redstone_lamp, 0, 0);
                 aWorld.isRemote = false;
-                GT_Utility
+                GTUtility
                     .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
         if (aBlock == Blocks.golden_rail) {
-            if ((aPlayer.capabilities.isCreativeMode)
-                || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+            if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) {
                 aWorld.isRemote = true;
                 aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 8) % 16, 0);
                 aWorld.isRemote = false;
-                GT_Utility
+                GTUtility
                     .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
         if (aBlock == Blocks.activator_rail) {
-            if ((aPlayer.capabilities.isCreativeMode)
-                || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+            if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) {
                 aWorld.isRemote = true;
                 aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 8) % 16, 0);
                 aWorld.isRemote = false;
-                GT_Utility
+                GTUtility
                     .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
         if ((aBlock == Blocks.log) || (aBlock == Blocks.log2) || (aBlock == Blocks.hay_block)) {
-            if ((aPlayer.capabilities.isCreativeMode)
-                || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+            if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) {
                 aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 4) % 12, 3);
             }
             return true;
@@ -90,10 +85,9 @@ public class Behaviour_SoftHammer extends Behaviour_None {
         if ((aBlock == Blocks.piston) || (aBlock == Blocks.sticky_piston)
             || (aBlock == Blocks.dispenser)
             || (aBlock == Blocks.dropper)) {
-            if ((aPlayer.capabilities.isCreativeMode)
-                || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+            if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) {
                 aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 1) % 6, 3);
-                GT_Utility
+                GTUtility
                     .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
@@ -103,19 +97,17 @@ public class Behaviour_SoftHammer extends Behaviour_None {
             || (aBlock == Blocks.lit_furnace)
             || (aBlock == Blocks.chest)
             || (aBlock == Blocks.trapped_chest)) {
-            if ((aPlayer.capabilities.isCreativeMode)
-                || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+            if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) {
                 aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta - 1) % 4 + 2, 3);
-                GT_Utility
+                GTUtility
                     .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
         if (aBlock == Blocks.hopper) {
-            if ((aPlayer.capabilities.isCreativeMode)
-                || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+            if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) {
                 aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 1) % 6 != 1 ? (aMeta + 1) % 6 : 2, 3);
-                GT_Utility
+                GTUtility
                     .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
@@ -124,7 +116,7 @@ public class Behaviour_SoftHammer extends Behaviour_None {
     }
 
     @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);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSonictron.java
index dbab764507..f362f7b3f4 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSonictron.java
@@ -8,14 +8,14 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_Sonictron extends Behaviour_None {
+public class BehaviourSonictron extends BehaviourNone {
 
-    public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Sonictron();
+    public static final IItemBehaviour<MetaBaseItem> INSTANCE = new BehaviourSonictron();
 
     public static int getCurrentIndex(ItemStack aStack) {
         NBTTagCompound tNBTTagCompound = aStack.getTagCompound();
@@ -62,7 +62,7 @@ public class Behaviour_Sonictron extends Behaviour_None {
             NBTTagCompound tag = tNBT_ItemList.getCompoundTagAt(i);
             byte slot = tag.getByte("Slot");
             if ((slot >= 0) && (slot < tInventory.length)) {
-                tInventory[slot] = GT_Utility.loadItem(tag);
+                tInventory[slot] = GTUtility.loadItem(tag);
             }
         }
         return tInventory;
@@ -93,32 +93,32 @@ public class Behaviour_Sonictron extends Behaviour_None {
             if (aNewContent[i] == null) {
                 aInventory[i] = null;
             } else {
-                aInventory[i] = GT_Utility.copyOrNull(aNewContent[i]);
+                aInventory[i] = GTUtility.copyOrNull(aNewContent[i]);
             }
         }
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         setCurrentIndex(aStack, -1);
         return false;
     }
 
     @Override
-    public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
+    public ItemStack onItemRightClick(MetaBaseItem aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
         setCurrentIndex(aStack, 0);
         return aStack;
     }
 
     @Override
-    public void onUpdate(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer,
+    public void onUpdate(MetaBaseItem aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer,
         boolean aIsInHand) {
         int tTickTimer = getTickTimer(aStack);
         int tCurrentIndex = getCurrentIndex(aStack);
         if ((tTickTimer++ % 2 == 0) && (tCurrentIndex > -1)) {
             ItemStack[] tInventory = getNBTInventory(aStack);
-            GT_Values.GT.doSonictronSound(
+            GTValues.GT.doSonictronSound(
                 tInventory[tCurrentIndex],
                 aPlayer.worldObj,
                 aPlayer.posX,
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColor.java
index 216eb4d745..e79f8e0939 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColor.java
@@ -22,12 +22,12 @@ import appeng.block.networking.BlockCableBus;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import gregtech.common.config.other.ConfigGeneral;
 
-public class Behaviour_Spray_Color extends Behaviour_None {
+public class BehaviourSprayColor extends BehaviourNone {
 
     private final ItemStack mEmpty;
     private final ItemStack mUsed;
@@ -42,30 +42,30 @@ public class Behaviour_Spray_Color extends Behaviour_None {
         Blocks.carpet,
         Blocks.hardened_clay);
     protected String mTooltip;
-    private final String mTooltipUses = GT_LanguageManager
+    private final String mTooltipUses = GTLanguageManager
         .addStringLocalization("gt.behaviour.paintspray.uses", "Remaining Uses:");
-    private final String mTooltipUnstackable = GT_LanguageManager
+    private final String mTooltipUnstackable = GTLanguageManager
         .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!");
-    private final String mTooltipChain = GT_LanguageManager.addStringLocalization(
+    private final String mTooltipChain = GTLanguageManager.addStringLocalization(
         "gt.behaviour.paintspray.chain",
         "If used while sneaking it will spray a chain of blocks");
 
-    private final String mTooltipChainAmount = GT_LanguageManager.addStringLocalization(
+    private final String mTooltipChainAmount = GTLanguageManager.addStringLocalization(
         "gt.behaviour.paintspray.chain",
         "Sprays up to %d blocks, in the direction you're looking at");
 
-    public Behaviour_Spray_Color(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses, int aColor) {
+    public BehaviourSprayColor(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses, int aColor) {
         this.mEmpty = aEmpty;
         this.mUsed = aUsed;
         this.mFull = aFull;
         this.mUses = aUses;
         this.mColor = ((byte) aColor);
-        this.mTooltip = GT_LanguageManager.addStringLocalization(
+        this.mTooltip = GTLanguageManager.addStringLocalization(
             "gt.behaviour.paintspray." + this.mColor + ".tooltip",
             "Can Color things in " + Dyes.get(this.mColor).mName);
     }
 
-    public Behaviour_Spray_Color(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses) {
+    public BehaviourSprayColor(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses) {
         this.mEmpty = aEmpty;
         this.mUsed = aUsed;
         this.mFull = aFull;
@@ -75,7 +75,7 @@ public class Behaviour_Spray_Color extends Behaviour_None {
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if ((aWorld.isRemote) || (aStack.stackSize != 1)) {
             return false;
@@ -89,7 +89,7 @@ public class Behaviour_Spray_Color extends Behaviour_None {
             tNBT = new NBTTagCompound();
         }
         long tUses = tNBT.getLong("GT.RemainingPaint");
-        if (GT_Utility.areStacksEqual(aStack, this.mFull, true)) {
+        if (GTUtility.areStacksEqual(aStack, this.mFull, true)) {
             aStack.func_150996_a(this.mUsed.getItem());
             Items.feather.setDamage(aStack, Items.feather.getDamage(this.mUsed));
             tUses = this.mUses;
@@ -111,8 +111,8 @@ public class Behaviour_Spray_Color extends Behaviour_None {
         Block initialBlock = aWorld.getBlock(aX, aY, aZ);
         int initialBlockMeta = aWorld.getBlockMetadata(aX, aY, aZ);
         TileEntity initialTE = aWorld.getTileEntity(aX, aY, aZ);
-        while ((GT_Utility.areStacksEqual(aStack, this.mUsed, true)) && (colorize(aWorld, aX, aY, aZ, side, aPlayer))) {
-            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, 1.0F, aX, aY, aZ);
+        while ((GTUtility.areStacksEqual(aStack, this.mUsed, true)) && (colorize(aWorld, aX, aY, aZ, side, aPlayer))) {
+            GTUtility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, 1.0F, aX, aY, aZ);
             if (!aPlayer.capabilities.isCreativeMode) {
                 tUses -= 1L;
             }
@@ -204,13 +204,13 @@ public class Behaviour_Spray_Color extends Behaviour_None {
     }
 
     @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);
         aList.add(this.mTooltipChain);
         aList.add(String.format(this.mTooltipChainAmount, ConfigGeneral.sprayCanChainRange));
         NBTTagCompound tNBT = aStack.getTagCompound();
         long tRemainingPaint = tNBT == null ? this.mUses
-            : GT_Utility.areStacksEqual(aStack, this.mFull, true) ? this.mUses : tNBT.getLong("GT.RemainingPaint");
+            : GTUtility.areStacksEqual(aStack, this.mFull, true) ? this.mUses : tNBT.getLong("GT.RemainingPaint");
         aList.add(this.mTooltipUses + " " + tRemainingPaint);
         aList.add(this.mTooltipUnstackable);
         return aList;
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color_Remover.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorRemover.java
index 0b73b4f7fc..cdf35161e3 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color_Remover.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorRemover.java
@@ -12,13 +12,13 @@ import appeng.api.implementations.tiles.IColorableTile;
 import appeng.api.util.AEColor;
 import appeng.block.networking.BlockCableBus;
 import gregtech.api.interfaces.tileentity.IColoredTileEntity;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class Behaviour_Spray_Color_Remover extends Behaviour_Spray_Color {
+public class BehaviourSprayColorRemover extends BehaviourSprayColor {
 
-    public Behaviour_Spray_Color_Remover(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses) {
+    public BehaviourSprayColorRemover(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses) {
         super(aEmpty, aUsed, aFull, aUses);
-        this.mTooltip = GT_LanguageManager
+        this.mTooltip = GTLanguageManager
             .addStringLocalization("gt.behaviour.paintspray.solvent.tooltip", "Can remove paint from things");
     }
 
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Metadata.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMetadata.java
index 03cf29b9dd..0d195660c2 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Metadata.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMetadata.java
@@ -10,56 +10,56 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.items.GT_Generic_Block;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.GTGenericBlock;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_Switch_Metadata extends Behaviour_None {
+public class BehaviourSwitchMetadata extends BehaviourNone {
 
     public final int mSwitchIndex;
     public final boolean mCheckTarget, mShowModeSwitchTooltip;
 
-    public Behaviour_Switch_Metadata(int aSwitchIndex) {
+    public BehaviourSwitchMetadata(int aSwitchIndex) {
         this(aSwitchIndex, false);
     }
 
-    public Behaviour_Switch_Metadata(int aSwitchIndex, boolean aCheckTarget) {
+    public BehaviourSwitchMetadata(int aSwitchIndex, boolean aCheckTarget) {
         this(aSwitchIndex, aCheckTarget, false);
     }
 
-    public Behaviour_Switch_Metadata(int aSwitchIndex, boolean aCheckTarget, boolean aShowModeSwitchTooltip) {
+    public BehaviourSwitchMetadata(int aSwitchIndex, boolean aCheckTarget, boolean aShowModeSwitchTooltip) {
         mSwitchIndex = aSwitchIndex;
         mCheckTarget = aCheckTarget;
         mShowModeSwitchTooltip = aShowModeSwitchTooltip;
     }
 
     @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
-        if (mShowModeSwitchTooltip) aList.add(GT_Utility.trans("330", "Sneak Rightclick to switch Mode"));
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
+        if (mShowModeSwitchTooltip) aList.add(GTUtility.trans("330", "Sneak Rightclick to switch Mode"));
         return aList;
     }
 
     @Override
-    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, ForgeDirection side, float aHitX, float aHitY, float aHitZ) {
         if (aStack != null && (aPlayer == null || aPlayer.isSneaking()) && !aWorld.isRemote) {
             if (mCheckTarget) {
                 Block aBlock = aWorld.blockExists(aX, aY, aZ) ? aWorld.getBlock(aX, aY, aZ) : Blocks.air;
-                if (aBlock instanceof GT_Generic_Block) {
+                if (aBlock instanceof GTGenericBlock) {
                     Items.feather.setDamage(aStack, (short) mSwitchIndex);
-                    GT_Utility.updateItemStack(aStack);
+                    GTUtility.updateItemStack(aStack);
                     return true;
                 }
-                if (GT_Util.getTileEntity(aWorld, aX, aY, aZ, true) == null) {
+                if (GTUtil.getTileEntity(aWorld, aX, aY, aZ, true) == null) {
                     Items.feather.setDamage(aStack, (short) mSwitchIndex);
-                    GT_Utility.updateItemStack(aStack);
+                    GTUtility.updateItemStack(aStack);
                     return true;
                 }
                 return false;
             }
             Items.feather.setDamage(aStack, (short) mSwitchIndex);
-            GT_Utility.updateItemStack(aStack);
+            GTUtility.updateItemStack(aStack);
             return true;
         }
         return false;
diff --git a/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java
new file mode 100644
index 0000000000..ba1730f805
--- /dev/null
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java
@@ -0,0 +1,53 @@
+package gregtech.common.items.behaviors;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+import gregtech.api.enums.GTValues;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.net.GTPacketToolSwitchMode;
+import gregtech.api.util.GTUtility;
+
+public class BehaviourSwitchMode extends BehaviourNone {
+
+    public BehaviourSwitchMode() {}
+
+    @Override
+    public ItemStack onItemRightClick(MetaBaseItem aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
+        if (aStack != null && (aPlayer == null || aPlayer.isSneaking()) && aWorld.isRemote) {
+
+            MetaGeneratedTool itemTool = (MetaGeneratedTool) aItem;
+            final byte maxMode = itemTool.getToolMaxMode(aStack);
+            if (maxMode == 1) {
+                return aStack;
+            }
+
+            MovingObjectPosition mop = GTUtility.getPlayerLookingTarget(aPlayer);
+            if (mop == null) {
+                GTValues.NW.sendToServer(new GTPacketToolSwitchMode());
+            }
+            return aStack;
+        }
+        return aStack;
+    }
+
+    @Override
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
+        super.getAdditionalToolTips(aItem, aList, aStack);
+        if ((aItem instanceof MetaGeneratedTool)) {
+            MetaGeneratedTool itemTool = (MetaGeneratedTool) aItem;
+            final int maxMode = itemTool.getToolMaxMode(aStack);
+            if (maxMode > 1) {
+                aList.add("Shift+Rclick to change mode");
+            }
+        }
+
+        return aList;
+    }
+
+}
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java b/src/main/java/gregtech/common/items/behaviors/BehaviourWrench.java
index 16c5c3f948..6155a6c739 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourWrench.java
@@ -17,31 +17,31 @@ import appeng.api.parts.IPartHost;
 import appeng.api.util.IOrientable;
 import appeng.tile.misc.TileInterface;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import ic2.api.tile.IWrenchable;
 
-public class Behaviour_Wrench extends Behaviour_None {
+public class BehaviourWrench extends BehaviourNone {
 
     private final int mCosts;
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick");
 
-    public Behaviour_Wrench(int aCosts) {
+    public BehaviourWrench(int aCosts) {
         this.mCosts = aCosts;
     }
 
     @Override
-    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, ForgeDirection side, float hitX, float hitY, float hitZ) {
         final Block aBlock = aWorld.getBlock(aX, aY, aZ);
         if (aBlock == null) {
             return false;
         }
         final int aMeta = aWorld.getBlockMetadata(aX, aY, aZ);
-        final short targetSideOrdinal = (short) GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)
+        final short targetSideOrdinal = (short) GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)
             .ordinal();
         final TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
 
@@ -56,7 +56,7 @@ public class Behaviour_Wrench extends Behaviour_None {
             aY,
             aZ,
             aStack,
-            (GT_MetaGenerated_Tool) aItem,
+            (MetaGeneratedTool) aItem,
             mCosts);
 
         try {
@@ -191,11 +191,11 @@ public class Behaviour_Wrench extends Behaviour_None {
         private final int x, y, z, meta;
         private final ItemStack stack;
 
-        private final GT_MetaGenerated_Tool item;
+        private final MetaGeneratedTool item;
         private final int costs;
 
         public WrenchHandler(Block block, int meta, short targetSideOrdinal, TileEntity tileEntity, EntityPlayer player,
-            World world, int x, int y, int z, ItemStack stack, GT_MetaGenerated_Tool item, int costs) {
+            World world, int x, int y, int z, ItemStack stack, MetaGeneratedTool item, int costs) {
             this.block = block;
             this.meta = meta;
             this.targetSideOrdinal = targetSideOrdinal;
@@ -212,7 +212,7 @@ public class Behaviour_Wrench extends Behaviour_None {
 
         /**
          * this will run the operation, damage the tool and play the sound if possible (creative mode or
-         * {@link GT_MetaGenerated_Tool#canWrench(EntityPlayer, int, int, int)})
+         * {@link MetaGeneratedTool#canWrench(EntityPlayer, int, int, int)})
          *
          * @param damage    damage to be applied to the wrench
          * @param operation the real operation of the click
@@ -225,7 +225,7 @@ public class Behaviour_Wrench extends Behaviour_None {
             if (player.capabilities.isCreativeMode || item.canWrench(player, x, y, z)) {
                 if (operation.getAsBoolean()) {
                     item.doDamage(stack, damage);
-                    GT_Utility.sendSoundToPlayers(world, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, x, y, z);
+                    GTUtility.sendSoundToPlayers(world, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, x, y, z);
                     return true;
                 }
             }
@@ -255,7 +255,7 @@ public class Behaviour_Wrench extends Behaviour_None {
     }
 
     public static boolean isVanillaCantFaceAxisY(Block block) {
-        return GT_Utility.arrayContains(
+        return GTUtility.arrayContains(
             block,
             Blocks.pumpkin,
             Blocks.lit_pumpkin,
@@ -267,11 +267,11 @@ public class Behaviour_Wrench extends Behaviour_None {
     }
 
     public static boolean isVanillaAllSideRotatable(Block block) {
-        return GT_Utility.arrayContains(block, Blocks.piston, Blocks.sticky_piston, Blocks.dispenser, Blocks.dropper);
+        return GTUtility.arrayContains(block, Blocks.piston, Blocks.sticky_piston, Blocks.dispenser, Blocks.dropper);
     }
 
     @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);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java b/src/main/java/gregtech/common/items/behaviors/BehaviourWrittenBook.java
index 0f645a93a9..54aa3d8b0d 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourWrittenBook.java
@@ -11,16 +11,16 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_WrittenBook extends Behaviour_None {
+public class BehaviourWrittenBook extends BehaviourNone {
 
     @Override
     @SideOnly(Side.CLIENT)
-    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) {
-        if ((GT_Utility.isStringValid(GT_Utility.ItemNBT.getBookTitle(aStack)))
+    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 ((GTUtility.isStringValid(GTUtility.ItemNBT.getBookTitle(aStack)))
             && ((aPlayer instanceof EntityPlayerSP))) {
             Minecraft.getMinecraft()
                 .displayGuiScreen(new GuiScreenBook(aPlayer, aStack, false));
@@ -29,11 +29,11 @@ public class Behaviour_WrittenBook extends Behaviour_None {
     }
 
     @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
-        String tTitle = GT_Utility.ItemNBT.getBookTitle(aStack);
-        if (GT_Utility.isStringValid(tTitle)) {
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
+        String tTitle = GTUtility.ItemNBT.getBookTitle(aStack);
+        if (GTUtility.isStringValid(tTitle)) {
             aList.add(tTitle);
-            aList.add("by " + GT_Utility.ItemNBT.getBookAuthor(aStack));
+            aList.add("by " + GTUtility.ItemNBT.getBookAuthor(aStack));
         }
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java
deleted file mode 100644
index 4054377568..0000000000
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gregtech.common.items.behaviors;
-
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.net.GT_Packet_ToolSwitchMode;
-import gregtech.api.util.GT_Utility;
-
-public class Behaviour_Switch_Mode extends Behaviour_None {
-
-    public Behaviour_Switch_Mode() {}
-
-    @Override
-    public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-        if (aStack != null && (aPlayer == null || aPlayer.isSneaking()) && aWorld.isRemote) {
-
-            GT_MetaGenerated_Tool itemTool = (GT_MetaGenerated_Tool) aItem;
-            final byte maxMode = itemTool.getToolMaxMode(aStack);
-            if (maxMode == 1) {
-                return aStack;
-            }
-
-            MovingObjectPosition mop = GT_Utility.getPlayerLookingTarget(aPlayer);
-            if (mop == null) {
-                GT_Values.NW.sendToServer(new GT_Packet_ToolSwitchMode());
-            }
-            return aStack;
-        }
-        return aStack;
-    }
-
-    @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
-        super.getAdditionalToolTips(aItem, aList, aStack);
-        if ((aItem instanceof GT_MetaGenerated_Tool)) {
-            GT_MetaGenerated_Tool itemTool = (GT_MetaGenerated_Tool) aItem;
-            final int maxMode = itemTool.getToolMaxMode(aStack);
-            if (maxMode > 1) {
-                aList.add("Shift+Rclick to change mode");
-            }
-        }
-
-        return aList;
-    }
-
-}
diff --git a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java b/src/main/java/gregtech/common/misc/DrillingLogicDelegate.java
index 9cf7fd7cf8..c52141f9bc 100644
--- a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java
+++ b/src/main/java/gregtech/common/misc/DrillingLogicDelegate.java
@@ -1,6 +1,6 @@
 package gregtech.common.misc;
 
-import static gregtech.api.enums.GT_Values.debugBlockMiner;
+import static gregtech.api.enums.GTValues.debugBlockMiner;
 
 import java.util.List;
 
@@ -11,22 +11,22 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.FakePlayer;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.TileEntityOres;
 
 /** @author Relvl on 27.01.2022 */
 @SuppressWarnings("ObjectEquality")
-public class GT_DrillingLogicDelegate {
+public class DrillingLogicDelegate {
 
-    public static final ItemStack MINING_PIPE_STACK = GT_ModHandler.getIC2Item("miningPipe", 0);
-    public static final Block MINING_PIPE_BLOCK = GT_Utility.getBlockFromStack(MINING_PIPE_STACK);
-    public static final Block MINING_PIPE_TIP_BLOCK = GT_Utility
-        .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 0));
+    public static final ItemStack MINING_PIPE_STACK = GTModHandler.getIC2Item("miningPipe", 0);
+    public static final Block MINING_PIPE_BLOCK = GTUtility.getBlockFromStack(MINING_PIPE_STACK);
+    public static final Block MINING_PIPE_TIP_BLOCK = GTUtility
+        .getBlockFromStack(GTModHandler.getIC2Item("miningPipeTip", 0));
 
     /** The owner machine pointer */
-    private final GT_IDrillingLogicDelegateOwner owner;
+    private final IDrillingLogicDelegateOwner owner;
 
     /** Is pipe retracting process done and halts? */
     private boolean isRetractDone;
@@ -37,7 +37,7 @@ public class GT_DrillingLogicDelegate {
     /** Cached fake player */
     private FakePlayer mFakePlayer;
 
-    public GT_DrillingLogicDelegate(GT_IDrillingLogicDelegateOwner owner) {
+    public DrillingLogicDelegate(IDrillingLogicDelegateOwner owner) {
         this.owner = owner;
     }
 
@@ -52,7 +52,7 @@ public class GT_DrillingLogicDelegate {
         int yCoord = te.getYCoord();
         int checkY = yCoord + tipDepth - 1;
         boolean isHitsTheVoid = checkY < 0;
-        boolean isHitsBedrock = GT_Utility.getBlockHardnessAt(te.getWorld(), xCoord, checkY, zCoord) < 0;
+        boolean isHitsBedrock = GTUtility.getBlockHardnessAt(te.getWorld(), xCoord, checkY, zCoord) < 0;
         boolean isFakePlayerAllowed = canFakePlayerInteract(te, xCoord, checkY, zCoord);
 
         if (isHitsTheVoid || isHitsBedrock || !isFakePlayerAllowed) {
@@ -60,13 +60,13 @@ public class GT_DrillingLogicDelegate {
             te.disableWorking();
             if (debugBlockMiner) {
                 if (isHitsTheVoid) {
-                    GT_Log.out.println("MINER: Hit bottom");
+                    GTLog.out.println("MINER: Hit bottom");
                 }
                 if (isHitsBedrock) {
-                    GT_Log.out.println("MINER: Hit block with -1 hardness");
+                    GTLog.out.println("MINER: Hit block with -1 hardness");
                 }
                 if (!isFakePlayerAllowed) {
-                    GT_Log.out.println("MINER: Unable to set mining pipe tip");
+                    GTLog.out.println("MINER: Unable to set mining pipe tip");
                 }
             }
             return false;
@@ -158,7 +158,7 @@ public class GT_DrillingLogicDelegate {
 
     /** Minings the block if it is possible. */
     public void mineBlock(IGregTechTileEntity te, Block block, int x, int y, int z) {
-        if (!GT_Utility.eraseBlockByFakePlayer(getFakePlayer(te), x, y, z, true)) {
+        if (!GTUtility.eraseBlockByFakePlayer(getFakePlayer(te), x, y, z, true)) {
             return;
         }
 
@@ -178,11 +178,11 @@ public class GT_DrillingLogicDelegate {
         short metaData = 0;
         TileEntity tTileEntity = owner.getBaseMetaTileEntity()
             .getTileEntity(x, y, z);
-        if (tTileEntity instanceof GT_TileEntity_Ores) {
-            metaData = ((GT_TileEntity_Ores) tTileEntity).mMetaData;
+        if (tTileEntity instanceof TileEntityOres) {
+            metaData = ((TileEntityOres) tTileEntity).mMetaData;
         }
 
-        ItemStack cobble = GT_Utility.getCobbleForOre(block, metaData);
+        ItemStack cobble = GTUtility.getCobbleForOre(block, metaData);
         te.getWorld()
             .setBlock(
                 x,
@@ -222,7 +222,7 @@ public class GT_DrillingLogicDelegate {
      */
     public FakePlayer getFakePlayer(IGregTechTileEntity te) {
         if (mFakePlayer == null) {
-            mFakePlayer = GT_Utility.getFakePlayer(te);
+            mFakePlayer = GTUtility.getFakePlayer(te);
         }
         if (mFakePlayer != null) {
             mFakePlayer.setWorld(te.getWorld());
@@ -232,7 +232,7 @@ public class GT_DrillingLogicDelegate {
     }
 
     public boolean canFakePlayerInteract(IGregTechTileEntity te, int xCoord, int yCoord, int zCoord) {
-        return GT_Utility
+        return GTUtility
             .setBlockByFakePlayer(getFakePlayer(te), xCoord, yCoord, zCoord, MINING_PIPE_TIP_BLOCK, 0, true);
     }
 
diff --git a/src/main/java/gregtech/common/misc/GT_ClientPollutionMap.java b/src/main/java/gregtech/common/misc/GTClientPollutionMap.java
index 6e40e5860c..546f8e8d12 100644
--- a/src/main/java/gregtech/common/misc/GT_ClientPollutionMap.java
+++ b/src/main/java/gregtech/common/misc/GTClientPollutionMap.java
@@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.util.MathHelper;
 
-public class GT_ClientPollutionMap {
+public class GTClientPollutionMap {
 
     private static final byte RADIUS = 24;
     private static final byte DISTANCE_RELOAD_MAP = 5; // When player moved x chunks, shift the map to new center.
@@ -17,7 +17,7 @@ public class GT_ClientPollutionMap {
 
     private static short[][] chunkMatrix; // short because reasons.
 
-    public GT_ClientPollutionMap() {}
+    public GTClientPollutionMap() {}
 
     public void reset() {
         initialized = false;
diff --git a/src/main/java/gregtech/common/misc/GT_Command.java b/src/main/java/gregtech/common/misc/GTCommand.java
index 8e342aa928..f1590ec792 100644
--- a/src/main/java/gregtech/common/misc/GT_Command.java
+++ b/src/main/java/gregtech/common/misc/GTCommand.java
@@ -20,15 +20,15 @@ import net.minecraft.util.EnumChatFormatting;
 import com.gtnewhorizon.structurelib.StructureLib;
 
 import cpw.mods.fml.relauncher.FMLLaunchHandler;
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.objects.GT_ChunkManager;
-import gregtech.api.util.GT_MusicSystem;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Pollution;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
+import gregtech.api.objects.GTChunkManager;
+import gregtech.api.util.GTMusicSystem;
+import gregtech.api.util.GTUtility;
+import gregtech.common.Pollution;
 import gregtech.common.misc.spaceprojects.SpaceProjectManager;
 
-public final class GT_Command extends CommandBase {
+public final class GTCommand extends CommandBase {
 
     @Override
     public String getCommandName() {
@@ -63,7 +63,7 @@ public final class GT_Command extends CommandBase {
             new ChatComponentText(
                 "\"pollution <amount>\" - adds the <amount> of the pollution to the current chunk, "
                     + "\n if <amount> isnt specified, will add"
-                    + GT_Mod.gregtechproxy.mPollutionSmogLimit
+                    + GTMod.gregtechproxy.mPollutionSmogLimit
                     + "gibbl."));
         sender.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + " --- Global wireless EU controls ---"));
         sender.addChatMessage(new ChatComponentText("Allows you to set the amount of EU in a users wireless network."));
@@ -173,7 +173,7 @@ public final class GT_Command extends CommandBase {
                     return;
                 }
                 try {
-                    Field field = GT_Values.class.getDeclaredField(strings[1]);
+                    Field field = GTValues.class.getDeclaredField(strings[1]);
                     if (field.getType() != boolean.class) {
                         sender.addChatMessage(new ChatComponentText("Wrong variable: " + strings[1]));
                         return;
@@ -186,14 +186,14 @@ public final class GT_Command extends CommandBase {
                 }
             }
             case "chunks" -> {
-                GT_ChunkManager.printTickets();
+                GTChunkManager.printTickets();
                 sender.addChatMessage(new ChatComponentText("Forced chunks logged to GregTech.log"));
             }
             case "pollution" -> {
                 ChunkCoordinates coordinates = sender.getPlayerCoordinates();
-                int amount = (strings.length < 2) ? GT_Mod.gregtechproxy.mPollutionSmogLimit
+                int amount = (strings.length < 2) ? GTMod.gregtechproxy.mPollutionSmogLimit
                     : Integer.parseInt(strings[1]);
-                GT_Pollution.addPollution(
+                Pollution.addPollution(
                     sender.getEntityWorld()
                         .getChunkFromBlockCoords(coordinates.posX, coordinates.posZ),
                     amount);
@@ -207,8 +207,7 @@ public final class GT_Command extends CommandBase {
 
                 // Usage is /gt global_energy_add username EU
 
-                String EU_string_formatted = EnumChatFormatting.RED
-                    + GT_Utility.formatNumbers(new BigInteger(EU_String))
+                String EU_string_formatted = EnumChatFormatting.RED + GTUtility.formatNumbers(new BigInteger(EU_String))
                     + EnumChatFormatting.RESET;
 
                 if (addEUToGlobalEnergyMap(uuid, new BigInteger(EU_String))) sender.addChatMessage(
@@ -228,7 +227,7 @@ public final class GT_Command extends CommandBase {
                     new ChatComponentText(
                         formatted_username + " currently has "
                             + EnumChatFormatting.RED
-                            + GT_Utility.formatNumbers(new BigInteger(getUserEU(uuid).toString()))
+                            + GTUtility.formatNumbers(new BigInteger(getUserEU(uuid).toString()))
                             + EnumChatFormatting.RESET
                             + "EU in their network."));
 
@@ -256,7 +255,7 @@ public final class GT_Command extends CommandBase {
                         "Successfully set " + formatted_username
                             + "'s global energy network to "
                             + EnumChatFormatting.RED
-                            + GT_Utility.formatNumbers(new BigInteger(EU_String_0))
+                            + GTUtility.formatNumbers(new BigInteger(EU_String_0))
                             + EnumChatFormatting.RESET
                             + "EU."));
 
@@ -324,7 +323,7 @@ public final class GT_Command extends CommandBase {
                         "User " + formatted_username
                             + " has "
                             + EnumChatFormatting.RED
-                            + GT_Utility.formatNumbers(getUserEU(userUUID))
+                            + GTUtility.formatNumbers(getUserEU(userUUID))
                             + EnumChatFormatting.RESET
                             + "EU in their network."));
                 if (!userUUID.equals(teamUUID)) sender.addChatMessage(
@@ -343,7 +342,7 @@ public final class GT_Command extends CommandBase {
                     sender
                         .addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "This command is client-only."));
                 }
-                GT_MusicSystem.ClientSystem.dumpAllRecordDurations();
+                GTMusicSystem.ClientSystem.dumpAllRecordDurations();
             }
             default -> {
                 sender
diff --git a/src/main/java/gregtech/common/misc/GlobalMetricsCoverDatabase.java b/src/main/java/gregtech/common/misc/GlobalMetricsCoverDatabase.java
index 33e8198bd6..f3efceafeb 100644
--- a/src/main/java/gregtech/common/misc/GlobalMetricsCoverDatabase.java
+++ b/src/main/java/gregtech/common/misc/GlobalMetricsCoverDatabase.java
@@ -37,10 +37,10 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTUtility;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.covers.GT_Cover_Metrics_Transmitter;
+import gregtech.common.covers.CoverMetricsTransmitter;
 import gregtech.common.events.MetricsCoverDataEvent;
 import gregtech.common.events.MetricsCoverHostDeconstructedEvent;
 import gregtech.common.events.MetricsCoverSelfDestructEvent;
@@ -302,15 +302,15 @@ public class GlobalMetricsCoverDatabase extends WorldSavedData {
 
     private static Stream<UUID> getCoverUUIDsFromItemStack(final ItemStack stack) {
         if (stack.hasTagCompound() && stack.getTagCompound()
-            .hasKey(GT_Values.NBT.COVERS, TAG_COMPOUND)) {
+            .hasKey(GTValues.NBT.COVERS, TAG_COMPOUND)) {
             final NBTTagList tagList = stack.getTagCompound()
-                .getTagList(GT_Values.NBT.COVERS, TAG_COMPOUND);
+                .getTagList(GTValues.NBT.COVERS, TAG_COMPOUND);
             return IntStream.range(0, tagList.tagCount())
                 .mapToObj(tagList::getCompoundTagAt)
                 .map(nbt -> new CoverInfo(null, nbt).getCoverData())
                 .filter(
-                    serializableObject -> serializableObject instanceof GT_Cover_Metrics_Transmitter.MetricsTransmitterData)
-                .map(data -> ((GT_Cover_Metrics_Transmitter.MetricsTransmitterData) data).getFrequency());
+                    serializableObject -> serializableObject instanceof CoverMetricsTransmitter.MetricsTransmitterData)
+                .map(data -> ((CoverMetricsTransmitter.MetricsTransmitterData) data).getFrequency());
         }
         return Stream.empty();
     }
@@ -433,9 +433,9 @@ public class GlobalMetricsCoverDatabase extends WorldSavedData {
         public String getLocalizedCoordinates() {
             return StatCollector.translateToLocalFormatted(
                 "gt.db.metrics_cover.coords",
-                GT_Utility.formatNumbers(x),
-                GT_Utility.formatNumbers(y),
-                GT_Utility.formatNumbers(z));
+                GTUtility.formatNumbers(x),
+                GTUtility.formatNumbers(y),
+                GTUtility.formatNumbers(z));
         }
 
         @Override
diff --git a/src/main/java/gregtech/common/misc/GT_IDrillingLogicDelegateOwner.java b/src/main/java/gregtech/common/misc/IDrillingLogicDelegateOwner.java
index 9b10b6fcf0..cd9a5f1621 100644
--- a/src/main/java/gregtech/common/misc/GT_IDrillingLogicDelegateOwner.java
+++ b/src/main/java/gregtech/common/misc/IDrillingLogicDelegateOwner.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 
 /** @author Relvl on 27.01.2022 */
-public interface GT_IDrillingLogicDelegateOwner extends IMetaTileEntity {
+public interface IDrillingLogicDelegateOwner extends IMetaTileEntity {
 
     /** Returns the machine actual tier. */
     int getMachineTier();
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java
index 323b22e20a..a076a05c9a 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java
@@ -12,7 +12,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.tuple.Pair;
 
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.common.misc.spaceprojects.interfaces.ISpaceBody;
 import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject;
 
@@ -187,7 +187,7 @@ public class SpaceProjectManager {
 
     // #region Project Helper methods
 
-    public static class FakeSpaceProjectRecipe extends GT_Recipe {
+    public static class FakeSpaceProjectRecipe extends GTRecipe {
 
         public final String projectName;
 
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SPRequirements.java
index b910b5e344..dc92d8bebf 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SPRequirements.java
@@ -13,7 +13,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject.ISP_Upgrade;
 /**
  * @author BlueWeabo
  */
-public class SP_Requirements implements ISP_Requirements {
+public class SPRequirements implements ISP_Requirements {
 
     // #region Variables
 
@@ -50,22 +50,22 @@ public class SP_Requirements implements ISP_Requirements {
 
     // #region Setters/Builder
 
-    public SP_Requirements setSpaceBodyType(SpaceBodyType spaceBodyType) {
+    public SPRequirements setSpaceBodyType(SpaceBodyType spaceBodyType) {
         spaceBody = spaceBodyType;
         return this;
     }
 
-    public SP_Requirements setStarType(StarType starType) {
+    public SPRequirements setStarType(StarType starType) {
         star = starType;
         return this;
     }
 
-    public SP_Requirements setUpgrades(ISP_Upgrade... requirementUpgrades) {
+    public SPRequirements setUpgrades(ISP_Upgrade... requirementUpgrades) {
         upgrades.addAll(Arrays.asList(requirementUpgrades));
         return this;
     }
 
-    public SP_Requirements setSpaceProjects(ISpaceProject... requirementProjects) {
+    public SPRequirements setSpaceProjects(ISpaceProject... requirementProjects) {
         spaceProjects.addAll(Arrays.asList(requirementProjects));
         return this;
     }
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SPUpgrade.java
index 835a57f277..b07ff7905a 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SPUpgrade.java
@@ -15,7 +15,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject.ISP_Upgrade;
 /**
  * @author BlueWeabo
  */
-public class SP_Upgrade implements ISP_Upgrade {
+public class SPUpgrade implements ISP_Upgrade {
 
     // #region Variables
 
@@ -27,7 +27,7 @@ public class SP_Upgrade implements ISP_Upgrade {
     protected int currentStage;
     protected int buildTime;
     protected long voltage;
-    protected SP_Requirements requirements;
+    protected SPRequirements requirements;
     protected ISpaceProject projectBelongingTo;
 
     // #endregion
@@ -219,7 +219,7 @@ public class SP_Upgrade implements ISP_Upgrade {
     }
 
     @Override
-    public SP_Requirements getUpgradeRequirements() {
+    public SPRequirements getUpgradeRequirements() {
         return requirements;
     }
 
@@ -232,44 +232,44 @@ public class SP_Upgrade implements ISP_Upgrade {
 
     // #region Setter/Builder
 
-    public SP_Upgrade() {}
+    public SPUpgrade() {}
 
-    public SP_Upgrade setUpgradeName(String upgradeName) {
+    public SPUpgrade setUpgradeName(String upgradeName) {
         name = upgradeName;
         return this;
     }
 
-    public SP_Upgrade setUpgradeUnlocalizedName(String upgradeUnlocalizedName) {
+    public SPUpgrade setUpgradeUnlocalizedName(String upgradeUnlocalizedName) {
         unlocalizedName = upgradeUnlocalizedName;
         return this;
     }
 
-    public SP_Upgrade setUpgradeItemsCost(ItemStack... upgradeItemsCost) {
+    public SPUpgrade setUpgradeItemsCost(ItemStack... upgradeItemsCost) {
         itemsCost = upgradeItemsCost;
         return this;
     }
 
-    public SP_Upgrade setUpgradeFluidsCost(FluidStack... upgradeFluidsCost) {
+    public SPUpgrade setUpgradeFluidsCost(FluidStack... upgradeFluidsCost) {
         fluidsCost = upgradeFluidsCost;
         return this;
     }
 
-    public SP_Upgrade setUpgradeRequirements(SP_Requirements upgradeRequirements) {
+    public SPUpgrade setUpgradeRequirements(SPRequirements upgradeRequirements) {
         requirements = upgradeRequirements;
         return this;
     }
 
-    public SP_Upgrade setUpgradeTotalStages(int upgradeTotalStages) {
+    public SPUpgrade setUpgradeTotalStages(int upgradeTotalStages) {
         totalStages = upgradeTotalStages;
         return this;
     }
 
-    public SP_Upgrade setUpgradeBuildTime(int upgradeBuildTime) {
+    public SPUpgrade setUpgradeBuildTime(int upgradeBuildTime) {
         buildTime = upgradeBuildTime;
         return this;
     }
 
-    public SP_Upgrade setUpgradeVoltage(long upgradeVoltage) {
+    public SPUpgrade setUpgradeVoltage(long upgradeVoltage) {
         voltage = upgradeVoltage;
         return this;
     }
@@ -333,8 +333,8 @@ public class SP_Upgrade implements ISP_Upgrade {
     }
 
     @Override
-    public SP_Upgrade copy() {
-        return new SP_Upgrade().setUpgradeName(name)
+    public SPUpgrade copy() {
+        return new SPUpgrade().setUpgradeName(name)
             .setUpgradeUnlocalizedName(unlocalizedName)
             .setUpgradeBuildTime(buildTime)
             .setUpgradeFluidsCost(fluidsCost)
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java
index 201b7c27a9..d682dd6c01 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java
@@ -378,7 +378,7 @@ public class SpaceProject implements ISpaceProject {
             .setProjectTexture(texture)
             .setProjectRequirements(requirements);
         if (upgradesAvailable != null) {
-            ISP_Upgrade[] upgrades = new SP_Upgrade[upgradesAvailable.size()];
+            ISP_Upgrade[] upgrades = new SPUpgrade[upgradesAvailable.size()];
             int index = 0;
             for (ISP_Upgrade upgrade : upgradesAvailable.values()) {
                 upgrades[index++] = upgrade.copy();
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPCommand.java
index 3c4ad00932..39332818fe 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPCommand.java
@@ -17,13 +17,13 @@ import net.minecraft.util.EnumChatFormatting;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.common.misc.spaceprojects.SpaceProjectManager;
 
 /**
  * @author BlueWeabo
  */
-public class SP_Command extends CommandBase {
+public class SPCommand extends CommandBase {
 
     private static final Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections
         .newSetFromMap(new WeakHashMap<>());
@@ -82,7 +82,7 @@ public class SP_Command extends CommandBase {
             + EnumChatFormatting.GOLD
             + " /sp accept "
             + teamLeader.getCommandSenderName();
-        GT_Utility.sendChatToPlayer(teamMember, message);
+        GTUtility.sendChatToPlayer(teamMember, message);
     }
 
     private void processAccept(ICommandSender sender, String playerInviter) {
@@ -93,7 +93,7 @@ public class SP_Command extends CommandBase {
                 + EnumChatFormatting.RESET
                 + " has accepted the invite.";
             SpaceProjectManager.putInTeam(teamMember.getUniqueID(), teamLeader.getUniqueID());
-            GT_Utility.sendChatToPlayer(teamLeader, message);
+            GTUtility.sendChatToPlayer(teamLeader, message);
             invite.remove(Pair.of(teamMember, teamLeader));
         }
     }
@@ -105,7 +105,7 @@ public class SP_Command extends CommandBase {
             + "/sp confirm"
             + EnumChatFormatting.RESET
             + " to confirm this. This does nothing if you are the team leader.";
-        GT_Utility.sendChatToPlayer(player, message);
+        GTUtility.sendChatToPlayer(player, message);
         confirm.add(player);
     }
 
@@ -114,7 +114,7 @@ public class SP_Command extends CommandBase {
         if (confirm.contains(player)) {
             String message = "Successfully left the team.";
             SpaceProjectManager.putInTeam(player.getUniqueID(), player.getUniqueID());
-            GT_Utility.sendChatToPlayer(player, message);
+            GTUtility.sendChatToPlayer(player, message);
             confirm.remove(player);
         }
     }
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPMCommand.java
index 896c7e1052..8379162f84 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPMCommand.java
@@ -20,7 +20,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject;
 /**
  * @author BlueWeabo
  */
-public class SPM_Command extends CommandBase {
+public class SPMCommand extends CommandBase {
 
     private static final String RESET = "reset";
     private static final String UNLOCK = "unlock";
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProject_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProjectCommand.java
index 2f36175069..bd1408d80e 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProject_Command.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProjectCommand.java
@@ -1,6 +1,6 @@
 package gregtech.common.misc.spaceprojects.commands;
 
-public class SpaceProject_Command extends SP_Command {
+public class SpaceProjectCommand extends SPCommand {
 
     @Override
     public String getCommandName() {
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java b/src/main/java/gregtech/common/redstonecircuits/CircuitBasicLogic.java
index 34093a95de..ce430f9b7e 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java
+++ b/src/main/java/gregtech/common/redstonecircuits/CircuitBasicLogic.java
@@ -1,11 +1,11 @@
 package gregtech.common.redstonecircuits;
 
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
-import gregtech.api.util.GT_CircuitryBehavior;
+import gregtech.api.util.CircuitryBehavior;
 
-public class GT_Circuit_BasicLogic extends GT_CircuitryBehavior {
+public class CircuitBasicLogic extends CircuitryBehavior {
 
-    public GT_Circuit_BasicLogic(int aIndex) {
+    public CircuitBasicLogic(int aIndex) {
         super(aIndex);
     }
 
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java b/src/main/java/gregtech/common/redstonecircuits/CircuitBitAnd.java
index f5f83a7e10..fbdf5b1ee9 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java
+++ b/src/main/java/gregtech/common/redstonecircuits/CircuitBitAnd.java
@@ -1,11 +1,11 @@
 package gregtech.common.redstonecircuits;
 
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
-import gregtech.api.util.GT_CircuitryBehavior;
+import gregtech.api.util.CircuitryBehavior;
 
-public class GT_Circuit_BitAnd extends GT_CircuitryBehavior {
+public class CircuitBitAnd extends CircuitryBehavior {
 
-    public GT_Circuit_BitAnd(int aIndex) {
+    public CircuitBitAnd(int aIndex) {
         super(aIndex);
     }
 
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_CombinationLock.java b/src/main/java/gregtech/common/redstonecircuits/CircuitCombinationLock.java
index 67d8527606..8058d2b398 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_CombinationLock.java
+++ b/src/main/java/gregtech/common/redstonecircuits/CircuitCombinationLock.java
@@ -1,11 +1,11 @@
 package gregtech.common.redstonecircuits;
 
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
-import gregtech.api.util.GT_CircuitryBehavior;
+import gregtech.api.util.CircuitryBehavior;
 
-public class GT_Circuit_CombinationLock extends GT_CircuitryBehavior {
+public class CircuitCombinationLock extends CircuitryBehavior {
 
-    public GT_Circuit_CombinationLock(int aIndex) {
+    public CircuitCombinationLock(int aIndex) {
         super(aIndex);
     }
 
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java b/src/main/java/gregtech/common/redstonecircuits/CircuitEquals.java
index 9e9af183e8..19fb9089bc 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
+++ b/src/main/java/gregtech/common/redstonecircuits/CircuitEquals.java
@@ -1,11 +1,11 @@
 package gregtech.common.redstonecircuits;
 
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
-import gregtech.api.util.GT_CircuitryBehavior;
+import gregtech.api.util.CircuitryBehavior;
 
-public class GT_Circuit_Equals extends GT_CircuitryBehavior {
+public class CircuitEquals extends CircuitryBehavior {
 
-    public GT_Circuit_Equals(int aIndex) {
+    public CircuitEquals(int aIndex) {
         super(aIndex);
     }
 
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java b/src/main/java/gregtech/common/redstonecircuits/CircuitPulser.java
index c54d0be060..9d1bb1684e 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java
+++ b/src/main/java/gregtech/common/redstonecircuits/CircuitPulser.java
@@ -1,11 +1,11 @@
 package gregtech.common.redstonecircuits;
 
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
-import gregtech.api.util.GT_CircuitryBehavior;
+import gregtech.api.util.CircuitryBehavior;
 
-public class GT_Circuit_Pulser extends GT_CircuitryBehavior {
+public class CircuitPulser extends CircuitryBehavior {
 
-    public GT_Circuit_Pulser(int aIndex) {
+    public CircuitPulser(int aIndex) {
         super(aIndex);
     }
 
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java b/src/main/java/gregtech/common/redstonecircuits/CircuitRandomizer.java
index 336bf9928d..986a6e858e 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java
+++ b/src/main/java/gregtech/common/redstonecircuits/CircuitRandomizer.java
@@ -1,11 +1,11 @@
 package gregtech.common.redstonecircuits;
 
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
-import gregtech.api.util.GT_CircuitryBehavior;
+import gregtech.api.util.CircuitryBehavior;
 
-public class GT_Circuit_Randomizer extends GT_CircuitryBehavior {
+public class CircuitRandomizer extends CircuitryBehavior {
 
-    public GT_Circuit_Randomizer(int aIndex) {
+    public CircuitRandomizer(int aIndex) {
         super(aIndex);
     }
 
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java b/src/main/java/gregtech/common/redstonecircuits/CircuitRedstoneMeter.java
index 4db261fcf0..2a0172c85a 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java
+++ b/src/main/java/gregtech/common/redstonecircuits/CircuitRedstoneMeter.java
@@ -1,11 +1,11 @@
 package gregtech.common.redstonecircuits;
 
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
-import gregtech.api.util.GT_CircuitryBehavior;
+import gregtech.api.util.CircuitryBehavior;
 
-public class GT_Circuit_RedstoneMeter extends GT_CircuitryBehavior {
+public class CircuitRedstoneMeter extends CircuitryBehavior {
 
-    public GT_Circuit_RedstoneMeter(int aIndex) {
+    public CircuitRedstoneMeter(int aIndex) {
         super(aIndex);
     }
 
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Repeater.java b/src/main/java/gregtech/common/redstonecircuits/CircuitRepeater.java
index b96762d73b..b7b28d0371 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Repeater.java
+++ b/src/main/java/gregtech/common/redstonecircuits/CircuitRepeater.java
@@ -1,11 +1,11 @@
 package gregtech.common.redstonecircuits;
 
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
-import gregtech.api.util.GT_CircuitryBehavior;
+import gregtech.api.util.CircuitryBehavior;
 
-public class GT_Circuit_Repeater extends GT_CircuitryBehavior {
+public class CircuitRepeater extends CircuitryBehavior {
 
-    public GT_Circuit_Repeater(int aIndex) {
+    public CircuitRepeater(int aIndex) {
         super(aIndex);
     }
 
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java b/src/main/java/gregtech/common/redstonecircuits/CircuitTimer.java
index 026c83dfbc..ae96d35069 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
+++ b/src/main/java/gregtech/common/redstonecircuits/CircuitTimer.java
@@ -1,11 +1,11 @@
 package gregtech.common.redstonecircuits;
 
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
-import gregtech.api.util.GT_CircuitryBehavior;
+import gregtech.api.util.CircuitryBehavior;
 
-public class GT_Circuit_Timer extends GT_CircuitryBehavior {
+public class CircuitTimer extends CircuitryBehavior {
 
-    public GT_Circuit_Timer(int aIndex) {
+    public CircuitTimer(int aIndex) {
         super(aIndex);
     }
 
diff --git a/src/main/java/gregtech/common/render/GT_RenderDrone.java b/src/main/java/gregtech/common/render/DroneRender.java
index af1336a219..02445b6dc6 100644
--- a/src/main/java/gregtech/common/render/GT_RenderDrone.java
+++ b/src/main/java/gregtech/common/render/DroneRender.java
@@ -14,22 +14,22 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.common.tileentities.render.TileDrone;
+import gregtech.common.tileentities.render.TileEntityDrone;
 
 @SideOnly(Side.CLIENT)
-public class GT_RenderDrone extends TileEntitySpecialRenderer {
+public class DroneRender extends TileEntitySpecialRenderer {
 
     private static final ResourceLocation DroneTexture = new ResourceLocation(GregTech.ID, "textures/model/drone.png");
     private static final IModelCustom Drone = AdvancedModelLoader
         .loadModel(new ResourceLocation(GregTech.ID, "textures/model/drone.obj"));
 
-    public GT_RenderDrone() {
-        ClientRegistry.bindTileEntitySpecialRenderer(TileDrone.class, this);
+    public DroneRender() {
+        ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDrone.class, this);
     }
 
     @Override
     public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float timeSinceLastTick) {
-        if (!(tile instanceof TileDrone drone)) return;
+        if (!(tile instanceof TileEntityDrone drone)) return;
         final float size = 1.0f;
         GL11.glPushMatrix();
         GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
@@ -53,7 +53,7 @@ public class GT_RenderDrone extends TileEntitySpecialRenderer {
         GL11.glEnable(GL11.GL_LIGHTING);
     }
 
-    private void renderBlade(TileDrone drone, double size) {
+    private void renderBlade(TileEntityDrone drone, double size) {
         GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glDisable(GL11.GL_CULL_FACE);
         GL11.glEnable(GL11.GL_BLEND);
diff --git a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java b/src/main/java/gregtech/common/render/FlaskRenderer.java
index addcb1cf70..f7d2e96ca1 100644
--- a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java
+++ b/src/main/java/gregtech/common/render/FlaskRenderer.java
@@ -14,12 +14,12 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
-import gregtech.common.items.GT_VolumetricFlask;
+import gregtech.common.items.ItemVolumetricFlask;
 
 @SideOnly(Side.CLIENT)
-public final class GT_FlaskRenderer implements IItemRenderer {
+public final class FlaskRenderer implements IItemRenderer {
 
-    public GT_FlaskRenderer() {
+    public FlaskRenderer() {
         MinecraftForgeClient.registerItemRenderer(ItemList.VOLUMETRIC_FLASK.getItem(), this);
     }
 
@@ -36,11 +36,11 @@ public final class GT_FlaskRenderer implements IItemRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        GT_VolumetricFlask cell = (GT_VolumetricFlask) item.getItem();
+        ItemVolumetricFlask cell = (ItemVolumetricFlask) item.getItem();
         IIcon icon = item.getIconIndex();
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glEnable(GL11.GL_ALPHA_TEST);
-        GT_RenderUtil.applyStandardItemTransform(type);
+        GTRenderUtil.applyStandardItemTransform(type);
 
         FluidStack fs = cell != null ? cell.getFluid(item) : null;
         if (fs != null) {
@@ -51,20 +51,20 @@ public final class GT_FlaskRenderer implements IItemRenderer {
 
             Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
             GL11.glBlendFunc(GL11.GL_ZERO, GL11.GL_ONE);
-            GT_RenderUtil.renderItem(type, iconWindow);
+            GTRenderUtil.renderItem(type, iconWindow);
 
             Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
             GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
             GL11.glDepthFunc(GL11.GL_EQUAL);
             GL11.glColor3ub((byte) (fluidColor >> 16), (byte) (fluidColor >> 8), (byte) fluidColor);
-            GT_RenderUtil.renderItem(type, fluidIcon);
+            GTRenderUtil.renderItem(type, fluidIcon);
             GL11.glColor3ub((byte) -1, (byte) -1, (byte) -1);
             GL11.glDepthFunc(GL11.GL_LEQUAL);
         }
 
         Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GT_RenderUtil.renderItem(type, icon);
+        GTRenderUtil.renderItem(type, icon);
         GL11.glDisable(GL11.GL_ALPHA_TEST);
         GL11.glDisable(GL11.GL_BLEND);
     }
diff --git a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java b/src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java
index 9a35f6bc57..80e2cbe6a6 100644
--- a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
+++ b/src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java
@@ -16,12 +16,12 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
-import gregtech.common.items.GT_FluidDisplayItem;
+import gregtech.common.items.ItemFluidDisplay;
 
 @SideOnly(Side.CLIENT)
-public class GT_FluidDisplayStackRenderer implements IItemRenderer {
+public class FluidDisplayStackRenderer implements IItemRenderer {
 
-    public GT_FluidDisplayStackRenderer() {
+    public FluidDisplayStackRenderer() {
         MinecraftForgeClient.registerItemRenderer(ItemList.Display_Fluid.getItem(), this);
     }
 
@@ -39,7 +39,7 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        if (item == null || item.getItem() == null || !(item.getItem() instanceof GT_FluidDisplayItem)) return;
+        if (item == null || item.getItem() == null || !(item.getItem() instanceof ItemFluidDisplay)) return;
 
         OpenGlHelper.glBlendFunc(770, 771, 1, 0);
         GL11.glEnable(GL11.GL_BLEND);
diff --git a/src/main/java/gregtech/common/render/GT_CapeRenderer.java b/src/main/java/gregtech/common/render/GTCapeRenderer.java
index ec9ef2880c..ea8e0a37cd 100644
--- a/src/main/java/gregtech/common/render/GT_CapeRenderer.java
+++ b/src/main/java/gregtech/common/render/GTCapeRenderer.java
@@ -13,11 +13,11 @@ import net.minecraftforge.client.event.RenderPlayerEvent;
 
 import org.lwjgl.opengl.GL11;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 
-public class GT_CapeRenderer extends RenderPlayer {
+public class GTCapeRenderer extends RenderPlayer {
 
     private final ResourceLocation[] mCapes = { new ResourceLocation("gregtech:textures/BrainTechCape.png"),
         new ResourceLocation("gregtech:textures/GregTechCape.png"),
@@ -29,14 +29,14 @@ public class GT_CapeRenderer extends RenderPlayer {
         new ResourceLocation("gregtech:textures/Stargate.png") };
     private final Collection<String> mCapeList;
 
-    public GT_CapeRenderer(Collection<String> aCapeList) {
+    public GTCapeRenderer(Collection<String> aCapeList) {
         this.mCapeList = aCapeList;
         setRenderManager(RenderManager.instance);
     }
 
     public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) {
         AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer;
-        if (GT_Utility.getFullInvisibility(aPlayer)) {
+        if (GTUtility.getFullInvisibility(aPlayer)) {
             aEvent.setCanceled(true);
             return;
         }
@@ -44,7 +44,7 @@ public class GT_CapeRenderer extends RenderPlayer {
         if (aPlayer.isInvisible()) {
             return;
         }
-        if (GT_Utility.getPotion(aPlayer, Potion.invisibility.id)) {
+        if (GTUtility.getPotion(aPlayer, Potion.invisibility.id)) {
             return;
         }
         try {
@@ -140,8 +140,8 @@ public class GT_CapeRenderer extends RenderPlayer {
                 GL11.glPopMatrix();
             }
         } catch (Throwable e) {
-            if (GT_Values.D1) {
-                e.printStackTrace(GT_Log.err);
+            if (GTValues.D1) {
+                e.printStackTrace(GTLog.err);
             }
         }
     }
diff --git a/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java
index 937c1a994f..ab4282c7ba 100644
--- a/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java
+++ b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java
@@ -9,12 +9,12 @@ import gregtech.api.interfaces.IBlockContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.util.LightingHelper;
 
-public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, IBlockContainer {
+public class GTCopiedBlockTextureRender extends GTTextureBase implements ITexture, IBlockContainer {
 
     private final Block mBlock;
     private final byte mSide, mMeta;
 
-    protected GT_CopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) {
+    protected GTCopiedBlockTextureRender(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) {
         if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedBlockTexture");
         mBlock = aBlock;
         mSide = (byte) ordinalSide;
diff --git a/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java
index 17fa9ac8ff..d3f6292435 100644
--- a/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java
+++ b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java
@@ -7,15 +7,15 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.IBlockContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.util.GT_RenderingWorld;
+import gregtech.api.util.GTRenderingWorld;
 import gregtech.api.util.LightingHelper;
 
-class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBlockContainer {
+class GTCopiedCTMBlockTexture extends GTTextureBase implements ITexture, IBlockContainer {
 
     private final Block mBlock;
     private final byte mSide, mMeta;
 
-    GT_CopiedCTMBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) {
+    GTCopiedCTMBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) {
         if (aRGBa.length != 4)
             throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedCTMBlockTexture");
         mBlock = aBlock;
@@ -33,8 +33,8 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc
         return mBlock.getIcon(getBlockAccess(aRenderer), aX, aY, aZ, tSide);
     }
 
-    private GT_RenderingWorld getBlockAccess(RenderBlocks aRenderer) {
-        return GT_RenderingWorld.getInstance(aRenderer.blockAccess);
+    private GTRenderingWorld getBlockAccess(RenderBlocks aRenderer) {
+        return GTRenderingWorld.getInstance(aRenderer.blockAccess);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/render/GT_IconFlipped.java b/src/main/java/gregtech/common/render/GTIconFlipped.java
index 8258e74ffa..261e5e63b2 100644
--- a/src/main/java/gregtech/common/render/GT_IconFlipped.java
+++ b/src/main/java/gregtech/common/render/GTIconFlipped.java
@@ -6,13 +6,13 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
-public class GT_IconFlipped implements IIcon {
+public class GTIconFlipped implements IIcon {
 
     private final IIcon baseIcon;
     private final boolean flipU;
     private final boolean flipV;
 
-    public GT_IconFlipped(IIcon baseIcon, boolean flipU, boolean flipV) {
+    public GTIconFlipped(IIcon baseIcon, boolean flipU, boolean flipV) {
         this.baseIcon = baseIcon;
         this.flipU = flipU;
         this.flipV = flipV;
diff --git a/src/main/java/gregtech/common/render/GT_MultiTexture.java b/src/main/java/gregtech/common/render/GTMultiTextureRender.java
index d3cff271cb..1eaf4c69e3 100644
--- a/src/main/java/gregtech/common/render/GT_MultiTexture.java
+++ b/src/main/java/gregtech/common/render/GTMultiTextureRender.java
@@ -3,7 +3,7 @@ package gregtech.common.render;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.ITexture;
 
 /**
@@ -14,15 +14,15 @@ import gregtech.api.interfaces.ITexture;
  * I should have done this much earlier...
  * </p>
  */
-public class GT_MultiTexture extends GT_TextureBase implements ITexture {
+public class GTMultiTextureRender extends GTTextureBase implements ITexture {
 
     protected final ITexture[] mTextures;
 
-    public static GT_MultiTexture get(ITexture... aTextures) {
-        return GT_Mod.instance.isClientSide() ? new GT_MultiTexture(aTextures) : null;
+    public static GTMultiTextureRender get(ITexture... aTextures) {
+        return GTMod.instance.isClientSide() ? new GTMultiTextureRender(aTextures) : null;
     }
 
-    protected GT_MultiTexture(ITexture... aTextures) {
+    protected GTMultiTextureRender(ITexture... aTextures) {
         mTextures = aTextures;
     }
 
diff --git a/src/main/java/gregtech/common/render/GT_RenderUtil.java b/src/main/java/gregtech/common/render/GTRenderUtil.java
index 68195513fe..650d827cff 100644
--- a/src/main/java/gregtech/common/render/GT_RenderUtil.java
+++ b/src/main/java/gregtech/common/render/GTRenderUtil.java
@@ -16,7 +16,7 @@ import org.lwjgl.opengl.GL11;
 
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
 
-public class GT_RenderUtil {
+public class GTRenderUtil {
 
     public static void colorGTItem(ItemStack aStack) {
         if (aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem) {
diff --git a/src/main/java/gregtech/common/render/GT_RenderedTexture.java b/src/main/java/gregtech/common/render/GTRenderedTexture.java
index afaf3b290c..3bd4e6d864 100644
--- a/src/main/java/gregtech/common/render/GT_RenderedTexture.java
+++ b/src/main/java/gregtech/common/render/GTRenderedTexture.java
@@ -18,7 +18,7 @@ import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
 import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
 import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.IColorModulationContainer;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
@@ -26,7 +26,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.LightingHelper;
 
-public class GT_RenderedTexture extends GT_TextureBase implements ITexture, IColorModulationContainer {
+public class GTRenderedTexture extends GTTextureBase implements ITexture, IColorModulationContainer {
 
     protected final IIconContainer mIconContainer;
     private final short[] mRGBa;
@@ -34,7 +34,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
     private final boolean stdOrient;
     private final boolean useExtFacing;
 
-    protected GT_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow,
+    protected GTRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow,
         boolean stdOrient, boolean extFacing) {
         if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture");
         mIconContainer = aIcon;
@@ -55,7 +55,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -81,7 +81,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -107,7 +107,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -133,7 +133,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -159,7 +159,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -185,7 +185,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -234,9 +234,9 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped() ^ !stdOrient, aFlip.isVerticallyFliped())
-                : new GT_IconFlipped(icon, !stdOrient, false));
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped() ^ !stdOrient, aFlip.isVerticallyFliped())
+                : new GTIconFlipped(icon, !stdOrient, false));
         aRenderer.uvRotateBottom = 0;
     }
 
@@ -259,8 +259,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
                 : icon);
         aRenderer.uvRotateTop = 0;
     }
@@ -285,8 +285,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
                 : icon);
         aRenderer.uvRotateEast = 0;
         aRenderer.field_152631_f = false;
@@ -311,8 +311,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
                 : icon);
         aRenderer.uvRotateWest = 0;
     }
@@ -336,8 +336,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
                 : icon);
         aRenderer.uvRotateNorth = 0;
     }
@@ -362,8 +362,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
                 : icon);
         aRenderer.uvRotateSouth = 0;
         aRenderer.field_152631_f = false;
@@ -371,7 +371,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
 
     private ExtendedFacing getExtendedFacing(int x, int y, int z) {
         if (stdOrient) return ExtendedFacing.DEFAULT;
-        final EntityPlayer player = GT_Mod.gregtechproxy.getThePlayer();
+        final EntityPlayer player = GTMod.gregtechproxy.getThePlayer();
         if (player == null) return ExtendedFacing.DEFAULT;
         final World w = player.getEntityWorld();
         if (w == null) return ExtendedFacing.DEFAULT;
diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Block.java b/src/main/java/gregtech/common/render/GTRendererBlock.java
index aa61cc125e..1c8e2da29d 100644
--- a/src/main/java/gregtech/common/render/GT_Renderer_Block.java
+++ b/src/main/java/gregtech/common/render/GTRendererBlock.java
@@ -1,11 +1,11 @@
 package gregtech.common.render;
 
-import static gregtech.api.enums.GT_Values.SIDE_DOWN;
-import static gregtech.api.enums.GT_Values.SIDE_EAST;
-import static gregtech.api.enums.GT_Values.SIDE_NORTH;
-import static gregtech.api.enums.GT_Values.SIDE_SOUTH;
-import static gregtech.api.enums.GT_Values.SIDE_UP;
-import static gregtech.api.enums.GT_Values.SIDE_WEST;
+import static gregtech.api.enums.GTValues.SIDE_DOWN;
+import static gregtech.api.enums.GTValues.SIDE_EAST;
+import static gregtech.api.enums.GTValues.SIDE_NORTH;
+import static gregtech.api.enums.GTValues.SIDE_SOUTH;
+import static gregtech.api.enums.GTValues.SIDE_UP;
+import static gregtech.api.enums.GTValues.SIDE_WEST;
 import static gregtech.api.interfaces.metatileentity.IConnectable.CONNECTED_DOWN;
 import static gregtech.api.interfaces.metatileentity.IConnectable.CONNECTED_EAST;
 import static gregtech.api.interfaces.metatileentity.IConnectable.CONNECTED_NORTH;
@@ -42,8 +42,8 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IAllSidedTexturedTileEntity;
@@ -52,13 +52,13 @@ import gregtech.api.interfaces.tileentity.IPipeRenderedTileEntity;
 import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.objects.XSTR;
-import gregtech.common.blocks.GT_Block_FrameBox;
-import gregtech.common.blocks.GT_Block_Machines;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.common.blocks.BlockFrameBox;
+import gregtech.common.blocks.BlockMachines;
+import gregtech.common.blocks.BlockOresAbstract;
+import gregtech.common.blocks.TileEntityOres;
 
 @ThreadSafeISBRH(perThread = true)
-public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
+public class GTRendererBlock implements ISimpleBlockRenderingHandler {
 
     public static final float blockMin = 0.0F;
     public static final float blockMax = 1.0F;
@@ -67,12 +67,12 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
     private static final float coverInnerMax = blockMax - coverThickness;
 
     @Deprecated
-    public static GT_Renderer_Block INSTANCE;
+    public static GTRendererBlock INSTANCE;
     public static int mRenderID;
 
     public static void register() {
         mRenderID = RenderingRegistry.getNextAvailableRenderId();
-        INSTANCE = new GT_Renderer_Block();
+        INSTANCE = new GTRendererBlock();
         RenderingRegistry.registerBlockHandler(INSTANCE);
     }
 
@@ -543,7 +543,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
         }
     }
 
-    final GT_TileEntity_Ores tTileEntity = new GT_TileEntity_Ores();
+    final TileEntityOres tTileEntity = new TileEntityOres();
 
     @Override
     public void renderInventoryBlock(Block aBlock, int aMeta, int aModelID, RenderBlocks aRenderer) {
@@ -552,7 +552,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
 
         GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
         GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
-        if (aBlock instanceof GT_Block_Ores_Abstract) {
+        if (aBlock instanceof BlockOresAbstract) {
             tTileEntity.mMetaData = ((short) aMeta);
 
             aBlock.setBlockBoundsForItemRender();
@@ -566,13 +566,13 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
             renderNegativeXFacing(null, aRenderer, aBlock, 0, 0, 0, texture, true);
             renderPositiveXFacing(null, aRenderer, aBlock, 0, 0, 0, texture, true);
             // spotless:on
-        } else if (aMeta > 0 && (aMeta < GregTech_API.METATILEENTITIES.length)
-            && aBlock instanceof GT_Block_Machines
-            && (GregTech_API.METATILEENTITIES[aMeta] != null)
-            && (!GregTech_API.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer))) {
+        } else if (aMeta > 0 && (aMeta < GregTechAPI.METATILEENTITIES.length)
+            && aBlock instanceof BlockMachines
+            && (GregTechAPI.METATILEENTITIES[aMeta] != null)
+            && (!GregTechAPI.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer))) {
                 renderNormalInventoryMetaTileEntity(aBlock, aMeta, aRenderer);
-            } else if (aBlock instanceof GT_Block_FrameBox) {
-                ITexture[] texture = ((GT_Block_FrameBox) aBlock).getTexture(aMeta);
+            } else if (aBlock instanceof BlockFrameBox) {
+                ITexture[] texture = ((BlockFrameBox) aBlock).getTexture(aMeta);
                 aBlock.setBlockBoundsForItemRender();
                 aRenderer.setRenderBoundsFromBlock(aBlock);
                 // spotless:off
@@ -593,10 +593,10 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
     }
 
     private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta, RenderBlocks aRenderer) {
-        if ((aMeta <= 0) || (aMeta >= GregTech_API.METATILEENTITIES.length)) {
+        if ((aMeta <= 0) || (aMeta >= GregTechAPI.METATILEENTITIES.length)) {
             return;
         }
-        final IMetaTileEntity tMetaTileEntity = GregTech_API.METATILEENTITIES[aMeta];
+        final IMetaTileEntity tMetaTileEntity = GregTechAPI.METATILEENTITIES[aMeta];
         if (tMetaTileEntity == null) {
             return;
         }
@@ -724,14 +724,14 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
     @Override
     public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID,
         RenderBlocks aRenderer) {
-        aRenderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion;
+        aRenderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GTMod.gregtechproxy.mRenderTileAmbientOcclusion;
         aRenderer.useInventoryTint = false;
 
         final TileEntity tileEntity = aWorld.getTileEntity(aX, aY, aZ);
 
         // If this block does not have a TE, render it as a normal block.
         // Otherwise, render the TE instead.
-        if (tileEntity == null && aBlock instanceof GT_Block_FrameBox frameBlock) {
+        if (tileEntity == null && aBlock instanceof BlockFrameBox frameBlock) {
             int meta = aWorld.getBlockMetadata(aX, aY, aZ);
             ITexture[] texture = frameBlock.getTexture(meta);
             if (texture == null) return false;
diff --git a/src/main/java/gregtech/common/render/GT_SidedTexture.java b/src/main/java/gregtech/common/render/GTSidedTextureRender.java
index 7a851fd1e7..15885f10ce 100644
--- a/src/main/java/gregtech/common/render/GT_SidedTexture.java
+++ b/src/main/java/gregtech/common/render/GTSidedTextureRender.java
@@ -8,7 +8,7 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.render.TextureFactory;
 
-public class GT_SidedTexture extends GT_TextureBase implements ITexture, IColorModulationContainer {
+public class GTSidedTextureRender extends GTTextureBase implements ITexture, IColorModulationContainer {
 
     protected final ITexture[] mTextures;
     /**
@@ -18,7 +18,7 @@ public class GT_SidedTexture extends GT_TextureBase implements ITexture, IColorM
      */
     private final short[] mRGBa;
 
-    protected GT_SidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2,
+    protected GTSidedTextureRender(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2,
         IIconContainer aIcon3, IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa, boolean aAllowAlpha) {
         if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture");
         mTextures = new ITexture[] { TextureFactory.of(aIcon0, aRGBa, aAllowAlpha),
diff --git a/src/main/java/gregtech/common/render/GT_TextureBase.java b/src/main/java/gregtech/common/render/GTTextureBase.java
index 20188e2e01..08dedf1d6a 100644
--- a/src/main/java/gregtech/common/render/GT_TextureBase.java
+++ b/src/main/java/gregtech/common/render/GTTextureBase.java
@@ -4,15 +4,15 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.util.GT_UtilityClient;
+import gregtech.api.util.GTUtilityClient;
 
-public abstract class GT_TextureBase implements ITexture {
+public abstract class GTTextureBase implements ITexture {
 
     protected boolean isDrawing = false;
 
     @Override
     public void startDrawingQuads(RenderBlocks aRenderer, float aNormalX, float aNormalY, float aNormalZ) {
-        if (aRenderer.useInventoryTint && (!isOldTexture() || !GT_UtilityClient.isDrawing(Tessellator.instance))) {
+        if (aRenderer.useInventoryTint && (!isOldTexture() || !GTUtilityClient.isDrawing(Tessellator.instance))) {
             // Draw if we're not an old texture OR we are an old texture AND we're not already drawing
             isDrawing = true;
             Tessellator.instance.startDrawingQuads();
diff --git a/src/main/java/gregtech/common/render/GT_TextureBuilder.java b/src/main/java/gregtech/common/render/GTTextureBuilder.java
index af8a590fc1..aad734b828 100644
--- a/src/main/java/gregtech/common/render/GT_TextureBuilder.java
+++ b/src/main/java/gregtech/common/render/GTTextureBuilder.java
@@ -7,15 +7,15 @@ import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.ITextureBuilder;
 
 @SuppressWarnings({ "unused", "ClassWithTooManyFields" })
-public class GT_TextureBuilder implements ITextureBuilder {
+public class GTTextureBuilder implements ITextureBuilder {
 
     private final List<IIconContainer> iconContainerList;
     private final List<ITexture> textureLayers;
@@ -29,7 +29,7 @@ public class GT_TextureBuilder implements ITextureBuilder {
     private boolean glow;
     private Boolean worldCoord = null;
 
-    public GT_TextureBuilder() {
+    public GTTextureBuilder() {
         textureLayers = new ArrayList<>();
         iconContainerList = new ArrayList<>();
         rgba = Dyes._NULL.mRGBa;
@@ -113,14 +113,14 @@ public class GT_TextureBuilder implements ITextureBuilder {
     public ITexture build() {
         if (fromBlock != null) {
             if (worldCoord == Boolean.TRUE || worldCoord == null && isCTMBlock(fromBlock, fromMeta))
-                return new GT_CopiedCTMBlockTexture(fromBlock, fromSide.ordinal(), fromMeta, rgba, allowAlpha);
-            else return new GT_CopiedBlockTexture(fromBlock, fromSide.ordinal(), fromMeta, rgba, allowAlpha);
+                return new GTCopiedCTMBlockTexture(fromBlock, fromSide.ordinal(), fromMeta, rgba, allowAlpha);
+            else return new GTCopiedBlockTextureRender(fromBlock, fromSide.ordinal(), fromMeta, rgba, allowAlpha);
         }
         if (worldCoord != null) throw new IllegalStateException("worldCoord without from block");
-        if (!textureLayers.isEmpty()) return new GT_MultiTexture(textureLayers.toArray(new ITexture[0]));
+        if (!textureLayers.isEmpty()) return new GTMultiTextureRender(textureLayers.toArray(new ITexture[0]));
         return switch (iconContainerList.size()) {
-            case 1 -> new GT_RenderedTexture(iconContainerList.get(0), rgba, allowAlpha, glow, stdOrient, extFacing);
-            case 6 -> new GT_SidedTexture(
+            case 1 -> new GTRenderedTexture(iconContainerList.get(0), rgba, allowAlpha, glow, stdOrient, extFacing);
+            case 6 -> new GTSidedTextureRender(
                 iconContainerList.get(ForgeDirection.DOWN.ordinal()),
                 iconContainerList.get(ForgeDirection.UP.ordinal()),
                 iconContainerList.get(ForgeDirection.NORTH.ordinal()),
@@ -134,16 +134,15 @@ public class GT_TextureBuilder implements ITextureBuilder {
     }
 
     private boolean isCTMBlock(Block fromBlock, int fromMeta) {
-        return GT_Mod.gregtechproxy.mCTMBlockCache
-            .computeIfAbsent(fromBlock, (byte) fromMeta, GT_TextureBuilder::apply);
+        return GTMod.gregtechproxy.mCTMBlockCache.computeIfAbsent(fromBlock, (byte) fromMeta, GTTextureBuilder::apply);
     }
 
     private static Boolean apply(Block b, Byte m) {
         Class<?> clazz = b.getClass();
         while (clazz != Block.class) {
             final String className = clazz.getName();
-            if (GT_Values.mCTMDisabledBlock.contains(className)) return false;
-            if (GT_Values.mCTMEnabledBlock.contains(className)) return true;
+            if (GTValues.mCTMDisabledBlock.contains(className)) return false;
+            if (GTValues.mCTMEnabledBlock.contains(className)) return true;
             clazz = clazz.getSuperclass();
         }
         return false;
diff --git a/src/main/java/gregtech/common/render/IRenderedBlock.java b/src/main/java/gregtech/common/render/IRenderedBlock.java
index 16268de750..9b55388770 100644
--- a/src/main/java/gregtech/common/render/IRenderedBlock.java
+++ b/src/main/java/gregtech/common/render/IRenderedBlock.java
@@ -102,12 +102,12 @@ public interface IRenderedBlock {
         @Override
         public boolean renderBlock(Block aBlock, RenderBlocks aRenderer, IBlockAccess aWorld, int aX, int aY, int aZ) {
             aBlock.setBlockBounds(-0.25F, -0.25F, -0.25F, 1.25F, 1.25F, 1.25F);
-            GT_Renderer_Block.renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
-            GT_Renderer_Block.renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
-            GT_Renderer_Block.renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
-            GT_Renderer_Block.renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
-            GT_Renderer_Block.renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
-            GT_Renderer_Block.renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
+            GTRendererBlock.renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
+            GTRendererBlock.renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
+            GTRendererBlock.renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
+            GTRendererBlock.renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
+            GTRendererBlock.renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
+            GTRendererBlock.renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false);
             return true;
         }
     }
diff --git a/src/main/java/gregtech/common/render/GT_LaserRenderer.java b/src/main/java/gregtech/common/render/LaserRenderer.java
index 1c54a5d58b..4afdbcf5ca 100644
--- a/src/main/java/gregtech/common/render/GT_LaserRenderer.java
+++ b/src/main/java/gregtech/common/render/LaserRenderer.java
@@ -8,9 +8,9 @@ import net.minecraft.tileentity.TileEntity;
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
-import gregtech.common.tileentities.render.TileLaser;
+import gregtech.common.tileentities.render.TileEntityLaser;
 
-public class GT_LaserRenderer extends TileEntitySpecialRenderer {
+public class LaserRenderer extends TileEntitySpecialRenderer {
 
     private double zOffset = 0.0;
     private double xOffset = 0.0;
@@ -22,8 +22,8 @@ public class GT_LaserRenderer extends TileEntitySpecialRenderer {
 
     final private float laserSpeed = 0.8F;
 
-    public GT_LaserRenderer() {
-        ClientRegistry.bindTileEntitySpecialRenderer(TileLaser.class, this);
+    public LaserRenderer() {
+        ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaser.class, this);
     }
 
     private void maths(float counter) {
@@ -32,7 +32,8 @@ public class GT_LaserRenderer extends TileEntitySpecialRenderer {
         xOffset = 0.5 + 0.45 * Math.sin(0.5 * Math.PI * tc);
     }
 
-    private void renderFakeLine(TileLaser laser, double x1, double y1, double z1, double x2, double y2, double z2) {
+    private void renderFakeLine(TileEntityLaser laser, double x1, double y1, double z1, double x2, double y2,
+        double z2) {
         Tessellator tessellator = Tessellator.instance;
         tessellator.startDrawingQuads();
         tessellator.setColorRGBA_F(laser.getRed(), laser.getGreen(), laser.getBlue(), lineOpacity);
@@ -50,7 +51,7 @@ public class GT_LaserRenderer extends TileEntitySpecialRenderer {
 
     @Override
     public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float timeSinceLastTick) {
-        final TileLaser ltile = (TileLaser) tile;
+        final TileEntityLaser ltile = (TileEntityLaser) tile;
 
         if (ltile.getShouldRender()) {
             // Push GL state
diff --git a/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java b/src/main/java/gregtech/common/render/MetaGeneratedToolRenderer.java
index 96285a3fc1..0e9650401b 100644
--- a/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java
+++ b/src/main/java/gregtech/common/render/MetaGeneratedToolRenderer.java
@@ -8,17 +8,17 @@ import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer {
+public class MetaGeneratedToolRenderer implements IItemRenderer {
 
-    public GT_MetaGenerated_Tool_Renderer() {
-        for (GT_MetaGenerated_Tool tItem : GT_MetaGenerated_Tool.sInstances.values()) {
+    public MetaGeneratedToolRenderer() {
+        for (MetaGeneratedTool tItem : MetaGeneratedTool.sInstances.values()) {
             if (tItem != null) {
                 MinecraftForgeClient.registerItemRenderer(tItem, this);
             }
@@ -40,9 +40,9 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack stack, Object... data) {
-        GT_MetaGenerated_Tool item = (GT_MetaGenerated_Tool) stack.getItem();
+        MetaGeneratedTool item = (MetaGeneratedTool) stack.getItem();
         GL11.glEnable(GL11.GL_BLEND);
-        GT_RenderUtil.applyStandardItemTransform(type);
+        GTRenderUtil.applyStandardItemTransform(type);
         GL11.glColor3f(1.0F, 1.0F, 1.0F);
 
         IToolStats toolStats = item != null ? item.getToolStats(stack) : null;
@@ -51,11 +51,11 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer {
             renderToolPart(type, stack, toolStats, true);
 
             if ((type == ItemRenderType.INVENTORY)
-                && (GT_MetaGenerated_Tool.getPrimaryMaterial(stack) != Materials._NULL)) {
-                if (GT_Mod.gregtechproxy.mRenderItemDurabilityBar) {
+                && (MetaGeneratedTool.getPrimaryMaterial(stack) != Materials._NULL)) {
+                if (GTMod.gregtechproxy.mRenderItemDurabilityBar) {
                     IIconContainer iconContainer;
-                    long damage = GT_MetaGenerated_Tool.getToolDamage(stack);
-                    long maxDamage = GT_MetaGenerated_Tool.getToolMaxDamage(stack);
+                    long damage = MetaGeneratedTool.getToolDamage(stack);
+                    long maxDamage = MetaGeneratedTool.getToolMaxDamage(stack);
                     if (damage <= 0L) {
                         iconContainer = Textures.ItemIcons.DURABILITY_BAR[8];
                     } else if (damage >= maxDamage) {
@@ -67,7 +67,7 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer {
                     renderIcon(iconContainer);
                 }
 
-                if (GT_Mod.gregtechproxy.mRenderItemChargeBar) {
+                if (GTMod.gregtechproxy.mRenderItemChargeBar) {
                     IIconContainer iconContainer;
                     Long[] stats = item.getElectricStats(stack);
                     if ((stats != null) && (stats[3] < 0L)) {
@@ -97,12 +97,12 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer {
             if (icon != null) {
                 Minecraft.getMinecraft().renderEngine.bindTexture(iconContainer.getTextureFile());
                 GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-                GT_RenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
+                GTRenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
             }
             if (overlay != null) {
                 Minecraft.getMinecraft().renderEngine.bindTexture(iconContainer.getTextureFile());
                 GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-                GT_RenderUtil.renderItemIcon(overlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
+                GTRenderUtil.renderItemIcon(overlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
             }
         }
     }
@@ -117,13 +117,13 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer {
                 GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
                 short[] modulation = toolStats.getRGBa(isToolHead, stack);
                 GL11.glColor3f(modulation[0] / 255.0F, modulation[1] / 255.0F, modulation[2] / 255.0F);
-                GT_RenderUtil.renderItem(type, icon);
+                GTRenderUtil.renderItem(type, icon);
                 GL11.glColor3f(1.0F, 1.0F, 1.0F);
             }
             if (overlay != null) {
                 Minecraft.getMinecraft().renderEngine.bindTexture(iconContainer.getTextureFile());
                 GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-                GT_RenderUtil.renderItem(type, overlay);
+                GTRenderUtil.renderItem(type, overlay);
             }
         }
     }
diff --git a/src/main/java/gregtech/common/render/GT_MultiTile_Renderer.java b/src/main/java/gregtech/common/render/MultiTileRenderer.java
index c8c1d832b0..8dca8c3c33 100644
--- a/src/main/java/gregtech/common/render/GT_MultiTile_Renderer.java
+++ b/src/main/java/gregtech/common/render/MultiTileRenderer.java
@@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.logic.ModelRenderLogic;
 import gregtech.api.logic.interfaces.ModelRenderLogicHost;
@@ -22,12 +22,12 @@ import gregtech.api.multitileentity.MultiTileEntityRegistry;
 import gregtech.api.multitileentity.interfaces.IMultiBlockController;
 import gregtech.api.multitileentity.multiblock.base.MultiBlockPart;
 
-public class GT_MultiTile_Renderer implements ISimpleBlockRenderingHandler {
+public class MultiTileRenderer implements ISimpleBlockRenderingHandler {
 
     private final int renderID;
-    public static GT_MultiTile_Renderer INSTANCE;
+    public static MultiTileRenderer INSTANCE;
 
-    public GT_MultiTile_Renderer() {
+    public MultiTileRenderer() {
         this.renderID = RenderingRegistry.getNextAvailableRenderId();
         INSTANCE = this;
         RenderingRegistry.registerBlockHandler(this);
@@ -76,7 +76,7 @@ public class GT_MultiTile_Renderer implements ISimpleBlockRenderingHandler {
             return false;
         }
 
-        renderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion;
+        renderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GTMod.gregtechproxy.mRenderTileAmbientOcclusion;
         renderer.useInventoryTint = false;
 
         if (entity instanceof ModelRenderLogicHost modelEntity && modelEntity.shouldRenderModel()) {
diff --git a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java b/src/main/java/gregtech/common/render/PollutionRenderer.java
index 476305f1b3..3b97fc820f 100644
--- a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java
+++ b/src/main/java/gregtech/common/render/PollutionRenderer.java
@@ -21,14 +21,14 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
-import gregtech.common.entities.GT_EntityFXPollution;
-import gregtech.common.misc.GT_ClientPollutionMap;
+import gregtech.GTMod;
+import gregtech.common.entities.EntityFXPollution;
+import gregtech.common.misc.GTClientPollutionMap;
 
 @SideOnly(Side.CLIENT)
-public class GT_PollutionRenderer {
+public class PollutionRenderer {
 
-    private static GT_ClientPollutionMap pollutionMap;
+    private static GTClientPollutionMap pollutionMap;
     private static int playerPollution = 0;
 
     private static final boolean DEBUG = false;
@@ -51,8 +51,8 @@ public class GT_PollutionRenderer {
 
     // TODO need to soft update some blocks, grass and leaves does more often than liquid it looks like.
 
-    public GT_PollutionRenderer() {
-        pollutionMap = new GT_ClientPollutionMap();
+    public PollutionRenderer() {
+        pollutionMap = new GTClientPollutionMap();
     }
 
     public void preLoad() {
@@ -130,7 +130,7 @@ public class GT_PollutionRenderer {
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
     public void renderGTPollutionFog(EntityViewRenderEvent.RenderFogEvent event) {
-        if (!GT_Mod.gregtechproxy.mRenderPollutionFog) return;
+        if (!GTMod.gregtechproxy.mRenderPollutionFog) return;
 
         if ((!DEBUG && Minecraft.getMinecraft().thePlayer.capabilities.isCreativeMode)
             || (fogIntensityLastTick < FOG_START_EXP_RATIO)) return;
@@ -147,7 +147,7 @@ public class GT_PollutionRenderer {
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
     public void renderGTPollutionFog(EntityViewRenderEvent.FogDensity event) {
-        if (!GT_Mod.gregtechproxy.mRenderPollutionFog) return;
+        if (!GTMod.gregtechproxy.mRenderPollutionFog) return;
 
         if (!DEBUG && Minecraft.getMinecraft().thePlayer.capabilities.isCreativeMode) return;
 
@@ -203,7 +203,7 @@ public class GT_PollutionRenderer {
     // Adding dirt particles in the air
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void onClientTick(TickEvent.ClientTickEvent event) {
-        if (!GT_Mod.gregtechproxy.mRenderDirtParticles) return;
+        if (!GTMod.gregtechproxy.mRenderDirtParticles) return;
         Minecraft mc = Minecraft.getMinecraft();
         if (mc == null) return;
         EntityClientPlayerMP player = mc.thePlayer;
@@ -230,7 +230,7 @@ public class GT_PollutionRenderer {
             Block block = w.getBlock(i1, j1, k1);
 
             if (block.getMaterial() == Material.air) {
-                EntityFX fx = new GT_EntityFXPollution(
+                EntityFX fx = new EntityFXPollution(
                     w,
                     (float) i1 + w.rand.nextFloat(),
                     (float) j1 + w.rand.nextFloat(),
diff --git a/src/main/java/gregtech/common/render/GT_WormholeRenderer.java b/src/main/java/gregtech/common/render/WormholeRenderer.java
index 43385eb861..c9e2b61fe5 100644
--- a/src/main/java/gregtech/common/render/GT_WormholeRenderer.java
+++ b/src/main/java/gregtech/common/render/WormholeRenderer.java
@@ -1,6 +1,6 @@
 package gregtech.common.render;
 
-import static com.github.technus.tectech.rendering.EOH.EOH_RenderingUtils.addRenderedBlockInWorld;
+import static tectech.rendering.EOH.EOHRenderingUtils.addRenderedBlockInWorld;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.Tessellator;
@@ -12,12 +12,12 @@ import net.minecraft.tileentity.TileEntity;
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
-import gregtech.common.tileentities.render.TileWormhole;
+import gregtech.common.tileentities.render.TileEntityWormhole;
 
-public class GT_WormholeRenderer extends TileEntitySpecialRenderer {
+public class WormholeRenderer extends TileEntitySpecialRenderer {
 
-    public GT_WormholeRenderer() {
-        ClientRegistry.bindTileEntitySpecialRenderer(TileWormhole.class, this);
+    public WormholeRenderer() {
+        ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWormhole.class, this);
     }
 
     private static final double trimPercentage = .95;
@@ -58,7 +58,7 @@ public class GT_WormholeRenderer extends TileEntitySpecialRenderer {
     @Override
     public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float timeSinceLastTick) {
 
-        if (tile instanceof TileWormhole wTile) {
+        if (tile instanceof TileEntityWormhole wTile) {
             GL11.glPushMatrix();
             GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
             GL11.glScaled(wTile.targetRadius, wTile.targetRadius, wTile.targetRadius);
diff --git a/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java b/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java
index acb830de58..eac929d047 100644
--- a/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java
+++ b/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java
@@ -1,6 +1,6 @@
 package gregtech.common.render.items;
 
-import static gregtech.common.render.GT_RenderUtil.colorGTItem;
+import static gregtech.common.render.GTRenderUtil.colorGTItem;
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderItem;
@@ -14,9 +14,9 @@ import org.lwjgl.opengl.GL12;
 import com.gtnewhorizons.modularui.api.math.Pos2d;
 
 import gregtech.api.enums.Textures;
-import gregtech.common.render.GT_RenderUtil;
+import gregtech.common.render.GTRenderUtil;
 
-public class CosmicNeutroniumRenderer extends GT_GeneratedMaterial_Renderer {
+public class CosmicNeutroniumRenderer extends GeneratedMaterialRenderer {
 
     // spotless:off
     private static final Pos2d point0 = new Pos2d(0  - 10, 0  - 10);
@@ -90,10 +90,10 @@ public class CosmicNeutroniumRenderer extends GT_GeneratedMaterial_Renderer {
             colorGTItem(item);
 
             if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) {
-                GT_RenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
+                GTRenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
             } else {
                 GL11.glEnable(GL11.GL_DEPTH_TEST);
-                GT_RenderUtil.renderItem(type, icon);
+                GTRenderUtil.renderItem(type, icon);
             }
             GL11.glPopMatrix();
         }
diff --git a/src/main/java/gregtech/common/render/items/GT_DataStick_Renderer.java b/src/main/java/gregtech/common/render/items/DataStickRenderer.java
index 668b1daa6c..3411c24c83 100644
--- a/src/main/java/gregtech/common/render/items/GT_DataStick_Renderer.java
+++ b/src/main/java/gregtech/common/render/items/DataStickRenderer.java
@@ -9,11 +9,11 @@ import net.minecraftforge.client.IItemRenderer;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 
-import gregtech.api.util.GT_AssemblyLineUtils;
+import gregtech.api.util.AssemblyLineUtils;
 
 // borrow form ae2
 
-public class GT_DataStick_Renderer implements IItemRenderer {
+public class DataStickRenderer implements IItemRenderer {
 
     private final RenderItem ri = new RenderItem();
 
@@ -30,7 +30,7 @@ public class GT_DataStick_Renderer implements IItemRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        final ItemStack is = GT_AssemblyLineUtils.getDataStickOutput(item);
+        final ItemStack is = AssemblyLineUtils.getDataStickOutput(item);
         final Minecraft mc = Minecraft.getMinecraft();
 
         GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT);
diff --git a/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java b/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java
index 08663adf4d..9de4afbef0 100644
--- a/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java
+++ b/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java
@@ -7,21 +7,21 @@ import net.minecraft.util.IIcon;
 
 import org.lwjgl.opengl.GL11;
 
-import gregtech.GT_Mod;
-import gregtech.common.render.GT_RenderUtil;
+import gregtech.GTMod;
+import gregtech.common.render.GTRenderUtil;
 
-public class GaiaSpiritRenderer extends GT_GeneratedMaterial_Renderer {
+public class GaiaSpiritRenderer extends GeneratedMaterialRenderer {
 
     @Override
     protected void renderRegularItem(ItemRenderType type, ItemStack aStack, IIcon icon, boolean shouldModulateColor) {
-        long animationTicks = GT_Mod.gregtechproxy.getAnimationTicks();
-        float partialTicks = GT_Mod.gregtechproxy.getPartialRenderTicks();
+        long animationTicks = GTMod.gregtechproxy.getAnimationTicks();
+        float partialTicks = GTMod.gregtechproxy.getPartialRenderTicks();
 
         if (shouldModulateColor) {
             Color color = Color.getHSBColor((animationTicks % 360 + partialTicks) % 180 / 180f, 0.4f, 0.9f);
             GL11.glColor3f(color.getRed() / 255.0F, color.getGreen() / 255.0F, color.getBlue() / 255.0F);
         }
 
-        GT_RenderUtil.renderItem(type, icon);
+        GTRenderUtil.renderItem(type, icon);
     }
 }
diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java b/src/main/java/gregtech/common/render/items/GeneratedItemRenderer.java
index 84045446c2..880e4b11c9 100644
--- a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java
+++ b/src/main/java/gregtech/common/render/items/GeneratedItemRenderer.java
@@ -26,12 +26,12 @@ import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-import gregtech.api.items.GT_MetaGenerated_Item;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.GT_RenderUtil;
+import gregtech.api.items.MetaGeneratedItem;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.GTRenderUtil;
 import gregtech.loaders.ExtraIcons;
 
-public class GT_GeneratedItem_Renderer implements IItemRenderer {
+public class GeneratedItemRenderer implements IItemRenderer {
 
     @Override
     public boolean handleRenderType(ItemStack item, ItemRenderType type) {
@@ -49,7 +49,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
     @Override
     public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) {
         short aMetaData = (short) aStack.getItemDamage();
-        if (!(aStack.getItem() instanceof GT_MetaGenerated_Item aItem)) return;
+        if (!(aStack.getItem() instanceof MetaGeneratedItem aItem)) return;
 
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glColor3f(1.0F, 1.0F, 1.0F);
@@ -89,7 +89,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
 
         Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GT_RenderUtil.renderItem(type, tIcon);
+        GTRenderUtil.renderItem(type, tIcon);
         GL11.glDisable(GL11.GL_BLEND);
     }
 
@@ -126,9 +126,9 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
         // Empty inner side
         Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
         markNeedsAnimationUpdate(inner);
-        GT_RenderUtil.renderItem(type, inner);
+        GTRenderUtil.renderItem(type, inner);
 
-        FluidStack fluidStack = GT_Utility.getFluidForFilledItem(stack, true);
+        FluidStack fluidStack = GTUtility.getFluidForFilledItem(stack, true);
 
         if (fluidStack != null && fluidStack.getFluid() != null) {
             IIcon fluidIcon = fluidStack.getFluid()
@@ -144,7 +144,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
             GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
             GL11.glDepthFunc(GL11.GL_EQUAL);
             GL11.glColor3ub((byte) (fluidColor >> 16), (byte) (fluidColor >> 8), (byte) fluidColor);
-            GT_RenderUtil.renderItem(type, fluidIcon);
+            GTRenderUtil.renderItem(type, fluidIcon);
 
             GL11.glColor3ub((byte) -1, (byte) -1, (byte) -1);
             GL11.glDepthFunc(GL11.GL_LEQUAL);
@@ -153,7 +153,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
 
     private static boolean isSame(ItemList item, ItemStack stack) {
         ItemStack internal = item.getInternalStack_unsafe();
-        if (GT_Utility.isStackInvalid(internal)) return false;
+        if (GTUtility.isStackInvalid(internal)) return false;
 
         return internal.getItem() == stack.getItem() && internal.getItemDamage() == stack.getItemDamage();
     }
diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java b/src/main/java/gregtech/common/render/items/GeneratedMaterialRenderer.java
index a67d5512ed..8d7b05981f 100644
--- a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java
+++ b/src/main/java/gregtech/common/render/items/GeneratedMaterialRenderer.java
@@ -15,10 +15,10 @@ import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite;
 
 import codechicken.lib.render.TextureUtils;
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.GT_RenderUtil;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.GTRenderUtil;
 
-public class GT_GeneratedMaterial_Renderer implements IItemRenderer {
+public class GeneratedMaterialRenderer implements IItemRenderer {
 
     @Override
     public boolean handleRenderType(ItemStack item, ItemRenderType type) {
@@ -59,7 +59,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer {
         for (int pass = 0; pass < passes; pass++) {
             IIcon tIcon = aItem.getIcon(aMetaData, pass);
             IIcon tOverlay = aItem.getOverlayIcon(aMetaData, pass);
-            FluidStack aFluid = GT_Utility.getFluidForFilledItem(aStack, true);
+            FluidStack aFluid = GTUtility.getFluidForFilledItem(aStack, true);
 
             GL11.glEnable(GL11.GL_BLEND);
             GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -104,7 +104,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer {
             GL11.glColor3f(tModulation[0] / 255.0F, tModulation[1] / 255.0F, tModulation[2] / 255.0F);
         }
 
-        GT_RenderUtil.renderItem(type, icon);
+        GTRenderUtil.renderItem(type, icon);
     }
 
     protected void renderContainedFluid(ItemRenderType type, FluidStack aFluidStack, IIcon fluidIcon) {
@@ -114,12 +114,12 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer {
         TextureUtils.bindAtlas(aFluid.getSpriteNumber());
 
         GL11.glDepthFunc(GL11.GL_EQUAL);
-        GT_RenderUtil.renderItem(type, fluidIcon);
+        GTRenderUtil.renderItem(type, fluidIcon);
         GL11.glDepthFunc(GL11.GL_LEQUAL);
     }
 
     protected void renderItemOverlay(ItemRenderType type, IIcon overlay) {
-        GT_RenderUtil.renderItem(type, overlay);
+        GTRenderUtil.renderItem(type, overlay);
     }
 
     protected void markNeedsAnimationUpdate(IIcon icon) {
diff --git a/src/main/java/gregtech/common/render/items/GlitchEffectRenderer.java b/src/main/java/gregtech/common/render/items/GlitchEffectRenderer.java
index f7e4413c97..b73a75f354 100644
--- a/src/main/java/gregtech/common/render/items/GlitchEffectRenderer.java
+++ b/src/main/java/gregtech/common/render/items/GlitchEffectRenderer.java
@@ -12,9 +12,9 @@ import org.lwjgl.opengl.GL11;
 
 import codechicken.lib.render.TextureUtils;
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GlitchEffectRenderer extends GT_GeneratedMaterial_Renderer {
+public class GlitchEffectRenderer extends GeneratedMaterialRenderer {
 
     public Random rand = new Random();
     int[] red = new int[] { 255, 50, 50, 192 };
@@ -73,7 +73,7 @@ public class GlitchEffectRenderer extends GT_GeneratedMaterial_Renderer {
 
         IIcon itemIcon = itemRenderer.getIcon(metaData, pass);
         IIcon overlay = itemRenderer.getOverlayIcon(metaData, pass);
-        FluidStack aFluid = GT_Utility.getFluidForFilledItem(item, true);
+        FluidStack aFluid = GTUtility.getFluidForFilledItem(item, true);
 
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
diff --git a/src/main/java/gregtech/common/render/items/InfinityRenderer.java b/src/main/java/gregtech/common/render/items/InfinityRenderer.java
index 3a98898b8a..c083024dd3 100644
--- a/src/main/java/gregtech/common/render/items/InfinityRenderer.java
+++ b/src/main/java/gregtech/common/render/items/InfinityRenderer.java
@@ -12,11 +12,11 @@ import org.lwjgl.opengl.GL11;
 import codechicken.lib.render.TextureUtils;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 // TODO: Render effects outside inventory.
 
-public class InfinityRenderer extends GT_GeneratedMaterial_Renderer {
+public class InfinityRenderer extends GeneratedMaterialRenderer {
 
     public Random rand = new Random();
 
@@ -33,7 +33,7 @@ public class InfinityRenderer extends GT_GeneratedMaterial_Renderer {
         for (int pass = 0; pass < passes; pass++) {
             IIcon tIcon = aItem.getIcon(aMetaData, pass);
             IIcon tOverlay = aItem.getOverlayIcon(aMetaData, pass);
-            FluidStack aFluid = GT_Utility.getFluidForFilledItem(aStack, true);
+            FluidStack aFluid = GTUtility.getFluidForFilledItem(aStack, true);
 
             GL11.glEnable(GL11.GL_BLEND);
             GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
diff --git a/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java b/src/main/java/gregtech/common/render/items/MetaGeneratedItemRenderer.java
index d7425c2fcb..14d9b65e7f 100644
--- a/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java
+++ b/src/main/java/gregtech/common/render/items/MetaGeneratedItemRenderer.java
@@ -9,18 +9,18 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
 import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.GT_RenderUtil;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.render.GTRenderUtil;
 
-public class GT_MetaGenerated_Item_Renderer implements IItemRenderer {
+public class MetaGeneratedItemRenderer implements IItemRenderer {
 
-    private final IItemRenderer mItemRenderer = new GT_GeneratedItem_Renderer();
-    private final IItemRenderer mMaterialRenderer = new GT_GeneratedMaterial_Renderer();
+    private final IItemRenderer mItemRenderer = new GeneratedItemRenderer();
+    private final IItemRenderer mMaterialRenderer = new GeneratedMaterialRenderer();
 
-    private final IItemRenderer mDataStickRenderer = new GT_DataStick_Renderer();
+    private final IItemRenderer mDataStickRenderer = new DataStickRenderer();
 
-    public GT_MetaGenerated_Item_Renderer() {}
+    public MetaGeneratedItemRenderer() {}
 
     public <T extends Item & IGT_ItemWithMaterialRenderer> void registerItem(T item) {
         MinecraftForgeClient.registerItemRenderer(item, this);
@@ -28,7 +28,7 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer {
 
     @Override
     public boolean handleRenderType(ItemStack aStack, ItemRenderType aType) {
-        if ((GT_Utility.isStackInvalid(aStack)) || (aStack.getItemDamage() < 0)
+        if ((GTUtility.isStackInvalid(aStack)) || (aStack.getItemDamage() < 0)
             || !(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer)
             || !((IGT_ItemWithMaterialRenderer) aStack.getItem()).shouldUseCustomRenderer(aStack.getItemDamage())) {
             return false;
@@ -38,7 +38,7 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer {
 
     @Override
     public boolean shouldUseRenderHelper(ItemRenderType aType, ItemStack aStack, ItemRendererHelper aHelper) {
-        if (GT_Utility.isStackInvalid(aStack)) {
+        if (GTUtility.isStackInvalid(aStack)) {
             return false;
         }
         return getRendererForItemStack(aStack).shouldUseRenderHelper(aType, aStack, aHelper);
@@ -46,7 +46,7 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) {
-        GT_RenderUtil.applyStandardItemTransform(type);
+        GTRenderUtil.applyStandardItemTransform(type);
 
         IItemRenderer itemRenderer = getRendererForItemStack(aStack);
         itemRenderer.renderItem(type, aStack, data);
@@ -61,7 +61,7 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer {
 
             // Handle fluid rendering.
             if (aMaterialRenderer == null) {
-                ItemData itemData = GT_OreDictUnificator.getAssociation(aStack);
+                ItemData itemData = GTOreDictUnificator.getAssociation(aStack);
                 if (itemData != null) {
                     Materials material = itemData.mMaterial.mMaterial;
                     if (material.renderer != null) {
diff --git a/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java b/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java
index 8583033e0f..7f619f2df5 100644
--- a/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java
+++ b/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java
@@ -13,11 +13,11 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;
 
 import codechicken.lib.render.TextureUtils;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTUtil;
 
-public class TranscendentMetalRenderer extends GT_GeneratedMaterial_Renderer {
+public class TranscendentMetalRenderer extends GeneratedMaterialRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) {
@@ -69,7 +69,7 @@ public class TranscendentMetalRenderer extends GT_GeneratedMaterial_Renderer {
         GL11.glPushMatrix();
 
         Fluid fluid = fluidStack.getFluid();
-        applyEffect(type, GT_Util.getRGBaArray(fluid.getColor()), true);
+        applyEffect(type, GTUtil.getRGBaArray(fluid.getColor()), true);
 
         TextureUtils.bindAtlas(fluid.getSpriteNumber());
         GL11.glDepthFunc(GL11.GL_EQUAL);
@@ -124,7 +124,7 @@ public class TranscendentMetalRenderer extends GT_GeneratedMaterial_Renderer {
             GL11.glTranslatef(0.5f, 0.5f, 0.0f);
         }
 
-        GL11.glRotatef((GT_Mod.gregtechproxy.getAnimationTicks() * 3.5f) % 360, 0.3f, 0.5f, 0.2f);
+        GL11.glRotatef((GTMod.gregtechproxy.getAnimationTicks() * 3.5f) % 360, 0.3f, 0.5f, 0.2f);
         GL11.glRotatef(180, 0.5f, 0.0f, 0.0f);
 
         if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) {
diff --git a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java
index 92b86071cf..ecea6956de 100644
--- a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java
+++ b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java
@@ -22,10 +22,10 @@ import codechicken.lib.render.TextureUtils;
 import fox.spiteful.avaritia.render.CosmicRenderShenanigans;
 import gregtech.api.enums.ItemList;
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
-import gregtech.common.render.GT_RenderUtil;
+import gregtech.common.render.GTRenderUtil;
 
 @SuppressWarnings("RedundantLabeledSwitchRuleCodeBlock")
-public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer {
+public class UniversiumRenderer extends GeneratedMaterialRenderer {
 
     private static final float cosmicOpacity = 2.5f;
 
@@ -112,7 +112,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer {
                 mc.getTextureManager()
                     .bindTexture(resourcelocation);
             } else {
-                GT_RenderUtil.renderItem(type, tIcon);
+                GTRenderUtil.renderItem(type, tIcon);
             }
 
             GL11.glEnable(GL11.GL_BLEND);
@@ -133,7 +133,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer {
             GL11.glColor4d(1, 1, 1, 1);
 
             // Draw cosmic overlay
-            GT_RenderUtil.renderItem(type, tIcon);
+            GTRenderUtil.renderItem(type, tIcon);
 
             CosmicRenderShenanigans.releaseShader();
             CosmicRenderShenanigans.inventoryRender = false;
@@ -141,7 +141,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer {
             GL11.glEnable(GL12.GL_RESCALE_NORMAL);
         } else {
             // RENDER ITEM
-            GT_RenderUtil.renderItem(type, tIcon);
+            GTRenderUtil.renderItem(type, tIcon);
 
             int program = GL11.glGetInteger(GL20.GL_CURRENT_PROGRAM);
 
@@ -151,7 +151,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer {
             CosmicRenderShenanigans.useShader();
 
             // RENDER COSMIC OVERLAY
-            GT_RenderUtil.renderItem(type, tIcon);
+            GTRenderUtil.renderItem(type, tIcon);
             CosmicRenderShenanigans.releaseShader();
             GL11.glDepthFunc(GL11.GL_LEQUAL);
 
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/MTEChestBuffer.java
index 67c38fad9e..27bc56dd62 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTEChestBuffer.java
@@ -7,19 +7,19 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 
-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.metatileentity.implementations.GT_MetaTileEntity_Buffer;
+import gregtech.api.metatileentity.implementations.MTEBuffer;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
+public class MTEChestBuffer extends MTEBuffer {
 
     private static final int[] tickRate = { 400, 200, 100, 20, 4, 1, 1, 1, 1, 1, 1, 1, 1 };
     private static final int[] maxStacks = { 1, 1, 1, 1, 1, 1, 2, 4, 8, 16, 32, 64, 128 };
 
-    public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEChestBuffer(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -30,29 +30,27 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
                 getTickRateDesc(aTier) });
     }
 
-    public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEChestBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEChestBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_ChestBuffer(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEChestBuffer(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_ChestBuffer(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEChestBuffer(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ChestBuffer(
+        return new MTEChestBuffer(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -125,7 +123,7 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
         addInvertRedstoneButton(builder);
         addStockingModeButton(builder);
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(69, true))
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_22_RED.apply(69, true))
                 .setPos(98, 60)
                 .setSize(51, 22));
         addMainUI(builder);
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java b/src/main/java/gregtech/common/tileentities/automation/MTEFilter.java
index b6f1d53604..f731b5f915 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTEFilter.java
@@ -12,21 +12,21 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 
-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.metatileentity.implementations.GT_MetaTileEntity_FilterBase;
+import gregtech.api.metatileentity.implementations.MTEFilterBase;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
+public class MTEFilter extends MTEFilterBase {
 
     private static final int NUM_FILTER_SLOTS = 9;
     private static final String IGNORE_NBT_TOOLTIP = "GT5U.machines.ignore_nbt.tooltip";
     private boolean ignoreNbt = false;
 
-    public GT_MetaTileEntity_Filter(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEFilter(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -36,24 +36,17 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
             new String[] { "Filters up to 9 different Items", "Use Screwdriver to regulate output stack size" });
     }
 
-    public GT_MetaTileEntity_Filter(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEFilter(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Filter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Filter(
-            this.mName,
-            this.mTier,
-            this.mInventory.length,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEFilter(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -86,13 +79,13 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
         }
         if (this.invertFilter) {
             for (int i = 0; i < NUM_FILTER_SLOTS; i++) {
-                if (GT_Utility.areStacksEqual(this.mInventory[FILTER_SLOT_INDEX + i], aStack, this.ignoreNbt)) {
+                if (GTUtility.areStacksEqual(this.mInventory[FILTER_SLOT_INDEX + i], aStack, this.ignoreNbt)) {
                     return false;
                 }
             }
             return true;
         }
-        return GT_Utility.areStacksEqual(this.mInventory[(FILTER_SLOT_INDEX + aIndex)], aStack, this.ignoreNbt);
+        return GTUtility.areStacksEqual(this.mInventory[(FILTER_SLOT_INDEX + aIndex)], aStack, this.ignoreNbt);
     }
 
     @Override
@@ -100,19 +93,19 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
         super.addUIWidgets(builder, buildContext);
         addAllowNbtButton(builder);
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_WHITE.apply(9, false))
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_WHITE.apply(9, false))
                 .setPos(6, 19)
                 .setSize(9, 24))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_BLUE.apply(24, true))
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_BLUE.apply(24, true))
                     .setPos(71, 19)
                     .setSize(24, 24))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_RED.apply(19, true))
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_24_RED.apply(19, true))
                     .setPos(152, 19)
                     .setSize(19, 24))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_SLOTS_HOLO_3BY3)
                     .setPos(16, 4)
                     .setSize(54, 54))
             .widget(
@@ -122,7 +115,7 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
                     .phantom(true)
                     .applyForWidget(
                         widget -> widget.disableShiftInsert()
-                            .setBackground(GT_UITextures.TRANSPARENT))
+                            .setBackground(GTUITextures.TRANSPARENT))
                     .build()
                     .setPos(16, 4))
             .widget(
@@ -138,7 +131,7 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_FilterBase {
             createToggleButton(
                 () -> ignoreNbt,
                 val -> ignoreNbt = val,
-                GT_UITextures.OVERLAY_BUTTON_NBT,
+                GTUITextures.OVERLAY_BUTTON_NBT,
                 () -> mTooltipCache.getData(IGNORE_NBT_TOOLTIP)));
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java b/src/main/java/gregtech/common/tileentities/automation/MTEItemDistributor.java
index 58b7fa57df..36f1e1be58 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTEItemDistributor.java
@@ -14,21 +14,21 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 
 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.metatileentity.implementations.GT_MetaTileEntity_Buffer;
+import gregtech.api.metatileentity.implementations.MTEBuffer;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer {
+public class MTEItemDistributor extends MTEBuffer {
 
     private byte[] itemsPerSide = new byte[6];
     private ForgeDirection currentSide = ForgeDirection.DOWN;
     private byte currentSideItemCount = 0;
 
-    public GT_MetaTileEntity_ItemDistributor(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEItemDistributor(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -39,24 +39,24 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
                 "Use Screwdriver to increase/decrease Items per Side" });
     }
 
-    public GT_MetaTileEntity_ItemDistributor(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTEItemDistributor(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String aDescription) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
     }
 
-    public GT_MetaTileEntity_ItemDistributor(String aName, int aTier, int aInvSlotCount, String aDescription,
+    public MTEItemDistributor(String aName, int aTier, int aInvSlotCount, String aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_ItemDistributor(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTEItemDistributor(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ItemDistributor(
+        return new MTEItemDistributor(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -144,7 +144,7 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
                 return;
             }
         }
-        movedItems = GT_Utility.moveOneItemStack(
+        movedItems = GTUtility.moveOneItemStack(
             aBaseMetaTileEntity,
             adjacentTileEntity,
             currentSide,
@@ -173,7 +173,7 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
         // Adjust items per side by 1 or -1, constrained to the cyclic interval [0, 127]
         itemsPerSide[ordinalSide] += aPlayer.isSneaking() ? -1 : 1;
         itemsPerSide[ordinalSide] = (byte) ((itemsPerSide[ordinalSide] + 128) % 128);
-        GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("211", "Items per side: ") + itemsPerSide[ordinalSide]);
+        GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("211", "Items per side: ") + itemsPerSide[ordinalSide]);
     }
 
     @Override
@@ -196,7 +196,7 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
         addEmitRedstoneIfFullButton(builder);
         addInvertRedstoneButton(builder);
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(87, true))
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_22_RED.apply(87, true))
                 .setPos(62, 60)
                 .setSize(87, 22));
         addInventorySlots(builder);
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java b/src/main/java/gregtech/common/tileentities/automation/MTERecipeFilter.java
index d446009ac7..24b57153af 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTERecipeFilter.java
@@ -34,15 +34,15 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.RecipeMapWorkable;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SpecialFilter;
+import gregtech.api.metatileentity.implementations.MTESpecialFilter;
 import gregtech.api.multitileentity.MultiTileEntityItem;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Item_Machines;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.ItemMachines;
 import gregtech.loaders.preload.GT_Loader_MultiTileEntities;
 
-public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFilter {
+public class MTERecipeFilter extends MTESpecialFilter {
 
     private static final String TT_machineType = "GT5U.MBTT.MachineType";
     private static final String REPRESENTATION_SLOT_TOOLTIP = "GT5U.recipe_filter.representation_slot.tooltip";
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil
     private List<ItemStack> filteredMachines = new ArrayList<>();
     public int mRotationIndex = 0;
 
-    public GT_MetaTileEntity_RecipeFilter(int aID, String aName, String aNameRegional, int aTier) {
+    public MTERecipeFilter(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -60,19 +60,18 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil
             new String[] { "Filters 1 Recipe Type", "Use Screwdriver to regulate output stack size" });
     }
 
-    public GT_MetaTileEntity_RecipeFilter(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTERecipeFilter(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_RecipeFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTERecipeFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     private static RecipeMap<?> getItemStackMachineRecipeMap(ItemStack stack) {
         if (stack != null) {
-            IMetaTileEntity metaTileEntity = GT_Item_Machines.getMetaTileEntity(stack);
+            IMetaTileEntity metaTileEntity = ItemMachines.getMetaTileEntity(stack);
             if (metaTileEntity != null) {
                 return getMetaTileEntityRecipeMap(metaTileEntity);
             } else if (stack.getItem() instanceof MultiTileEntityItem) {
@@ -113,7 +112,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil
         if (this.filteredMachines.isEmpty()) {
             return;
         }
-        this.mInventory[FILTER_SLOT_INDEX] = GT_Utility.copyAmount(
+        this.mInventory[FILTER_SLOT_INDEX] = GTUtility.copyAmount(
             1,
             this.filteredMachines.get(this.mRotationIndex = (this.mRotationIndex + 1) % this.filteredMachines.size()));
         if (this.mInventory[FILTER_SLOT_INDEX] == null) return;
@@ -121,7 +120,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RecipeFilter(
+        return new MTERecipeFilter(
             this.mName,
             this.mTier,
             this.mInventory.length,
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java b/src/main/java/gregtech/common/tileentities/automation/MTERegulator.java
index 08d3d32512..4205af7e08 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTERegulator.java
@@ -18,20 +18,20 @@ import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Buffer;
+import gregtech.api.metatileentity.implementations.MTEBuffer;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
+public class MTERegulator extends MTEBuffer {
 
     public int[] mTargetSlots = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
     private boolean charge = false, decharge = false;
 
-    public GT_MetaTileEntity_Regulator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTERegulator(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -42,24 +42,17 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
                 "Allows Item-specific output slot" });
     }
 
-    public GT_MetaTileEntity_Regulator(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTERegulator(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Regulator(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTERegulator(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Regulator(
-            this.mName,
-            this.mTier,
-            this.mInventory.length,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTERegulator(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -114,7 +107,7 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
     public void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
         for (int i = 0, tCosts; i < 9; i++) {
             if (this.mInventory[(i + 9)] != null) {
-                tCosts = GT_Utility.moveOneItemStackIntoSlot(
+                tCosts = GTUtility.moveOneItemStackIntoSlot(
                     getBaseMetaTileEntity(),
                     getBaseMetaTileEntity().getTileEntityAtSide(getBaseMetaTileEntity().getBackFacing()),
                     getBaseMetaTileEntity().getBackFacing(),
@@ -138,7 +131,7 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
         ItemStack aStack) {
         return super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack) && aIndex >= 0
             && aIndex <= 8
-            && GT_Utility.areStacksEqual(aStack, this.mInventory[(aIndex + 9)]);
+            && GTUtility.areStacksEqual(aStack, this.mInventory[(aIndex + 9)]);
     }
 
     @Override
@@ -175,7 +168,7 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
         super.addUIWidgets(builder, buildContext);
         builder.widget(createChargerSlot(43, 62));
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(84, true))
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_22_RED.apply(84, true))
                 .setPos(65, 60)
                 .setSize(84, 22))
             .widget(
@@ -185,7 +178,7 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
                     .build()
                     .setPos(7, 5))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_SLOTS_HOLO_3BY3)
                     .setPos(62, 5)
                     .setSize(54, 54))
             .widget(
@@ -195,11 +188,11 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
                     .endAtSlot(17)
                     .applyForWidget(
                         widget -> widget.setControlsAmount(true)
-                            .setBackground(GT_UITextures.TRANSPARENT))
+                            .setBackground(GTUITextures.TRANSPARENT))
                     .build()
                     .setPos(62, 5))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_SLOTS_HOLO_3BY3)
                     .setPos(117, 5)
                     .setSize(54, 54));
 
@@ -217,7 +210,7 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer {
                             0,
                             mTargetSlots[index] + (clickData.mouseButton == 0 ? -1 : 1) * (clickData.shift ? 16 : 1)));
                 }
-            }.setBackground(GT_UITextures.TRANSPARENT)
+            }.setBackground(GTUITextures.TRANSPARENT)
                 .setPos(xPos, yPos))
                 .widget(
                     TextWidget.dynamicString(() -> String.valueOf(mTargetSlots[index]))
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java b/src/main/java/gregtech/common/tileentities/automation/MTESuperBuffer.java
index 9a1d2d7dcf..fa1bdd60b9 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTESuperBuffer.java
@@ -13,16 +13,16 @@ import net.minecraft.item.ItemStack;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 
-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.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer {
+public class MTESuperBuffer extends MTEChestBuffer {
 
-    public GT_MetaTileEntity_SuperBuffer(int aID, String aName, String aNameRegional, int aTier) {
+    public MTESuperBuffer(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -33,19 +33,17 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer
                 getTickRateDesc(aTier) });
     }
 
-    public GT_MetaTileEntity_SuperBuffer(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTESuperBuffer(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_SuperBuffer(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTESuperBuffer(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_SuperBuffer(
+        return new MTESuperBuffer(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -66,8 +64,8 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer
     @Override
     protected void fillStacksIntoFirstSlots() {
         // no order, this is super buffer
-        HashMap<GT_Utility.ItemId, Integer> slots = new HashMap<>(mInventory.length);
-        HashMap<GT_Utility.ItemId, ItemStack> stacks = new HashMap<>(mInventory.length);
+        HashMap<GTUtility.ItemId, Integer> slots = new HashMap<>(mInventory.length);
+        HashMap<GTUtility.ItemId, ItemStack> stacks = new HashMap<>(mInventory.length);
         List<Integer> validSlots = new ArrayList<>(mInventory.length);
         // List<String> order = new ArrayList<>(mInventory.length);
         for (int i = 0; i < mInventory.length - 1; i++) {
@@ -75,14 +73,14 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer
             validSlots.add(i);
             ItemStack s = mInventory[i];
             if (s == null) continue;
-            GT_Utility.ItemId sID = GT_Utility.ItemId.createNoCopy(s);
+            GTUtility.ItemId sID = GTUtility.ItemId.createNoCopy(s);
             slots.merge(sID, s.stackSize, Integer::sum);
             if (!stacks.containsKey(sID)) stacks.put(sID, s);
             // order.add(sID);
             mInventory[i] = null;
         }
         int i = 0;
-        for (Map.Entry<GT_Utility.ItemId, Integer> entry : slots.entrySet()) {
+        for (Map.Entry<GTUtility.ItemId, Integer> entry : slots.entrySet()) {
             do {
                 int slot = validSlots.get(i);
                 mInventory[slot] = stacks.get(entry.getKey())
@@ -98,7 +96,7 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer
     @Override
     protected void addMainUI(ModularWindow.Builder builder) {
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SUPER_BUFFER)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SUPER_BUFFER)
                 .setPos(61, 4)
                 .setSize(54, 54));
     }
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/src/main/java/gregtech/common/tileentities/automation/MTETypeFilter.java
index be4a2226a1..3b8cd3482e 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTETypeFilter.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.automation;
 
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.GTValues.W;
 import static gregtech.api.enums.Textures.BlockIcons.AUTOMATION_TYPEFILTER;
 import static gregtech.api.enums.Textures.BlockIcons.AUTOMATION_TYPEFILTER_GLOW;
 
@@ -22,13 +22,13 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SpecialFilter;
+import gregtech.api.metatileentity.implementations.MTESpecialFilter;
 import gregtech.api.objects.ItemData;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilter {
+public class MTETypeFilter extends MTESpecialFilter {
 
     private static final String REPRESENTATION_SLOT_TOOLTIP = "GT5U.type_filter.representation_slot.tooltip";
     public int mRotationIndex = 0;
@@ -49,7 +49,7 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte
         OrePrefixes.oreBasalt,
         OrePrefixes.oreMarble);
 
-    public GT_MetaTileEntity_TypeFilter(int aID, String aName, String aNameRegional, int aTier) {
+    public MTETypeFilter(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -58,19 +58,17 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte
             new String[] { "Filters 1 Item Type", "Use Screwdriver to regulate output stack size" });
     }
 
-    public GT_MetaTileEntity_TypeFilter(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTETypeFilter(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_TypeFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTETypeFilter(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TypeFilter(
+        return new MTETypeFilter(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -99,7 +97,7 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte
     }
 
     private void copyHeldItemPrefix(ItemStack handStack) {
-        ItemData data = GT_OreDictUnificator.getAssociation(handStack);
+        ItemData data = GTOreDictUnificator.getAssociation(handStack);
         if (data != null && data.hasValidPrefixData()) {
             this.mPrefix = data.mPrefix;
             this.mRotationIndex = -1;
@@ -142,7 +140,7 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte
             this.mInventory[FILTER_SLOT_INDEX] = null;
             return;
         }
-        this.mInventory[FILTER_SLOT_INDEX] = GT_Utility.copyAmount(
+        this.mInventory[FILTER_SLOT_INDEX] = GTUtility.copyAmount(
             1,
             this.mPrefix.mPrefixedItems
                 .get(this.mRotationIndex = (this.mRotationIndex + 1) % this.mPrefix.mPrefixedItems.size()));
@@ -165,7 +163,7 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte
     @Override
     protected boolean isStackAllowed(ItemStack aStack) {
         if (this.mPrefix == OrePrefixes.ore) {
-            ItemData data = GT_OreDictUnificator.getItemData(aStack);
+            ItemData data = GTOreDictUnificator.getItemData(aStack);
             if (data != null && data.mPrefix != null && OREBLOCK_PREFIXES.contains(data.mPrefix)) {
                 return true;
             }
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoiler.java
index 6964b13165..b49da44e97 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoiler.java
@@ -21,30 +21,29 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.ParticleFX;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.SteamVariant;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.modularui.IGetTitleColor;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 
-public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTank
-    implements IGetTitleColor, IAddUIWidgets {
+public abstract class MTEBoiler extends MTEBasicTank implements IGetTitleColor, IAddUIWidgets {
 
     public static final byte SOUND_EVENT_LET_OFF_EXCESS_STEAM = 1;
     public int mTemperature = 20;
@@ -54,21 +53,19 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
     public boolean mHadNoWater = false;
     private int mExcessWater = 0;
 
-    public GT_MetaTileEntity_Boiler(int aID, String aName, String aNameRegional, String aDescription,
-        ITexture... aTextures) {
+    public MTEBoiler(int aID, String aName, String aNameRegional, String aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Boiler(int aID, String aName, String aNameRegional, String[] aDescription,
-        ITexture... aTextures) {
+    public MTEBoiler(int aID, String aName, String aNameRegional, String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Boiler(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEBoiler(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Boiler(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoiler(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
@@ -124,7 +121,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
             return true;
         }
         if (aPlayer != null) {
-            if (GT_Utility.areStacksEqual(aPlayer.getCurrentEquippedItem(), new ItemStack(Items.water_bucket, 1))) {
+            if (GTUtility.areStacksEqual(aPlayer.getCurrentEquippedItem(), new ItemStack(Items.water_bucket, 1))) {
                 fill(Materials.Water.getFluid(1000L * (long) aPlayer.getCurrentEquippedItem().stackSize), true);
 
                 if (!aPlayer.capabilities.isCreativeMode) {
@@ -132,7 +129,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
                         .func_150996_a(Items.bucket);
                 }
             } else {
-                GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+                GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             }
         }
         return true;
@@ -170,7 +167,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
 
     @Override
     public boolean isFluidInputAllowed(FluidStack aFluid) {
-        return GT_ModHandler.isWater(aFluid);
+        return GTModHandler.isWater(aFluid);
     }
 
     @Override
@@ -190,8 +187,8 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCover) {
-        return GregTech_API.getCoverBehaviorNew(aCover.toStack())
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCover) {
+        return GregTechAPI.getCoverBehaviorNew(aCover.toStack())
             .isSimpleCover();
     }
 
@@ -226,14 +223,14 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
     protected void produceSteam(int aAmount) {
         mExcessWater -= aAmount;
         if (mExcessWater < 0) {
-            int tWaterToConsume = -mExcessWater / GT_Values.STEAM_PER_WATER;
+            int tWaterToConsume = -mExcessWater / GTValues.STEAM_PER_WATER;
             mFluid.amount -= tWaterToConsume;
-            mExcessWater += GT_Values.STEAM_PER_WATER * tWaterToConsume;
+            mExcessWater += GTValues.STEAM_PER_WATER * tWaterToConsume;
         }
-        if (GT_ModHandler.isSteam(this.mSteam)) {
+        if (GTModHandler.isSteam(this.mSteam)) {
             this.mSteam.amount += aAmount;
         } else {
-            this.mSteam = GT_ModHandler.getSteam(aAmount);
+            this.mSteam = GTModHandler.getSteam(aAmount);
         }
     }
 
@@ -262,7 +259,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
 
     private void pollute(long aTick) {
         if (this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) {
-            GT_Pollution.addPollution(getBaseMetaTileEntity(), getPollution());
+            Pollution.addPollution(getBaseMetaTileEntity(), getPollution());
         }
     }
 
@@ -293,11 +290,11 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
         }
 
         if (this.mTemperature > 100) {
-            if ((!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {
+            if ((!GTModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {
                 this.mHadNoWater = true;
             } else {
                 if (this.mHadNoWater) {
-                    GT_Log.exp.println("Boiler " + this.mName + " had no Water!");
+                    GTLog.exp.println("Boiler " + this.mName + " had no Water!");
                     onDangerousWaterLack(aBaseMetaTileEntity, aTick);
                     return true;
                 }
@@ -323,7 +320,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
         if (mSteam == null || mSteam.amount == 0) return;
         final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(side);
         if (tTileEntity == null) return;
-        GT_Utility.moveFluid(aBaseMetaTileEntity, tTileEntity, side, Math.max(1, this.mSteam.amount / 2), null);
+        GTUtility.moveFluid(aBaseMetaTileEntity, tTileEntity, side, Math.max(1, this.mSteam.amount / 2), null);
     }
 
     /**
@@ -352,7 +349,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
     }
 
     protected boolean isAutomatable() {
-        return GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation;
+        return GTMod.gregtechproxy.mAllowSmallBoilerAutomation;
     }
 
     @Override
@@ -370,8 +367,8 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
 
     @Override
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
-        if (aIndex == GT_MetaTileEntity_Boiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) {
-            GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ);
+        if (aIndex == MTEBoiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) {
+            GTUtility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ);
 
             new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD)
                 .setWorld(getBaseMetaTileEntity().getWorld())
@@ -424,12 +421,12 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
 
     protected IDrawable[] getFuelSlotBackground() {
         return new IDrawable[] { getGUITextureSet().getItemSlot(),
-            GT_UITextures.OVERLAY_SLOT_COAL_STEAM.get(getSteamVariant()) };
+            GTUITextures.OVERLAY_SLOT_COAL_STEAM.get(getSteamVariant()) };
     }
 
     protected IDrawable[] getAshSlotBackground() {
         return new IDrawable[] { getGUITextureSet().getItemSlot(),
-            GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()) };
+            GTUITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()) };
     }
 
     @Override
@@ -446,19 +443,19 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
             .widget(createAshSlot())
             .widget(
                 new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getSteamCapacity())
-                    .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_STEAM, 10)
+                    .setTexture(getProgressbarEmpty(), GTUITextures.PROGRESSBAR_BOILER_STEAM, 10)
                     .setDirection(ProgressBar.Direction.UP)
                     .setPos(70, 25)
                     .setSize(10, 54))
             .widget(
                 new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity())
-                    .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_WATER, 10)
+                    .setTexture(getProgressbarEmpty(), GTUITextures.PROGRESSBAR_BOILER_WATER, 10)
                     .setDirection(ProgressBar.Direction.UP)
                     .setPos(83, 25)
                     .setSize(10, 54))
             .widget(
                 new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime())
-                    .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10)
+                    .setTexture(getProgressbarEmpty(), GTUITextures.PROGRESSBAR_BOILER_HEAT, 10)
                     .setDirection(ProgressBar.Direction.UP)
                     .setPos(96, 25)
                     .setSize(10, 54))
@@ -477,7 +474,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
     }
 
     private boolean isItemValidFluidFilledItem(@NotNull ItemStack stack) {
-        return isFluidInputAllowed(GT_Utility.getFluidForFilledItem(stack, true));
+        return isFluidInputAllowed(GTUtility.getFluidForFilledItem(stack, true));
     }
 
     protected Widget createFuelSlot() {
@@ -509,22 +506,22 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
     // for GT++
 
     protected IDrawable getOverlaySlotIn() {
-        return GT_UITextures.OVERLAY_SLOT_IN_STEAM.get(getSteamVariant());
+        return GTUITextures.OVERLAY_SLOT_IN_STEAM.get(getSteamVariant());
     }
 
     protected IDrawable getOverlaySlotOut() {
-        return GT_UITextures.OVERLAY_SLOT_OUT_STEAM.get(getSteamVariant());
+        return GTUITextures.OVERLAY_SLOT_OUT_STEAM.get(getSteamVariant());
     }
 
     protected IDrawable getOverlaySlotCanister() {
-        return GT_UITextures.OVERLAY_SLOT_CANISTER_STEAM.get(getSteamVariant());
+        return GTUITextures.OVERLAY_SLOT_CANISTER_STEAM.get(getSteamVariant());
     }
 
     protected UITexture getProgressbarEmpty() {
-        return GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant());
+        return GTUITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant());
     }
 
     protected UITexture getProgressbarFuel() {
-        return GT_UITextures.PROGRESSBAR_FUEL_STEAM.get(getSteamVariant());
+        return GTUITextures.PROGRESSBAR_FUEL_STEAM.get(getSteamVariant());
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerBronze.java
index 3450d55290..e951656d23 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerBronze.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.ParticleFX;
@@ -33,31 +33,31 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.XSTR;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 
-public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler {
+public class MTEBoilerBronze extends MTEBoiler {
 
-    public GT_MetaTileEntity_Boiler_Bronze(int aID, String aName, String aNameRegional) {
+    public MTEBoilerBronze(int aID, String aName, String aNameRegional) {
         super(
             aID,
             aName,
             aNameRegional,
             new String[] { "An early way to get Steam Power", "Produces 120L of Steam per second",
-                "Causes " + GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond + " Pollution per second" });
+                "Causes " + GTMod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond + " Pollution per second" });
     }
 
-    public GT_MetaTileEntity_Boiler_Bronze(int aID, String aName, String aNameRegional, String[] aDescription) {
+    public MTEBoilerBronze(int aID, String aName, String aNameRegional, String[] aDescription) {
         super(aID, aName, aNameRegional, aDescription);
     }
 
-    public GT_MetaTileEntity_Boiler_Bronze(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerBronze(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Boiler_Bronze(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerBronze(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
@@ -89,7 +89,7 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Bronze(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEBoilerBronze(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     /**
@@ -150,13 +150,13 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler {
         if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)
             && this.mProcessingEnergy > 0
             && (aTick % 20L == 0L)) {
-            GT_Pollution.addPollution(getBaseMetaTileEntity(), getPollution());
+            Pollution.addPollution(getBaseMetaTileEntity(), getPollution());
         }
     }
 
     @Override
     protected int getPollution() {
-        return GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond;
+        return GTMod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond;
     }
 
     @Override
@@ -188,7 +188,7 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler {
             this.mProcessingEnergy += burnTime / 10;
             boolean isABlock = !Block.getBlockFromItem(fuel.getItem())
                 .equals(Blocks.air);
-            combustFuel(burnTime, isABlock).map(dustSize -> GT_OreDictUnificator.get(dustSize, ashMaterial, 1L))
+            combustFuel(burnTime, isABlock).map(dustSize -> GTOreDictUnificator.get(dustSize, ashMaterial, 1L))
                 .ifPresent(ashes -> aBaseMetaTileEntity.addStackToSlot(3, ashes));
         });
     }
@@ -210,18 +210,17 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler {
     }
 
     private static boolean couldProduceDarkAshes(ItemStack fuel, String lowerCaseBlockName) {
-        return GT_Utility.isPartOfMaterials(fuel, Materials.Coal)
-            || GT_Utility.isPartOfMaterials(fuel, Materials.Lignite)
+        return GTUtility.isPartOfMaterials(fuel, Materials.Coal) || GTUtility.isPartOfMaterials(fuel, Materials.Lignite)
             || lowerCaseBlockName.matches("tile\\..+compressedcoal");
     }
 
     private static boolean couldProduceRegularAshes(ItemStack fuel, String lowerCaseBlockName, int burnTime) {
-        return GT_Utility.isPartOfMaterials(fuel, Materials.Charcoal)
-            || GT_Utility.isPartOfMaterials(fuel, Materials.Diamond)
+        return GTUtility.isPartOfMaterials(fuel, Materials.Charcoal)
+            || GTUtility.isPartOfMaterials(fuel, Materials.Diamond)
             || (Stream.of("^tile\\..+charcoal", "^tile\\..+coke", "^tile\\..+railcraft.cube")
                 .anyMatch(lowerCaseBlockName::matches))
             || Stream.of("fuelCoke", "fuelCactusCharcoal", "fuelCactusCoke", "fuelSugarCharcoal", "fuelSugarCoke")
-                .anyMatch(name -> GT_OreDictUnificator.isItemStackInstanceOf(fuel, name))
+                .anyMatch(name -> GTOreDictUnificator.isItemStackInstanceOf(fuel, name))
             || burnTime >= 2000;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerLava.java
index d0dfe74b64..ad79f07b0f 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerLava.java
@@ -36,22 +36,22 @@ import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.ParticleFX;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.SteamVariant;
-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.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
 
-public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
+public class MTEBoilerLava extends MTEBoiler {
 
     public static final int COOLDOWN_INTERVAL = 20;
     public static final int ENERGY_PER_LAVA = 1;
@@ -60,24 +60,24 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
     private final FluidTank lavaTank = new LavaTank(null, getCapacity());
     private int mCooledLava = 0;
 
-    public GT_MetaTileEntity_Boiler_Lava(int aID, String aName, String aNameRegional) {
+    public MTEBoilerLava(int aID, String aName, String aNameRegional) {
         super(
             aID,
             aName,
             aNameRegional,
             new String[] { "A Boiler running off Lava", "Produces " + PRODUCTION_PER_SECOND + "L of Steam per second",
-                "Causes " + GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond + " Pollution per second",
+                "Causes " + GTMod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond + " Pollution per second",
                 "Consumes " + ((double) CONSUMPTION_PER_HEATUP / ENERGY_PER_LAVA)
                     + "L of Lava every "
                     + COOLDOWN_INTERVAL
                     + " ticks when fully heat up" });
     }
 
-    public GT_MetaTileEntity_Boiler_Lava(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerLava(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Boiler_Lava(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerLava(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
@@ -138,12 +138,12 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Lava(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEBoilerLava(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
     protected int getPollution() {
-        return GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond;
+        return GTMod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond;
     }
 
     @Override
@@ -177,7 +177,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
     public static ItemStack fillIFluidTankFromItemStack(IFluidTank destinationIFluidTank, ItemStack SourceItemStack) {
         if (destinationIFluidTank == null || SourceItemStack == null) return null;
 
-        final FluidStack containedFluidStack = GT_Utility.getFluidForFilledItem(SourceItemStack, true);
+        final FluidStack containedFluidStack = GTUtility.getFluidForFilledItem(SourceItemStack, true);
         if (containedFluidStack == null || containedFluidStack.amount == 0) return null;
 
         final int fillableAmount = destinationIFluidTank.fill(containedFluidStack, false);
@@ -188,7 +188,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
             destinationIFluidTank.fill(equippedIFluidContainerItem.drain(SourceItemStack, fillableAmount, true), true);
             return null;
         } else {
-            final ItemStack emptyContainerItemStack = GT_Utility.getContainerForFilledItem(SourceItemStack, false);
+            final ItemStack emptyContainerItemStack = GTUtility.getContainerForFilledItem(SourceItemStack, false);
             destinationIFluidTank.fill(containedFluidStack, true);
             return emptyContainerItemStack;
         }
@@ -199,16 +199,16 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
         if (aBaseMetaTileEntity.isClientSide() || aPlayer == null) return true;
 
         final ItemStack equippedItemStack = aPlayer.getCurrentEquippedItem();
-        final FluidStack equippedContainerFluidStack = GT_Utility.getFluidForFilledItem(equippedItemStack, true);
+        final FluidStack equippedContainerFluidStack = GTUtility.getFluidForFilledItem(equippedItemStack, true);
         final ItemStack returnedItemStack;
         final IFluidTank tank;
 
-        if (GT_ModHandler.isWater(equippedContainerFluidStack)) {
+        if (GTModHandler.isWater(equippedContainerFluidStack)) {
             tank = this;
-        } else if (GT_ModHandler.isLava(equippedContainerFluidStack)) {
+        } else if (GTModHandler.isLava(equippedContainerFluidStack)) {
             tank = lavaTank;
         } else {
-            GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+            GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             return true;
         }
         returnedItemStack = fillIFluidTankFromItemStack(tank, equippedItemStack);
@@ -283,7 +283,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
                         - (this.lavaTank.getFluid() != null ? this.lavaTank.getFluid().amount : 0),
                     1000)),
             false);
-        if (!GT_ModHandler.isLava(drainableLavaStack) || drainableLavaStack.amount <= 0) return;
+        if (!GTModHandler.isLava(drainableLavaStack) || drainableLavaStack.amount <= 0) return;
         // Performs actual drain up and fill internal tank
         this.lavaTank.fill(upTank.drain(ForgeDirection.DOWN, drainableLavaStack, true), true);
     }
@@ -362,19 +362,19 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
 
     @Override
     public boolean isFluidInputAllowed(FluidStack aFluid) {
-        return GT_ModHandler.isWater(aFluid) || GT_ModHandler.isLava(aFluid);
+        return GTModHandler.isWater(aFluid) || GTModHandler.isLava(aFluid);
     }
 
     @Override
     public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         if (!aBaseMetaTileEntity.isServerSide()) return;
-        final FluidStack containedFluidStack = GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true);
-        if (GT_ModHandler.isWater(containedFluidStack)) super.onPreTick(aBaseMetaTileEntity, aTick);
-        if (GT_ModHandler.isLava(containedFluidStack)
+        final FluidStack containedFluidStack = GTUtility.getFluidForFilledItem(mInventory[getInputSlot()], true);
+        if (GTModHandler.isWater(containedFluidStack)) super.onPreTick(aBaseMetaTileEntity, aTick);
+        if (GTModHandler.isLava(containedFluidStack)
             && lavaTank.fill(containedFluidStack, false) == containedFluidStack.amount
             && aBaseMetaTileEntity.addStackToSlot(
                 getOutputSlot(),
-                GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true),
+                GTUtility.getContainerForFilledItem(mInventory[getInputSlot()], true),
                 1)) {
             lavaTank.fill(containedFluidStack, true);
             aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
@@ -394,11 +394,11 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
 
     @Override
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
-        if (aIndex != GT_MetaTileEntity_Boiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) return;
+        if (aIndex != MTEBoiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) return;
 
         final ForgeDirection rearDirection = getBaseMetaTileEntity().getFrontFacing()
             .getOpposite();
-        GT_Utility.doSoundAtClient(
+        GTUtility.doSoundAtClient(
             SoundResource.RANDOM_FIZZ,
             2,
             1.0F,
@@ -436,8 +436,8 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
 
     @Override
     public int fill(FluidStack aFluid, boolean doFill) {
-        if (GT_ModHandler.isWater(aFluid)) return super.fill(aFluid, doFill);
-        if (GT_ModHandler.isLava(aFluid)) return lavaTank.fill(aFluid, doFill);
+        if (GTModHandler.isWater(aFluid)) return super.fill(aFluid, doFill);
+        if (GTModHandler.isLava(aFluid)) return lavaTank.fill(aFluid, doFill);
         return 0;
     }
 
@@ -451,7 +451,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
     @Override
     protected IDrawable[] getAshSlotBackground() {
         return new IDrawable[] { getGUITextureSet().getItemSlot(),
-            GT_UITextures.OVERLAY_SLOT_BLOCK_STEAM.get(getSteamVariant()) };
+            GTUITextures.OVERLAY_SLOT_BLOCK_STEAM.get(getSteamVariant()) };
     }
 
     @Override
@@ -468,7 +468,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
 
         @Override
         public int fill(FluidStack resource, boolean doFill) {
-            return GT_ModHandler.isLava(resource) ? super.fill(resource, doFill) : 0;
+            return GTModHandler.isLava(resource) ? super.fill(resource, doFill) : 0;
         }
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolar.java
index b10b44228d..0fc23f59cf 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolar.java
@@ -23,17 +23,17 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import gregtech.common.config.machinestats.ConfigBronzeSolarBoiler;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
+public class MTEBoilerSolar extends MTEBoiler {
 
     public static final String LPS_FMT = "%s L/s";
-    private static final String localizedDescFormat = GT_LanguageManager.addStringLocalization(
+    private static final String localizedDescFormat = GTLanguageManager.addStringLocalization(
         "gt.blockmachines.boiler.solar.desc.format",
         "Steam Power by the Sun%n" + "Produces %sL of Steam per second%n"
             + "Calcifies over time, reducing Steam output to %sL/s%n"
@@ -46,15 +46,15 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
     protected final int basicTemperatureMod = 5; // Base Celsius gain or loss
     private int mRunTimeTicks = 0;
 
-    public GT_MetaTileEntity_Boiler_Solar(int aID, String aName, String aNameRegional) {
+    public MTEBoilerSolar(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, new String[0]);
     }
 
-    public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerSolar(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerSolar(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
@@ -67,8 +67,8 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
         return String
             .format(
                 localizedDescFormat,
-                GT_Utility.formatNumbers(getMaxOutputPerSecond()),
-                GT_Utility.formatNumbers(getMinOutputPerSecond()))
+                GTUtility.formatNumbers(getMaxOutputPerSecond()),
+                GTUtility.formatNumbers(getMinOutputPerSecond()))
             .split("\\R");
     }
 
@@ -126,7 +126,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
     protected void produceSteam(int aAmount) {
         super.produceSteam(aAmount);
         // Disable calcification when using distilled water
-        if (mFluid.isFluidEqual(GT_ModHandler.getWater(1))) {
+        if (mFluid.isFluidEqual(GTModHandler.getWater(1))) {
             // produceSteam is getting called every 10 ticks
             if (mRunTimeTicks >= 0 && mRunTimeTicks < (Integer.MAX_VALUE - 10)) mRunTimeTicks += 10;
             else mRunTimeTicks = Integer.MAX_VALUE; // Prevent Integer overflow wrap
@@ -257,11 +257,11 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
                     + EnumChatFormatting.YELLOW
                     + LPS_FMT
                     + EnumChatFormatting.RESET,
-                GT_Utility.formatNumbers(getHeatCapacityPercent()),
-                GT_Utility.formatNumbers(getHotTimeSeconds()),
-                GT_Utility.formatNumbers(getMinOutputPerSecond()),
-                GT_Utility.formatNumbers(getMaxOutputPerSecond()),
-                GT_Utility.formatNumbers(getProductionPerSecond()))
+                GTUtility.formatNumbers(getHeatCapacityPercent()),
+                GTUtility.formatNumbers(getHotTimeSeconds()),
+                GTUtility.formatNumbers(getMinOutputPerSecond()),
+                GTUtility.formatNumbers(getMaxOutputPerSecond()),
+                GTUtility.formatNumbers(getProductionPerSecond()))
             .split("\\R");
     }
 
@@ -275,7 +275,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Solar(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEBoilerSolar(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolarSteel.java
index c537e388d1..b46beca108 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolarSteel.java
@@ -9,21 +9,19 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
 import gregtech.common.config.machinestats.ConfigSteelSolarBoiler;
 
-public class GT_MetaTileEntity_Boiler_Solar_Steel extends GT_MetaTileEntity_Boiler_Solar {
+public class MTEBoilerSolarSteel extends MTEBoilerSolar {
 
-    public GT_MetaTileEntity_Boiler_Solar_Steel(int aID, String aName, String aNameRegional) {
+    public MTEBoilerSolarSteel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         initBoilerStats();
     }
 
-    public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBoilerSolarSteel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         initBoilerStats();
     }
 
-    public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBoilerSolarSteel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         initBoilerStats();
     }
@@ -66,6 +64,6 @@ public class GT_MetaTileEntity_Boiler_Solar_Steel extends GT_MetaTileEntity_Boil
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Solar_Steel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEBoilerSolarSteel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSteel.java
index 12374c3313..a557a03d16 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSteel.java
@@ -9,29 +9,29 @@ import static gregtech.api.enums.Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_STEELBRICKS_TOP;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.SteamVariant;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_Boiler_Bronze {
+public class MTEBoilerSteel extends MTEBoilerBronze {
 
-    public GT_MetaTileEntity_Boiler_Steel(int aID, String aName, String aNameRegional) {
+    public MTEBoilerSteel(int aID, String aName, String aNameRegional) {
         super(
             aID,
             aName,
             aNameRegional,
             new String[] { "Faster than the Bronze Boiler", "Produces 300L of Steam per second",
-                "Causes " + GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond + " Pollution per second" });
+                "Causes " + GTMod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond + " Pollution per second" });
     }
 
-    public GT_MetaTileEntity_Boiler_Steel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerSteel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Boiler_Steel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoilerSteel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
@@ -68,12 +68,12 @@ public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_Boiler_Bro
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Steel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEBoilerSteel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
     protected int getPollution() {
-        return GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond;
+        return GTMod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Ampere.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Ampere.java
index b0f6afdc3a..9d05d1cd6f 100644
--- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Ampere.java
+++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Ampere.java
@@ -5,10 +5,10 @@ import java.util.List;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.multitileentity.interfaces.IMultiBlockController;
 import gregtech.api.multitileentity.multiblock.casing.UpgradeCasing;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class Ampere extends UpgradeCasing {
 
@@ -22,7 +22,7 @@ public class Ampere extends UpgradeCasing {
     @Override
     public void readMultiTileNBT(NBTTagCompound aNBT) {
         super.readMultiTileNBT(aNBT);
-        amperage = aNBT.getInteger(GT_Values.NBT.UPGRADE_AMPERAGE);
+        amperage = aNBT.getInteger(GTValues.NBT.UPGRADE_AMPERAGE);
     }
 
     @Override
@@ -42,6 +42,6 @@ public class Ampere extends UpgradeCasing {
     @Override
     public void addToolTips(List<String> list, ItemStack stack, boolean f3_h) {
         super.addToolTips(list, stack, f3_h);
-        list.add("Increases allowed amperage to " + GT_Utility.formatNumbers(amperage));
+        list.add("Increases allowed amperage to " + GTUtility.formatNumbers(amperage));
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java
index 7e51b3441d..43cc20f983 100644
--- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java
+++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java
@@ -11,7 +11,7 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow.Builder;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget;
 
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.enums.GTValues.NBT;
 import gregtech.api.enums.InventoryType;
 import gregtech.api.multitileentity.interfaces.IMultiBlockController;
 import gregtech.api.multitileentity.multiblock.casing.UpgradeCasing;
diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Tank.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Tank.java
index ebc84be38a..a7ace14de5 100644
--- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Tank.java
+++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Tank.java
@@ -6,10 +6,10 @@ import java.util.UUID;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.multitileentity.interfaces.IMultiBlockController;
 import gregtech.api.multitileentity.multiblock.casing.UpgradeCasing;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 public class Tank extends UpgradeCasing {
 
@@ -47,8 +47,8 @@ public class Tank extends UpgradeCasing {
     @Override
     public void readMultiTileNBT(NBTTagCompound aNBT) {
         super.readMultiTileNBT(aNBT);
-        tankCount = aNBT.getInteger(GT_Values.NBT.UPGRADE_TANK_COUNT);
-        tankCapacity = aNBT.getInteger(GT_Values.NBT.UPGRADE_TANK_CAPACITY);
+        tankCount = aNBT.getInteger(GTValues.NBT.UPGRADE_TANK_COUNT);
+        tankCapacity = aNBT.getInteger(GTValues.NBT.UPGRADE_TANK_CAPACITY);
     }
 
     @Override
@@ -56,6 +56,6 @@ public class Tank extends UpgradeCasing {
         super.addToolTips(list, stack, f3_h);
         list.add("Adds another tank inventory");
         list.add("Number of tanks: " + tankCount);
-        list.add("Tank capacity: " + GT_Utility.formatNumbers(tankCapacity) + " L");
+        list.add("Tank capacity: " + GTUtility.formatNumbers(tankCapacity) + " L");
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/debug/GT_MetaTileEntity_AdvDebugStructureWriter.java b/src/main/java/gregtech/common/tileentities/debug/MTEAdvDebugStructureWriter.java
index e61ae456f0..82e4c21653 100644
--- a/src/main/java/gregtech/common/tileentities/debug/GT_MetaTileEntity_AdvDebugStructureWriter.java
+++ b/src/main/java/gregtech/common/tileentities/debug/MTEAdvDebugStructureWriter.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.debug;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 import java.util.HashMap;
@@ -33,40 +33,37 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 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.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 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.metatileentity.implementations.MTETieredMachineBlock;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity_TieredMachineBlock
-    implements IAddGregtechLogo, IAddUIWidgets {
+public class MTEAdvDebugStructureWriter extends MTETieredMachineBlock implements IAddGregtechLogo, IAddUIWidgets {
 
-    private static final HashMap<GT_MetaTileEntity_AdvDebugStructureWriter, BoundHighlighter> bondingBoxes = new HashMap<>(
-        1);
+    private static final HashMap<MTEAdvDebugStructureWriter, BoundHighlighter> bondingBoxes = new HashMap<>(1);
     private final BoundHighlighter boundingBox = new BoundHighlighter();
     private final short[] numbers = new short[6];
     private boolean transpose = false;
     private boolean showHighlightBox = true;
     private String[] result = new String[] { "Undefined" };
 
-    public GT_MetaTileEntity_AdvDebugStructureWriter(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEAdvDebugStructureWriter(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "");
     }
 
-    public GT_MetaTileEntity_AdvDebugStructureWriter(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEAdvDebugStructureWriter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_AdvDebugStructureWriter(mName, mTier, "", mTextures);
+        return new MTEAdvDebugStructureWriter(mName, mTier, "", mTextures);
     }
 
     @Override
@@ -196,7 +193,7 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -237,7 +234,7 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                 .setSize(90, 112)
                 .setPos(43, 4))
             .widget(new ButtonWidget().setOnClick((clickData, widget) -> {
@@ -247,21 +244,21 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity
                             .getPlayer());
                 }
             })
-                .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_PRINT)
+                .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_PRINT)
                 .setSize(18, 18)
                 .setPos(11, 128)
                 .addTooltip(translateToLocal("GT5U.machines.advdebugstructurewriter.gui.print.tooltip")))
             .widget(
                 new CycleButtonWidget().setToggle(() -> transpose, aBoolean -> transpose = aBoolean)
-                    .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                    .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_TRANSPOSE)
+                    .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                    .setStaticTexture(GTUITextures.OVERLAY_BUTTON_TRANSPOSE)
                     .setSize(18, 18)
                     .setPos(32, 128)
                     .addTooltip(translateToLocal("GT5U.machines.advdebugstructurewriter.gui.transpose.tooltip")))
             .widget(
                 new CycleButtonWidget().setToggle(() -> showHighlightBox, aBoolean -> showHighlightBox = aBoolean)
-                    .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                    .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BOUNDING_BOX)
+                    .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                    .setStaticTexture(GTUITextures.OVERLAY_BUTTON_BOUNDING_BOX)
                     .setSize(18, 18)
                     .setPos(53, 128)
                     .addTooltip(translateToLocal("GT5U.machines.advdebugstructurewriter.gui.highlight.tooltip")))
@@ -300,10 +297,10 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity
                             .setDefaultColor(0xf0f0ff)
                             .setPos(0, 78))
                     .setPos(46, 8));
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, -512, -64, 7);
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, -16, -1, 25);
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, 16, 1, 133);
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, 512, 64, 151);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_MINUS_LARGE, -512, -64, 7);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_MINUS_SMALL, -16, -1, 25);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_PLUS_SMALL, 16, 1, 133);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_PLUS_LARGE, 512, 64, 151);
     }
 
     private void addChangeNumberButtons(ModularWindow.Builder builder, IDrawable overlay, int addNumberShift,
@@ -317,7 +314,7 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity
                     numbers[index] = (short) Math.max(numbers[index], 0);
                 }
             })
-                .setBackground(GT_UITextures.BUTTON_STANDARD, overlay)
+                .setBackground(GTUITextures.BUTTON_STANDARD, overlay)
                 .setSize(18, 18)
                 .setPos(xPos, yPos[index]));
         }
@@ -325,7 +322,7 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity
 
     @Override
     public GUITextureSet getGUITextureSet() {
-        return new GUITextureSet().setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY);
+        return new GUITextureSet().setGregTechLogo(GTUITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtech/common/tileentities/generators/MTEDieselGenerator.java
index 10138bdfc2..b09e2c5e1d 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
+++ b/src/main/java/gregtech/common/tileentities/generators/MTEDieselGenerator.java
@@ -30,25 +30,25 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.ParticleFX;
 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.metatileentity.implementations.MTEBasicGenerator;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
 
-public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGenerator {
+public class MTEDieselGenerator extends MTEBasicGenerator {
 
     public int mEfficiency;
 
-    public GT_MetaTileEntity_DieselGenerator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEDieselGenerator(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -56,18 +56,18 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe
             aTier,
             new String[] { "Requires liquid Fuel",
                 "Causes "
-                    + (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond
-                        * GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier[aTier])
+                    + (int) (GTMod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond
+                        * GTMod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier[aTier])
                     + " Pollution per second" });
         onConfigLoad();
     }
 
-    public GT_MetaTileEntity_DieselGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEDieselGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         onConfigLoad();
     }
 
-    public GT_MetaTileEntity_DieselGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEDieselGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         onConfigLoad();
     }
@@ -79,7 +79,7 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_DieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEDieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -103,7 +103,7 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe
 
     @Override
     public int getFuelValue(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack) || getRecipeMap() == null) return 0;
+        if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return 0;
         long rValue = super.getFuelValue(aStack);
         if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
             rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3L);
@@ -117,7 +117,7 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         if (aTick % 100 == 0 && mFluid != null && mFluid.amount > this.getCapacity()) {
-            GT_Log.err.println(
+            GTLog.err.println(
                 "Dupe Abuse: " + aBaseMetaTileEntity.getOwnerName()
                     + " Coords: "
                     + aBaseMetaTileEntity.getXCoord()
@@ -272,7 +272,7 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe
 
     @Override
     public int getPollution() {
-        return (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond
-            * GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier[mTier]);
+        return (int) (GTMod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond
+            * GTMod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier[mTier]);
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java b/src/main/java/gregtech/common/tileentities/generators/MTEGasTurbine.java
index ca0a5d6958..47976da987 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/generators/MTEGasTurbine.java
@@ -24,20 +24,20 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 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.metatileentity.implementations.MTEBasicGenerator;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerator {
+public class MTEGasTurbine extends MTEBasicGenerator {
 
     public int mEfficiency;
 
-    public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier, int mEfficiency) {
+    public MTEGasTurbine(int aID, String aName, String aNameRegional, int aTier, int mEfficiency) {
         super(
             aID,
             aName,
@@ -45,14 +45,13 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat
             aTier,
             new String[] { "Requires flammable Gasses",
                 "Causes "
-                    + (int) (GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond
-                        * GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier[aTier])
+                    + (int) (GTMod.gregtechproxy.mPollutionBaseGasTurbinePerSecond
+                        * GTMod.gregtechproxy.mPollutionGasTurbineReleasedByTier[aTier])
                     + " Pollution per second" });
         this.mEfficiency = mEfficiency;
     }
 
-    public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
-        int mEfficiency) {
+    public MTEGasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int mEfficiency) {
         super(aName, aTier, aDescription, aTextures);
         this.mEfficiency = mEfficiency;
     }
@@ -64,12 +63,7 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_GasTurbine(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures,
-            this.mEfficiency);
+        return new MTEGasTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mEfficiency);
     }
 
     @Override
@@ -201,7 +195,7 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat
 
     @Override
     public int getPollution() {
-        return (int) (GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond
-            * GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier[mTier]);
+        return (int) (GTMod.gregtechproxy.mPollutionBaseGasTurbinePerSecond
+            * GTMod.gregtechproxy.mPollutionGasTurbineReleasedByTier[mTier]);
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java b/src/main/java/gregtech/common/tileentities/generators/MTELightningRod.java
index 9809dba278..ef04bf9d0b 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java
+++ b/src/main/java/gregtech/common/tileentities/generators/MTELightningRod.java
@@ -9,26 +9,25 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Textures.BlockIcons;
 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.metatileentity.implementations.MTETieredMachineBlock;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMachineBlock {
+public class MTELightningRod extends MTETieredMachineBlock {
 
-    public GT_MetaTileEntity_LightningRod(int aID, String aName, String aNameRegional, int aTier) {
+    public MTELightningRod(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "Generates EU From Lightning Bolts");
     }
 
-    public GT_MetaTileEntity_LightningRod(String aName, int aTier, int aInvSlotCount, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTELightningRod(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_LightningRod(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTELightningRod(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
@@ -56,7 +55,7 @@ public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMach
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LightningRod(
+        return new MTELightningRod(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -153,7 +152,7 @@ public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMach
 
     @Override
     public long maxEUOutput() {
-        return GT_Values.V[mTier];
+        return GTValues.V[mTier];
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java b/src/main/java/gregtech/common/tileentities/generators/MTEMagicEnergyConverter.java
index 647aa504e5..c741cc4457 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java
+++ b/src/main/java/gregtech/common/tileentities/generators/MTEMagicEnergyConverter.java
@@ -15,28 +15,26 @@ 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.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
+import gregtech.api.metatileentity.implementations.MTEBasicGenerator;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_MagicEnergyConverter extends GT_MetaTileEntity_BasicGenerator {
+public class MTEMagicEnergyConverter extends MTEBasicGenerator {
 
     public int mEfficiency;
 
-    public GT_MetaTileEntity_MagicEnergyConverter(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEMagicEnergyConverter(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "Put your strange stuff in here");
         onConfigLoad();
     }
 
-    public GT_MetaTileEntity_MagicEnergyConverter(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEMagicEnergyConverter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         onConfigLoad();
     }
 
-    public GT_MetaTileEntity_MagicEnergyConverter(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEMagicEnergyConverter(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         onConfigLoad();
     }
@@ -48,11 +46,7 @@ public class GT_MetaTileEntity_MagicEnergyConverter extends GT_MetaTileEntity_Ba
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_MagicEnergyConverter(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEMagicEnergyConverter(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java
index 3245607ac2..c49102ad61 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
+++ b/src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.generators;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_DRAGONEGG;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_DRAGONEGG_GLOW;
@@ -52,17 +52,17 @@ import com.google.common.base.Enums;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ParticleFX;
-import gregtech.api.enums.TC_Aspects;
+import gregtech.api.enums.TCAspects;
 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.metatileentity.implementations.MTEBasicGenerator;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
 import gregtech.common.config.machinestats.ConfigMachines;
 import thaumcraft.api.aspects.Aspect;
@@ -76,16 +76,15 @@ interface MagicalEnergyBBListener {
     void onMagicalEnergyBBUpdate();
 }
 
-public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_BasicGenerator
-    implements MagicalEnergyBBListener {
+public class MTEMagicalEnergyAbsorber extends MTEBasicGenerator implements MagicalEnergyBBListener {
 
-    private static final ConcurrentHashMap<UUID, GT_MetaTileEntity_MagicalEnergyAbsorber> sSubscribedCrystals = new ConcurrentHashMap<>(
+    private static final ConcurrentHashMap<UUID, MTEMagicalEnergyAbsorber> sSubscribedCrystals = new ConcurrentHashMap<>(
         4);
     private static final List<Aspect> sPrimalAspects = (Thaumcraft.isModLoaded()) ? Aspect.getPrimalAspects()
         : new ArrayList<>();
     private static final Map<Aspect, Integer> sAspectsEnergy = new HashMap<>();
     private static boolean sAllowMultipleEggs = false;
-    private static GT_MetaTileEntity_MagicalEnergyAbsorber sActiveSiphon = null;
+    private static MTEMagicalEnergyAbsorber sActiveSiphon = null;
     private static int sEnergyPerEndercrystal = 512;
     private static int sEnergyFromVis = 20;
     private static int sEnergyPerEssentia = 320;
@@ -98,13 +97,12 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
     private int mNoGenerationTicks = 0;
     private boolean mUsingEssentia = true;
 
-    public GT_MetaTileEntity_MagicalEnergyAbsorber(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEMagicalEnergyAbsorber(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "Feasts on magic close to it:");
         onConfigLoad();
     }
 
-    private GT_MetaTileEntity_MagicalEnergyAbsorber(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    private MTEMagicalEnergyAbsorber(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         onConfigLoad();
     }
@@ -120,15 +118,15 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
                 sAspectsEnergy.put(
                     tAspect,
                     Enums.getIfPresent(
-                        TC_Aspects.class,
+                        TCAspects.class,
                         tAspect.getTag()
                             .toUpperCase(Locale.ENGLISH))
-                        .or(TC_Aspects.AER).mValue * sEnergyPerEssentia);
+                        .or(TCAspects.AER).mValue * sEnergyPerEssentia);
             }
         }
     }
 
-    private static void setActiveSiphon(GT_MetaTileEntity_MagicalEnergyAbsorber aSiphon) {
+    private static void setActiveSiphon(MTEMagicalEnergyAbsorber aSiphon) {
         sActiveSiphon = aSiphon;
     }
 
@@ -145,10 +143,10 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
     public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aPlayer.isSneaking()) mMagicalEnergyBB.decreaseTier();
         else mMagicalEnergyBB.increaseTier();
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             String.format(
-                GT_LanguageManager.addStringLocalization(
+                GTLanguageManager.addStringLocalization(
                     "Interaction_DESCRIPTION_MagicalEnergyAbsorber_Screwdriver",
                     "Absorption range: %s blocks"),
                 mMagicalEnergyBB.getRange(),
@@ -488,7 +486,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
             }
         }
 
-        ItemStack tOutputStack = GT_Utility.copyAmount(1, tStack);
+        ItemStack tOutputStack = GTUtility.copyAmount(1, tStack);
         if (tOutputStack != null) {
             if (isDisenchantableItem(tOutputStack)) {
                 tEU = tEU * getEfficiency() / 100;
@@ -540,7 +538,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
     private long absorbFromEnderCrystals() {
         if (sEnergyPerEndercrystal <= 0) return 0;
         long tEU = 0;
-        for (GT_MetaTileEntity_MagicalEnergyAbsorber tSubscriber : sSubscribedCrystals.values()) {
+        for (MTEMagicalEnergyAbsorber tSubscriber : sSubscribedCrystals.values()) {
             if (tSubscriber == this) { // This Crystal is for me
                 tEU += sEnergyPerEndercrystal;
             }
@@ -615,7 +613,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_MagicalEnergyAbsorber(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEMagicalEnergyAbsorber(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -635,7 +633,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
      */
     static class MagicalEnergyBB {
 
-        private final GT_MetaTileEntity_MagicalEnergyAbsorber mAbsorber;
+        private final MTEMagicalEnergyAbsorber mAbsorber;
         private final MagicalEnergyBBListener mListener;
         private final int mDefaultTier;
         private int mTier;
@@ -648,7 +646,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
          * @param aDefaultTier Initial tier value
          * @param aMaxTier     Maximum allowed tier
          */
-        MagicalEnergyBB(GT_MetaTileEntity_MagicalEnergyAbsorber aAbsorber, int aDefaultTier, int aMaxTier) {
+        MagicalEnergyBB(MTEMagicalEnergyAbsorber aAbsorber, int aDefaultTier, int aMaxTier) {
             mAbsorber = aAbsorber;
             mListener = aAbsorber;
             mMaxTier = Math.max(Math.max(aMaxTier, 0), Math.max(aDefaultTier, 0));
@@ -798,7 +796,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
             int tTier = (mTier + aOffset + tNumTiers) % tNumTiers;
             int tTrueTier = setTier(tTier);
             if (tTier != tTrueTier) {
-                GT_Log.out.format("Absorber's BB Tier set to %d was capped to %d", tTier, tTrueTier);
+                GTLog.out.format("Absorber's BB Tier set to %d was capped to %d", tTier, tTrueTier);
             }
         }
     }
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java b/src/main/java/gregtech/common/tileentities/generators/MTENaquadahReactor.java
index 1dd378e746..276fdff07c 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
+++ b/src/main/java/gregtech/common/tileentities/generators/MTENaquadahReactor.java
@@ -26,17 +26,16 @@ 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.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
+import gregtech.api.metatileentity.implementations.MTEBasicGenerator;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGenerator {
+public class MTENaquadahReactor extends MTEBasicGenerator {
 
     private int mEfficiency;
 
-    public GT_MetaTileEntity_NaquadahReactor(int aID, String aName, String[] aDescription, String aNameRegional,
-        int aTier) {
+    public MTENaquadahReactor(int aID, String aName, String[] aDescription, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, aDescription);
         if (aTier > 8 || aTier < 4) {
             new Exception("Tier without Recipe Map!").printStackTrace();
@@ -44,7 +43,7 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe
         mEfficiency = getBaseEff();
     }
 
-    public GT_MetaTileEntity_NaquadahReactor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTENaquadahReactor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         if (aTier > 8 || aTier < 4) {
             new Exception("Tier without Recipe Map!").printStackTrace();
@@ -62,7 +61,7 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_NaquadahReactor(mName, mTier, mDescriptionArray, mTextures);
+        return new MTENaquadahReactor(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_PlasmaGenerator.java b/src/main/java/gregtech/common/tileentities/generators/MTEPlasmaGenerator.java
index fa980ce480..2b8dafcbdf 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_PlasmaGenerator.java
+++ b/src/main/java/gregtech/common/tileentities/generators/MTEPlasmaGenerator.java
@@ -10,26 +10,26 @@ 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.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
+import gregtech.api.metatileentity.implementations.MTEBasicGenerator;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_PlasmaGenerator extends GT_MetaTileEntity_BasicGenerator {
+public class MTEPlasmaGenerator extends MTEBasicGenerator {
 
     public int mEfficiency;
 
-    public GT_MetaTileEntity_PlasmaGenerator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEPlasmaGenerator(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "Plasma into energy");
         setEfficiency();
     }
 
-    public GT_MetaTileEntity_PlasmaGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEPlasmaGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         setEfficiency();
     }
 
-    public GT_MetaTileEntity_PlasmaGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEPlasmaGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         setEfficiency();
     }
@@ -128,7 +128,7 @@ public class GT_MetaTileEntity_PlasmaGenerator extends GT_MetaTileEntity_BasicGe
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PlasmaGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEPlasmaGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     public void setEfficiency() {
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java b/src/main/java/gregtech/common/tileentities/generators/MTESteamTurbine.java
index 9c1b8db562..bb6138d35a 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/generators/MTESteamTurbine.java
@@ -28,16 +28,16 @@ import net.minecraftforge.fluids.FluidStack;
 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.metatileentity.implementations.MTEBasicGenerator;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTModHandler;
 
-public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGenerator {
+public class MTESteamTurbine extends MTEBasicGenerator {
 
     public int mEfficiency;
 
-    public GT_MetaTileEntity_SteamTurbine(int aID, String aName, String aNameRegional, int aTier) {
+    public MTESteamTurbine(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -47,12 +47,12 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
         this.mEfficiency = 6 + this.mTier;
     }
 
-    public GT_MetaTileEntity_SteamTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTESteamTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         this.mEfficiency = 6 + this.mTier;
     }
 
-    public GT_MetaTileEntity_SteamTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         this.mEfficiency = 6 + this.mTier;
     }
@@ -64,7 +64,7 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_SteamTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTESteamTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -101,7 +101,7 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
     @Override
     public int getFuelValue(FluidStack aLiquid) {
         if (aLiquid == null) return 0;
-        return GT_ModHandler.isAnySteam(aLiquid) ? 3 : 0;
+        return GTModHandler.isAnySteam(aLiquid) ? 3 : 0;
     }
 
     @Override
@@ -228,7 +228,7 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
 
     @Override
     public boolean isFluidInputAllowed(FluidStack aFluid) {
-        if (GT_ModHandler.isSuperHeatedSteam(aFluid)) {
+        if (GTModHandler.isSuperHeatedSteam(aFluid)) {
             aFluid.amount = 0;
             aFluid = null;
             return false;
diff --git a/src/main/java/gregtech/common/tileentities/machines/IRecipeProcessingAwareHatch.java b/src/main/java/gregtech/common/tileentities/machines/IRecipeProcessingAwareHatch.java
index c7a97ce969..eaceb1a247 100644
--- a/src/main/java/gregtech/common/tileentities/machines/IRecipeProcessingAwareHatch.java
+++ b/src/main/java/gregtech/common/tileentities/machines/IRecipeProcessingAwareHatch.java
@@ -1,10 +1,11 @@
 package gregtech.common.tileentities.machines;
 
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
 import gregtech.api.recipe.check.CheckRecipeResult;
 
 /**
- * Implement this interface for {@link gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch}
+ * Implement this interface for {@link MTEHatch}
  * if it does special stuff while multiblock controller is processing recipe.
  */
 public interface IRecipeProcessingAwareHatch {
@@ -22,5 +23,5 @@ public interface IRecipeProcessingAwareHatch {
      * @return Result of the process of this method. {@code !wasSuccessful()} means the returned result should
      *         overwrite the result calculated on multiblock whatever the reason is.
      */
-    CheckRecipeResult endRecipeProcessing(GT_MetaTileEntity_MultiBlockBase controller);
+    CheckRecipeResult endRecipeProcessing(MTEMultiBlockBase controller);
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/MTEBasicHullBronze.java
index 252cc6a5b8..a9c34c5abc 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEBasicHullBronze.java
@@ -5,28 +5,26 @@ 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_BasicHull_NonElectric;
+import gregtech.api.metatileentity.implementations.MTEBasicHullNonElectric;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_BasicHull_Bronze extends GT_MetaTileEntity_BasicHull_NonElectric {
+public class MTEBasicHullBronze extends MTEBasicHullNonElectric {
 
-    public GT_MetaTileEntity_BasicHull_Bronze(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription) {
+    public MTEBasicHullBronze(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_BasicHull_Bronze(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEBasicHullBronze(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull_Bronze(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHullBronze(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BasicHull_Bronze(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEBasicHullBronze(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java b/src/main/java/gregtech/common/tileentities/machines/MTEBasicHullBronzeBricks.java
index ee788ba8c0..e09c84e095 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEBasicHullBronzeBricks.java
@@ -5,33 +5,26 @@ 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_BasicHull_NonElectric;
+import gregtech.api.metatileentity.implementations.MTEBasicHullNonElectric;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_BasicHull_BronzeBricks extends GT_MetaTileEntity_BasicHull_NonElectric {
+public class MTEBasicHullBronzeBricks extends MTEBasicHullNonElectric {
 
-    public GT_MetaTileEntity_BasicHull_BronzeBricks(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription) {
+    public MTEBasicHullBronzeBricks(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_BasicHull_BronzeBricks(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHullBronzeBricks(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull_BronzeBricks(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHullBronzeBricks(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BasicHull_BronzeBricks(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEBasicHullBronzeBricks(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java b/src/main/java/gregtech/common/tileentities/machines/MTEBasicHullSteel.java
index 85e461bf47..6e5e6ad5e8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEBasicHullSteel.java
@@ -5,27 +5,26 @@ 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_BasicHull_NonElectric;
+import gregtech.api.metatileentity.implementations.MTEBasicHullNonElectric;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_BasicHull_Steel extends GT_MetaTileEntity_BasicHull_NonElectric {
+public class MTEBasicHullSteel extends MTEBasicHullNonElectric {
 
-    public GT_MetaTileEntity_BasicHull_Steel(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription) {
+    public MTEBasicHullSteel(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_BasicHull_Steel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEBasicHullSteel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull_Steel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBasicHullSteel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BasicHull_Steel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEBasicHullSteel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java b/src/main/java/gregtech/common/tileentities/machines/MTEBasicHullSteelBricks.java
index cd5f547d22..7fc8276be1 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEBasicHullSteelBricks.java
@@ -5,33 +5,26 @@ 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_BasicHull_NonElectric;
+import gregtech.api.metatileentity.implementations.MTEBasicHullNonElectric;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_BasicHull_SteelBricks extends GT_MetaTileEntity_BasicHull_NonElectric {
+public class MTEBasicHullSteelBricks extends MTEBasicHullNonElectric {
 
-    public GT_MetaTileEntity_BasicHull_SteelBricks(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription) {
+    public MTEBasicHullSteelBricks(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_BasicHull_SteelBricks(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHullSteelBricks(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_BasicHull_SteelBricks(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEBasicHullSteelBricks(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BasicHull_SteelBricks(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEBasicHullSteelBricks(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputME.java
index 09f12904d7..e5dfd72c68 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputME.java
@@ -1,7 +1,7 @@
 package gregtech.common.tileentities.machines;
 
-import static gregtech.api.enums.GT_Values.TIER_COLORS;
-import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.TIER_COLORS;
+import static gregtech.api.enums.GTValues.VN;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_CRAFTING_INPUT_BUFFER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_CRAFTING_INPUT_BUS;
 
@@ -79,23 +79,23 @@ import appeng.me.helpers.IGridProxyable;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.Platform;
 import appeng.util.ReadableNumberConverter;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IConfigurationCircuitSupport;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.extensions.ArrayExt;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_Hatch_InputBus
+public class MTEHatchCraftingInputME extends MTEHatchInputBus
     implements IConfigurationCircuitSupport, IAddGregtechLogo, IAddUIWidgets, IPowerChannelState, ICraftingProvider,
     IGridProxyable, IDualInputHatch, ICustomNameObject, IInterfaceViewable {
 
@@ -132,13 +132,13 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
             NBTTagList inv = nbt.getTagList("inventory", Constants.NBT.TAG_COMPOUND);
             for (int i = 0; i < inv.tagCount(); i++) {
                 NBTTagCompound tagItemStack = inv.getCompoundTagAt(i);
-                ItemStack item = GT_Utility.loadItem(tagItemStack);
+                ItemStack item = GTUtility.loadItem(tagItemStack);
                 if (item != null) {
                     if (item.stackSize > 0) {
                         itemInventory.add(item);
                     }
                 } else {
-                    GT_Mod.GT_FML_LOGGER.warn(
+                    GTMod.GT_FML_LOGGER.warn(
                         "An error occurred while loading contents of ME Crafting Input Bus. This item has been voided: "
                             + tagItemStack);
                 }
@@ -152,7 +152,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
                         fluidInventory.add(fluid);
                     }
                 } else {
-                    GT_Mod.GT_FML_LOGGER.warn(
+                    GTMod.GT_FML_LOGGER.warn(
                         "An error occurred while loading contents of ME Crafting Input Bus. This fluid has been voided: "
                             + tagFluidStack);
                 }
@@ -245,7 +245,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
 
         private void insertItem(ItemStack inserted) {
             for (ItemStack itemStack : itemInventory) {
-                if (GT_Utility.areStacksEqual(inserted, itemStack)) {
+                if (GTUtility.areStacksEqual(inserted, itemStack)) {
                     if (itemStack.stackSize > Integer.MAX_VALUE - inserted.stackSize) {
                         inserted.stackSize -= Integer.MAX_VALUE - itemStack.stackSize;
                         itemStack.stackSize = Integer.MAX_VALUE;
@@ -262,7 +262,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
 
         private void insertFluid(FluidStack inserted) {
             for (FluidStack fluidStack : fluidInventory) {
-                if (GT_Utility.areFluidsEqual(inserted, fluidStack)) {
+                if (GTUtility.areFluidsEqual(inserted, fluidStack)) {
                     if (fluidStack.amount > Integer.MAX_VALUE - inserted.amount) {
                         inserted.amount -= Integer.MAX_VALUE - fluidStack.amount;
                         fluidStack.amount = Integer.MAX_VALUE;
@@ -297,7 +297,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
 
             NBTTagList itemInventoryNbt = new NBTTagList();
             for (ItemStack itemStack : this.itemInventory) {
-                itemInventoryNbt.appendTag(GT_Utility.saveItem(itemStack));
+                itemInventoryNbt.appendTag(GTUtility.saveItem(itemStack));
             }
             nbt.setTag("inventory", itemInventoryNbt);
 
@@ -334,8 +334,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
     private boolean supportFluids;
     private boolean additionalConnection = false;
 
-    public GT_MetaTileEntity_Hatch_CraftingInput_ME(int aID, String aName, String aNameRegional,
-        boolean supportFluids) {
+    public MTEHatchCraftingInputME(int aID, String aName, String aNameRegional, boolean supportFluids) {
         super(
             aID,
             aName,
@@ -352,8 +351,8 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
         this.supportFluids = supportFluids;
     }
 
-    public GT_MetaTileEntity_Hatch_CraftingInput_ME(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures, boolean supportFluids) {
+    public MTEHatchCraftingInputME(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
+        boolean supportFluids) {
         super(aName, aTier, MAX_INV_COUNT, aDescription, aTextures);
         this.supportFluids = supportFluids;
         disableSort = true;
@@ -361,7 +360,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_CraftingInput_ME(mName, mTier, mDescriptionArray, mTextures, supportFluids);
+        return new MTEHatchCraftingInputME(mName, mTier, mDescriptionArray, mTextures, supportFluids);
     }
 
     @Override
@@ -555,7 +554,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
                     getBaseMetaTileEntity().getWorld(),
                     this::getSharedItems);
             } else {
-                GT_Mod.GT_FML_LOGGER.warn(
+                GTMod.GT_FML_LOGGER.warn(
                     "An error occurred while loading contents of ME Crafting Input Bus. This pattern has been voided: "
                         + patternSlotNBT);
             }
@@ -621,8 +620,8 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
                     + EnumChatFormatting.BLUE
                     + describePattern(slot.patternDetails)
                     + EnumChatFormatting.RESET);
-            Map<GT_Utility.ItemId, Long> itemMap = GT_Utility.convertItemListToMap(slot.itemInventory);
-            for (Map.Entry<GT_Utility.ItemId, Long> entry : itemMap.entrySet()) {
+            Map<GTUtility.ItemId, Long> itemMap = GTUtility.convertItemListToMap(slot.itemInventory);
+            for (Map.Entry<GTUtility.ItemId, Long> entry : itemMap.entrySet()) {
                 ItemStack item = entry.getKey()
                     .getItemStack();
                 long amount = entry.getValue();
@@ -633,7 +632,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
                         + nc.toWideReadableForm(amount)
                         + EnumChatFormatting.RESET);
             }
-            Map<Fluid, Long> fluidMap = GT_Utility.convertFluidListToMap(slot.fluidInventory);
+            Map<Fluid, Long> fluidMap = GTUtility.convertFluidListToMap(slot.fluidInventory);
             for (Map.Entry<Fluid, Long> entry : fluidMap.entrySet()) {
                 FluidStack fluid = new FluidStack(entry.getKey(), 1);
                 long amount = entry.getValue();
@@ -692,7 +691,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
                 .startFromSlot(0)
                 .endAtSlot(MAX_PATTERN_COUNT - 1)
                 .phantom(false)
-                .background(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_PATTERN_ME)
+                .background(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_PATTERN_ME)
                 .widgetCreator(slot -> new SlotWidget(slot) {
 
                     @Override
@@ -715,7 +714,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
                 }
             })
                 .setPlayClickSound(true)
-                .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE)
+                .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_PLUS_LARGE)
                 .addTooltips(ImmutableList.of("Place manual items"))
                 .setSize(16, 16)
                 .setPos(170, 45))
@@ -725,7 +724,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
                 }
             })
                 .setPlayClickSound(true)
-                .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_EXPORT)
+                .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_EXPORT)
                 .addTooltips(ImmutableList.of("Return all internally stored items back to AE"))
                 .setSize(16, 16)
                 .setPos(170, 28));
@@ -844,7 +843,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
             if (slot == null) continue;
             ICraftingPatternDetails details = slot.getPatternDetails();
             if (details == null) {
-                GT_Mod.GT_FML_LOGGER.warn(
+                GTMod.GT_FML_LOGGER.warn(
                     "Found an invalid pattern at " + getBaseMetaTileEntity().getCoords()
                         + " in dim "
                         + getBaseMetaTileEntity().getWorld().provider.dimensionId);
@@ -969,7 +968,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
         final int PARENT_WIDTH = getGUIWidth();
         final int PARENT_HEIGHT = getGUIHeight();
         ModularWindow.Builder builder = ModularWindow.builder(WIDTH, HEIGHT);
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.setGuiTint(getGUIColorization());
         builder.setDraggable(true);
         // make sure the manual window is within the parent window
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputSlave.java
index 6dede1bea5..92cbb0d6e8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputSlave.java
@@ -23,19 +23,18 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
 import gregtech.api.render.TextureFactory;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_Hatch_CraftingInput_Slave extends GT_MetaTileEntity_Hatch_InputBus
-    implements IDualInputHatch {
+public class MTEHatchCraftingInputSlave extends MTEHatchInputBus implements IDualInputHatch {
 
-    private GT_MetaTileEntity_Hatch_CraftingInput_ME master; // use getMaster() to access
+    private MTEHatchCraftingInputME master; // use getMaster() to access
     private int masterX, masterY, masterZ;
     private boolean masterSet = false; // indicate if values of masterX, masterY, masterZ are valid
 
-    public GT_MetaTileEntity_Hatch_CraftingInput_Slave(int aID, String aName, String aNameRegional) {
+    public MTEHatchCraftingInputSlave(int aID, String aName, String aNameRegional) {
         super(
             aID,
             aName,
@@ -48,15 +47,14 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_Slave extends GT_MetaTileEnti
         disableSort = true;
     }
 
-    public GT_MetaTileEntity_Hatch_CraftingInput_Slave(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchCraftingInputSlave(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
         disableSort = true;
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_CraftingInput_Slave(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchCraftingInputSlave(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -123,7 +121,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_Slave extends GT_MetaTileEnti
         return ret.toArray(new String[0]);
     }
 
-    public GT_MetaTileEntity_Hatch_CraftingInput_ME getMaster() {
+    public MTEHatchCraftingInputME getMaster() {
         if (master == null) return null;
         if (master.getBaseMetaTileEntity() == null) { // master disappeared
             master = null;
@@ -149,7 +147,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_Slave extends GT_MetaTileEnti
     }
 
     @Override
-    public Iterator<GT_MetaTileEntity_Hatch_CraftingInput_ME.PatternSlot> inventories() {
+    public Iterator<MTEHatchCraftingInputME.PatternSlot> inventories() {
         return getMaster() != null ? getMaster().inventories() : Collections.emptyIterator();
     }
 
@@ -168,18 +166,18 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_Slave extends GT_MetaTileEnti
         return getMaster() != null && getMaster().justUpdated();
     }
 
-    public GT_MetaTileEntity_Hatch_CraftingInput_ME trySetMasterFromCoord(int x, int y, int z) {
+    public MTEHatchCraftingInputME trySetMasterFromCoord(int x, int y, int z) {
         var tileEntity = getBaseMetaTileEntity().getWorld()
             .getTileEntity(x, y, z);
         if (tileEntity == null) return null;
         if (!(tileEntity instanceof IGregTechTileEntity gtTileEntity)) return null;
         var metaTileEntity = gtTileEntity.getMetaTileEntity();
-        if (!(metaTileEntity instanceof GT_MetaTileEntity_Hatch_CraftingInput_ME)) return null;
+        if (!(metaTileEntity instanceof MTEHatchCraftingInputME)) return null;
         masterX = x;
         masterY = y;
         masterZ = z;
         masterSet = true;
-        master = (GT_MetaTileEntity_Hatch_CraftingInput_ME) metaTileEntity;
+        master = (MTEHatchCraftingInputME) metaTileEntity;
         return master;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchInputBusME.java
index 36b20acc55..cbfc18ab0b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchInputBusME.java
@@ -1,7 +1,7 @@
 package gregtech.common.tileentities.machines;
 
-import static gregtech.api.enums.GT_Values.TIER_COLORS;
-import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.TIER_COLORS;
+import static gregtech.api.enums.GTValues.VN;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_INPUT_HATCH;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_INPUT_HATCH_ACTIVE;
 
@@ -59,7 +59,7 @@ import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.IGridProxyable;
 import appeng.util.item.AEItemStack;
 import gregtech.api.enums.ItemList;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IConfigurationCircuitSupport;
 import gregtech.api.interfaces.IDataCopyable;
 import gregtech.api.interfaces.ITexture;
@@ -67,21 +67,20 @@ import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
 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_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gregtech.common.gui.modularui.widget.AESlotWidget;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch_InputBus
-    implements IConfigurationCircuitSupport, IRecipeProcessingAwareHatch, IAddGregtechLogo, IAddUIWidgets,
-    IPowerChannelState, ISmartInputHatch, IDataCopyable {
+public class MTEHatchInputBusME extends MTEHatchInputBus implements IConfigurationCircuitSupport,
+    IRecipeProcessingAwareHatch, IAddGregtechLogo, IAddUIWidgets, IPowerChannelState, ISmartInputHatch, IDataCopyable {
 
     private static final int SLOT_COUNT = 16;
     public static final String COPIED_DATA_IDENTIFIER = "stockingBus";
@@ -99,7 +98,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
     private boolean justHadNewItems = false;
     private boolean expediteRecipeCheck = false;
 
-    public GT_MetaTileEntity_Hatch_InputBus_ME(int aID, boolean autoPullAvailable, String aName, String aNameRegional) {
+    public MTEHatchInputBusME(int aID, boolean autoPullAvailable, String aName, String aNameRegional) {
         super(
             aID,
             aName,
@@ -111,8 +110,8 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
         disableSort = true;
     }
 
-    public GT_MetaTileEntity_Hatch_InputBus_ME(String aName, boolean autoPullAvailable, int aTier,
-        String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchInputBusME(String aName, boolean autoPullAvailable, int aTier, String[] aDescription,
+        ITexture[][][] aTextures) {
         super(aName, aTier, SLOT_COUNT * 2 + 2, aDescription, aTextures);
         this.autoPullAvailable = autoPullAvailable;
         disableSort = true;
@@ -120,7 +119,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_InputBus_ME(mName, autoPullAvailable, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchInputBusME(mName, autoPullAvailable, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -348,8 +347,8 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
     @Override
     public boolean pasteCopiedData(EntityPlayer player, NBTTagCompound nbt) {
         if (nbt == null || !COPIED_DATA_IDENTIFIER.equals(nbt.getString("type"))) return false;
-        ItemStack circuit = GT_Utility.loadItem(nbt, "circuit");
-        if (GT_Utility.isStackInvalid(circuit)) circuit = null;
+        ItemStack circuit = GTUtility.loadItem(nbt, "circuit");
+        if (GTUtility.isStackInvalid(circuit)) circuit = null;
 
         if (autoPullAvailable) {
             setAutoPullItemList(nbt.getBoolean("autoPull"));
@@ -365,7 +364,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
         if (!autoPullItemList) {
             NBTTagList stockingItems = nbt.getTagList("itemsToStock", 10);
             for (int i = 0; i < stockingItems.tagCount(); i++) {
-                this.mInventory[i] = GT_Utility.loadItem(stockingItems.getCompoundTagAt(i));
+                this.mInventory[i] = GTUtility.loadItem(stockingItems.getCompoundTagAt(i));
             }
         }
         setInventorySlotContents(getCircuitSlot(), circuit);
@@ -380,13 +379,13 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
         tag.setInteger("minStackSize", minAutoPullStackSize);
         tag.setInteger("refreshTime", autoPullRefreshTime);
         tag.setBoolean("additionalConnection", additionalConnection);
-        tag.setTag("circuit", GT_Utility.saveItem(getStackInSlot(getCircuitSlot())));
+        tag.setTag("circuit", GTUtility.saveItem(getStackInSlot(getCircuitSlot())));
 
         NBTTagList stockingItems = new NBTTagList();
 
         if (!autoPullItemList) {
             for (int index = 0; index < SLOT_COUNT; index++) {
-                stockingItems.appendTag(GT_Utility.saveItem(mInventory[index]));
+                stockingItems.appendTag(GTUtility.saveItem(mInventory[index]));
             }
             tag.setTag("itemsToStock", stockingItems);
         }
@@ -506,7 +505,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
             while (iterator.hasNext() && index < SLOT_COUNT) {
                 IAEItemStack currItem = iterator.next();
                 if (currItem.getStackSize() >= minAutoPullStackSize) {
-                    ItemStack itemstack = GT_Utility.copyAmount(1, currItem.getItemStack());
+                    ItemStack itemstack = GTUtility.copyAmount(1, currItem.getItemStack());
                     if (expediteRecipeCheck) {
                         ItemStack previous = this.mInventory[index];
                         if (itemstack != null) {
@@ -531,7 +530,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
     }
 
     @Override
-    public CheckRecipeResult endRecipeProcessing(GT_MetaTileEntity_MultiBlockBase controller) {
+    public CheckRecipeResult endRecipeProcessing(MTEMultiBlockBase controller) {
         CheckRecipeResult checkRecipeResult = CheckRecipeResultRegistry.SUCCESSFUL;
         for (int i = 0; i < SLOT_COUNT; ++i) {
             if (savedStackSizes[i] != 0) {
@@ -656,7 +655,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
                             getMcSlot().putStack(null);
                         } else {
                             if (containsSuchStack(cursorStack)) return;
-                            getMcSlot().putStack(GT_Utility.copyAmount(1, cursorStack));
+                            getMcSlot().putStack(GTUtility.copyAmount(1, cursorStack));
                         }
                         if (getBaseMetaTileEntity().isServerSide()) {
                             final ItemStack newInfo = updateInformationSlot(aSlotIndex, cursorStack);
@@ -669,11 +668,11 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
                     public IDrawable[] getBackground() {
                         IDrawable slot;
                         if (autoPullItemList) {
-                            slot = GT_UITextures.SLOT_DARK_GRAY;
+                            slot = GTUITextures.SLOT_DARK_GRAY;
                         } else {
                             slot = ModularUITextures.ITEM_SLOT;
                         }
-                        return new IDrawable[] { slot, GT_UITextures.OVERLAY_SLOT_ARROW_ME };
+                        return new IDrawable[] { slot, GTUITextures.OVERLAY_SLOT_ARROW_ME };
                     }
 
                     @Override
@@ -689,7 +688,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
 
                     private boolean containsSuchStack(ItemStack tStack) {
                         for (int i = 0; i < 16; ++i) {
-                            if (GT_Utility.areStacksEqual(mInventory[i], tStack, false)) return true;
+                            if (GTUtility.areStacksEqual(mInventory[i], tStack, false)) return true;
                         }
                         return false;
                     }
@@ -709,13 +708,13 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
                     .startFromSlot(16)
                     .endAtSlot(31)
                     .phantom(true)
-                    .background(GT_UITextures.SLOT_DARK_GRAY)
+                    .background(GTUITextures.SLOT_DARK_GRAY)
                     .widgetCreator(
                         slot -> aeSlotWidgets[slot.getSlotIndex() - 16] = new AESlotWidget(slot).disableInteraction())
                     .build()
                     .setPos(97, 9))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_DOUBLE)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_DOUBLE)
                     .setPos(82, 30)
                     .setSize(12, 12));
 
@@ -730,11 +729,11 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
             })
                 .setBackground(() -> {
                     if (autoPullItemList) {
-                        return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED,
-                            GT_UITextures.OVERLAY_BUTTON_AUTOPULL_ME };
+                        return new IDrawable[] { GTUITextures.BUTTON_STANDARD_PRESSED,
+                            GTUITextures.OVERLAY_BUTTON_AUTOPULL_ME };
                     } else {
-                        return new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
-                            GT_UITextures.OVERLAY_BUTTON_AUTOPULL_ME_DISABLED };
+                        return new IDrawable[] { GTUITextures.BUTTON_STANDARD,
+                            GTUITextures.OVERLAY_BUTTON_AUTOPULL_ME_DISABLED };
                     }
                 })
                 .addTooltips(
@@ -769,7 +768,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
         final int PARENT_WIDTH = getGUIWidth();
         final int PARENT_HEIGHT = getGUIHeight();
         ModularWindow.Builder builder = ModularWindow.builder(WIDTH, HEIGHT);
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.setGuiTint(getGUIColorization());
         builder.setDraggable(true);
         builder.setPos(
@@ -790,7 +789,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
                     .setTextColor(Color.WHITE.normal)
                     .setSize(70, 18)
                     .setPos(3, 18)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD));
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD));
         builder.widget(
             TextWidget.localised("GT5U.machines.stocking_bus.refresh_time")
                 .setPos(3, 42)
@@ -804,7 +803,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
                     .setTextColor(Color.WHITE.normal)
                     .setSize(70, 18)
                     .setPos(3, 58)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD));
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD));
         builder.widget(
             TextWidget.localised("GT5U.machines.stocking_bus.force_check")
                 .setPos(3, 88)
@@ -812,9 +811,9 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
             .widget(
                 new CycleButtonWidget().setToggle(() -> expediteRecipeCheck, val -> setRecipeCheck(val))
                     .setTextureGetter(
-                        state -> expediteRecipeCheck ? GT_UITextures.OVERLAY_BUTTON_CHECKMARK
-                            : GT_UITextures.OVERLAY_BUTTON_CROSS)
-                    .setBackground(GT_UITextures.BUTTON_STANDARD)
+                        state -> expediteRecipeCheck ? GTUITextures.OVERLAY_BUTTON_CHECKMARK
+                            : GTUITextures.OVERLAY_BUTTON_CROSS)
+                    .setBackground(GTUITextures.BUTTON_STANDARD)
                     .setPos(53, 87)
                     .setSize(16, 16)
                     .addTooltip(StatCollector.translateToLocal("GT5U.machines.stocking_bus.hatch_warning")));
@@ -846,7 +845,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
             currenttip.add(
                 StatCollector.translateToLocalFormatted(
                     "GT5U.waila.stocking_bus.min_stack_size",
-                    GT_Utility.formatNumbers(minSize)));
+                    GTUtility.formatNumbers(minSize)));
         }
         super.getWailaBody(itemStack, currenttip, accessor, config);
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchInputME.java
index d59dbb9ce8..251023125a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchInputME.java
@@ -1,7 +1,7 @@
 package gregtech.common.tileentities.machines;
 
-import static gregtech.api.enums.GT_Values.TIER_COLORS;
-import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.TIER_COLORS;
+import static gregtech.api.enums.GTValues.VN;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_INPUT_FLUID_HATCH;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_INPUT_FLUID_HATCH_ACTIVE;
 
@@ -64,26 +64,26 @@ import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.IGridProxyable;
 import appeng.util.item.AEFluidStack;
 import gregtech.api.enums.ItemList;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IDataCopyable;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
 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_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_Input implements IPowerChannelState,
-    IAddGregtechLogo, IAddUIWidgets, IRecipeProcessingAwareHatch, ISmartInputHatch, IDataCopyable {
+public class MTEHatchInputME extends MTEHatchInput implements IPowerChannelState, IAddGregtechLogo, IAddUIWidgets,
+    IRecipeProcessingAwareHatch, ISmartInputHatch, IDataCopyable {
 
     private static final int SLOT_COUNT = 16;
     public static final String COPIED_DATA_IDENTIFIER = "stockingHatch";
@@ -116,12 +116,12 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
 
     protected static final FluidStack[] EMPTY_FLUID_STACK = new FluidStack[0];
 
-    public GT_MetaTileEntity_Hatch_Input_ME(int aID, boolean autoPullAvailable, String aName, String aNameRegional) {
+    public MTEHatchInputME(int aID, boolean autoPullAvailable, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, autoPullAvailable ? 10 : 8, 1, getDescriptionArray(autoPullAvailable));
         this.autoPullAvailable = autoPullAvailable;
     }
 
-    public GT_MetaTileEntity_Hatch_Input_ME(String aName, boolean autoPullAvailable, int aTier, String[] aDescription,
+    public MTEHatchInputME(String aName, boolean autoPullAvailable, int aTier, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, 1, aTier, aDescription, aTextures);
         this.autoPullAvailable = autoPullAvailable;
@@ -129,7 +129,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Input_ME(mName, autoPullAvailable, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchInputME(mName, autoPullAvailable, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -171,7 +171,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
             while (iterator.hasNext() && index < SLOT_COUNT) {
                 IAEFluidStack currItem = iterator.next();
                 if (currItem.getStackSize() >= minAutoPullAmount) {
-                    FluidStack fluidStack = GT_Utility.copyAmount(1, currItem.getFluidStack());
+                    FluidStack fluidStack = GTUtility.copyAmount(1, currItem.getFluidStack());
                     if (expediteRecipeCheck) {
                         FluidStack previous = storedFluids[index];
                         if (fluidStack != null && previous != null) {
@@ -246,7 +246,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
         if (side != ForgeDirection.UNKNOWN) return null;
         FluidStack stored = getMatchingFluidStack(aFluid);
         if (stored == null) return null;
-        FluidStack drained = GT_Utility.copyAmount(Math.min(stored.amount, aFluid.amount), stored);
+        FluidStack drained = GTUtility.copyAmount(Math.min(stored.amount, aFluid.amount), stored);
         if (doDrain) {
             stored.amount -= drained.amount;
         }
@@ -260,7 +260,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
     }
 
     @Override
-    public CheckRecipeResult endRecipeProcessing(GT_MetaTileEntity_MultiBlockBase controller) {
+    public CheckRecipeResult endRecipeProcessing(MTEMultiBlockBase controller) {
         CheckRecipeResult checkRecipeResult = CheckRecipeResultRegistry.SUCCESSFUL;
         AENetworkProxy proxy = getProxy();
 
@@ -440,7 +440,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
                 continue;
             }
 
-            if (GT_Utility.areFluidsEqual(fluidStack, storedFluids[i], false)) {
+            if (GTUtility.areFluidsEqual(fluidStack, storedFluids[i], false)) {
                 updateInformationSlot(i);
                 if (storedInformationFluids[i] != null) {
                     setSavedFluid(i, storedInformationFluids[i]);
@@ -473,7 +473,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
                 continue;
             }
 
-            if (GT_Utility.areFluidsEqual(fluidStack, storedFluids[i], false)) {
+            if (GTUtility.areFluidsEqual(fluidStack, storedFluids[i], false)) {
                 return i;
             }
         }
@@ -534,12 +534,12 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
             int c = Math.min(nbtTagList.tagCount(), SLOT_COUNT);
             for (int i = 0; i < c; i++) {
                 NBTTagCompound nbtTagCompound = nbtTagList.getCompoundTagAt(i);
-                FluidStack fluidStack = GT_Utility.loadFluid(nbtTagCompound);
+                FluidStack fluidStack = GTUtility.loadFluid(nbtTagCompound);
                 storedFluids[i] = fluidStack;
 
                 if (nbtTagCompound.hasKey("informationAmount")) {
                     int informationAmount = nbtTagCompound.getInteger("informationAmount");
-                    storedInformationFluids[i] = GT_Utility.copyAmount(informationAmount, fluidStack);
+                    storedInformationFluids[i] = GTUtility.copyAmount(informationAmount, fluidStack);
                 }
             }
         }
@@ -585,7 +585,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
         if (!autoPullFluidList) {
             NBTTagList stockingFluids = nbt.getTagList("fluidsToStock", 10);
             for (int i = 0; i < stockingFluids.tagCount(); i++) {
-                storedFluids[i] = GT_Utility.loadFluid(stockingFluids.getCompoundTagAt(i));
+                storedFluids[i] = GTUtility.loadFluid(stockingFluids.getCompoundTagAt(i));
             }
         }
         return true;
@@ -651,7 +651,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
 
     public boolean containsSuchStack(FluidStack tStack) {
         for (int i = 0; i < 16; ++i) {
-            if (GT_Utility.areFluidsEqual(storedFluids[i], tStack, false)) {
+            if (GTUtility.areFluidsEqual(storedFluids[i], tStack, false)) {
                 return true;
             }
         }
@@ -702,11 +702,11 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
                     public IDrawable[] getBackground() {
                         IDrawable slot;
                         if (autoPullFluidList) {
-                            slot = GT_UITextures.SLOT_DARK_GRAY;
+                            slot = GTUITextures.SLOT_DARK_GRAY;
                         } else {
                             slot = ModularUITextures.FLUID_SLOT;
                         }
-                        return new IDrawable[] { slot, GT_UITextures.OVERLAY_SLOT_ARROW_ME };
+                        return new IDrawable[] { slot, GTUITextures.OVERLAY_SLOT_ARROW_ME };
                     }
 
                     @Override
@@ -765,7 +765,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
                         }
                     }
                 }.setUpdateTooltipEveryTick(true))
-                .background(GT_UITextures.SLOT_DARK_GRAY)
+                .background(GTUITextures.SLOT_DARK_GRAY)
                 .controlsAmount(true)
                 .build()
                 .setPos(new Pos2d(97, 9)));
@@ -782,11 +782,11 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
                 .setPlayClickSound(true)
                 .setBackground(() -> {
                     if (autoPullFluidList) {
-                        return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED,
-                            GT_UITextures.OVERLAY_BUTTON_AUTOPULL_ME };
+                        return new IDrawable[] { GTUITextures.BUTTON_STANDARD_PRESSED,
+                            GTUITextures.OVERLAY_BUTTON_AUTOPULL_ME };
                     } else {
-                        return new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
-                            GT_UITextures.OVERLAY_BUTTON_AUTOPULL_ME_DISABLED };
+                        return new IDrawable[] { GTUITextures.BUTTON_STANDARD,
+                            GTUITextures.OVERLAY_BUTTON_AUTOPULL_ME_DISABLED };
                     }
                 })
                 .addTooltips(
@@ -799,7 +799,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
         }
 
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_DOUBLE)
+            new DrawableWidget().setDrawable(GTUITextures.PICTURE_ARROW_DOUBLE)
                 .setPos(82, 30)
                 .setSize(12, 12))
             .widget(TextWidget.dynamicString(() -> {
@@ -831,7 +831,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
         final int PARENT_WIDTH = getGUIWidth();
         final int PARENT_HEIGHT = getGUIHeight();
         ModularWindow.Builder builder = ModularWindow.builder(WIDTH, HEIGHT);
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.setGuiTint(getGUIColorization());
         builder.setDraggable(true);
         builder.setPos(
@@ -852,7 +852,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
                     .setTextColor(Color.WHITE.normal)
                     .setSize(70, 18)
                     .setPos(3, 18)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD));
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD));
         builder.widget(
             TextWidget.localised("GT5U.machines.stocking_bus.refresh_time")
                 .setPos(3, 42)
@@ -866,7 +866,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
                     .setTextColor(Color.WHITE.normal)
                     .setSize(70, 18)
                     .setPos(3, 58)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD));
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD));
         builder.widget(
             TextWidget.localised("GT5U.machines.stocking_bus.force_check")
                 .setPos(3, 88)
@@ -874,9 +874,9 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
             .widget(
                 new CycleButtonWidget().setToggle(() -> expediteRecipeCheck, val -> setRecipeCheck(val))
                     .setTextureGetter(
-                        state -> expediteRecipeCheck ? GT_UITextures.OVERLAY_BUTTON_CHECKMARK
-                            : GT_UITextures.OVERLAY_BUTTON_CROSS)
-                    .setBackground(GT_UITextures.BUTTON_STANDARD)
+                        state -> expediteRecipeCheck ? GTUITextures.OVERLAY_BUTTON_CHECKMARK
+                            : GTUITextures.OVERLAY_BUTTON_CROSS)
+                    .setBackground(GTUITextures.BUTTON_STANDARD)
                     .setPos(53, 87)
                     .setSize(16, 16)
                     .addTooltip(StatCollector.translateToLocal("GT5U.machines.stocking_bus.hatch_warning")));
@@ -908,7 +908,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
             currenttip.add(
                 StatCollector.translateToLocalFormatted(
                     "GT5U.waila.stocking_hatch.min_amount",
-                    GT_Utility.formatNumbers(minSize)));
+                    GTUtility.formatNumbers(minSize)));
         }
         super.getWailaBody(itemStack, currenttip, accessor, config);
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java
index f4d78ec9b3..969d9c6c05 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java
@@ -38,18 +38,17 @@ import appeng.me.helpers.IGridProxyable;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.Platform;
 import appeng.util.ReadableNumberConverter;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
+import gregtech.api.metatileentity.implementations.MTEHatchOutputBus;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatch_OutputBus
-    implements IPowerChannelState {
+public class MTEHatchOutputBusME extends MTEHatchOutputBus implements IPowerChannelState {
 
     private long baseCapacity = 1_600;
 
@@ -63,7 +62,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
     long tickCounter = 0;
     boolean additionalConnection = false;
 
-    public GT_MetaTileEntity_Hatch_OutputBus_ME(int aID, String aName, String aNameRegional) {
+    public MTEHatchOutputBusME(int aID, String aName, String aNameRegional) {
         super(
             aID,
             aName,
@@ -75,14 +74,13 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
             1);
     }
 
-    public GT_MetaTileEntity_Hatch_OutputBus_ME(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchOutputBusME(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_OutputBus_ME(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchOutputBusME(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -177,7 +175,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -284,7 +282,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
         for (IAEItemStack s : itemCache) {
             if (s.getStackSize() == 0) continue;
             NBTTagCompound tag = new NBTTagCompound();
-            tag.setTag("itemStack", GT_Utility.saveItem(s.getItemStack()));
+            tag.setTag("itemStack", GTUtility.saveItem(s.getItemStack()));
             tag.setLong("size", s.getStackSize());
             items.appendTag(tag);
         }
@@ -302,7 +300,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
         if (t instanceof NBTTagCompound) itemCache.add(
             AEApi.instance()
                 .storage()
-                .createItemStack(GT_Utility.loadItem((NBTTagCompound) t)));
+                .createItemStack(GTUtility.loadItem((NBTTagCompound) t)));
         t = aNBT.getTag("cachedItems");
         if (t instanceof NBTTagList l) {
             for (int i = 0; i < l.tagCount(); ++i) {
@@ -311,18 +309,18 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
                     itemCache.add(
                         AEApi.instance()
                             .storage()
-                            .createItemStack(GT_Utility.loadItem(l.getCompoundTagAt(i))));
+                            .createItemStack(GTUtility.loadItem(l.getCompoundTagAt(i))));
                     continue;
                 }
                 NBTTagCompound tagItemStack = tag.getCompoundTag("itemStack");
                 final IAEItemStack s = AEApi.instance()
                     .storage()
-                    .createItemStack(GT_Utility.loadItem(tagItemStack));
+                    .createItemStack(GTUtility.loadItem(tagItemStack));
                 if (s != null) {
                     s.setStackSize(tag.getLong("size"));
                     itemCache.add(s);
                 } else {
-                    GT_Mod.GT_FML_LOGGER.warn(
+                    GTMod.GT_FML_LOGGER.warn(
                         "An error occurred while loading contents of ME Output Bus. This item has been voided: "
                             + tagItemStack);
                 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java
index b173987aa2..5983a2d32a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java
@@ -45,18 +45,18 @@ import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.IGridProxyable;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.ReadableNumberConverter;
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_Output implements IPowerChannelState {
+public class MTEHatchOutputME extends MTEHatchOutput implements IPowerChannelState {
 
     private long baseCapacity = 128_000;
 
@@ -70,7 +70,7 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
     long tickCounter = 0;
     boolean additionalConnection = false;
 
-    public GT_MetaTileEntity_Hatch_Output_ME(int aID, String aName, String aNameRegional) {
+    public MTEHatchOutputME(int aID, String aName, String aNameRegional) {
         super(
             aID,
             aName,
@@ -82,13 +82,13 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
             1);
     }
 
-    public GT_MetaTileEntity_Hatch_Output_ME(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchOutputME(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Output_ME(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchOutputME(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -103,7 +103,7 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
 
     @Override
     public byte getTierForStructure() {
-        return (byte) (GT_Values.V.length - 2);
+        return (byte) (GTValues.V.length - 2);
     }
 
     @Override
@@ -198,7 +198,7 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -338,12 +338,12 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
                 NBTTagCompound tagFluidStack = tag.getCompoundTag("fluidStack");
                 final IAEFluidStack s = AEApi.instance()
                     .storage()
-                    .createFluidStack(GT_Utility.loadFluid(tagFluidStack));
+                    .createFluidStack(GTUtility.loadFluid(tagFluidStack));
                 if (s != null) {
                     s.setStackSize(tag.getLong("size"));
                     fluidCache.add(s);
                 } else {
-                    GT_Mod.GT_FML_LOGGER.warn(
+                    GTMod.GT_FML_LOGGER.warn(
                         "An error occurred while loading contents of ME Output Hatch. This fluid has been voided: "
                             + tagFluidStack);
                 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java
index 78ed9982fc..fc4aefcf14 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java
@@ -16,7 +16,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_GLOW;
-import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation;
+import static gregtech.common.UndergroundOil.undergroundOilReadInformation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,22 +33,22 @@ import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 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.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.objects.ItemData;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.BlockOresAbstract;
+import gregtech.common.blocks.TileEntityOres;
 import ic2.core.Ic2Items;
 
-public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_BasicMachine {
+public class MTEAdvSeismicProspector extends MTEBasicMachine {
 
     boolean ready = false;
     final int radius;
@@ -56,8 +56,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
     int cX;
     int cZ;
 
-    public GT_MetaTileEntity_AdvSeismicProspector(int aID, String aName, String aNameRegional, int aTier, int aRadius,
-        int aStep) {
+    public MTEAdvSeismicProspector(int aID, String aName, String aNameRegional, int aTier, int aRadius, int aStep) {
         super(
             aID,
             aName,
@@ -128,8 +127,8 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
             "Oil prospecting area 3x3 oilfields, each is 8x8 chunks" };
     }
 
-    protected GT_MetaTileEntity_AdvSeismicProspector(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures, int aRadius, int aStep) {
+    protected MTEAdvSeismicProspector(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
+        int aRadius, int aStep) {
         super(aName, aTier, 1, aDescription, aTextures, 1, 1);
         radius = aRadius;
         step = aStep;
@@ -137,7 +136,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_AdvSeismicProspector(
+        return new MTEAdvSeismicProspector(
             this.mName,
             this.mTier,
             this.mDescriptionArray,
@@ -151,10 +150,10 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
         if (aBaseMetaTileEntity.isServerSide()) {
             ItemStack aStack = aPlayer.getCurrentEquippedItem();
 
-            if (!ready && (GT_Utility.consumeItems(aPlayer, aStack, Item.getItemFromBlock(Blocks.tnt), 16)
-                || GT_Utility.consumeItems(aPlayer, aStack, Ic2Items.industrialTnt.getItem(), 8)
-                || GT_Utility.consumeItems(aPlayer, aStack, Materials.Glyceryl, 4)
-                || GT_Utility.consumeItems(aPlayer, aStack, ItemList.Block_Powderbarrel.getItem(), 2))) {
+            if (!ready && (GTUtility.consumeItems(aPlayer, aStack, Item.getItemFromBlock(Blocks.tnt), 16)
+                || GTUtility.consumeItems(aPlayer, aStack, Ic2Items.industrialTnt.getItem(), 8)
+                || GTUtility.consumeItems(aPlayer, aStack, Materials.Glyceryl, 4)
+                || GTUtility.consumeItems(aPlayer, aStack, ItemList.Block_Powderbarrel.getItem(), 2))) {
 
                 this.ready = true;
                 this.mMaxProgresstime = (aPlayer.capabilities.isCreativeMode ? 20 : 800);
@@ -174,7 +173,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
                     ArrayList<String> tOils = new ArrayList<>();
                     prospectOils(tOils);
 
-                    GT_Utility.ItemNBT.setAdvancedProspectionData(
+                    GTUtility.ItemNBT.setAdvancedProspectionData(
                         mTier,
                         aStack,
                         this.getBaseMetaTileEntity()
@@ -186,7 +185,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
                         this.getBaseMetaTileEntity()
                             .getWorld().provider.dimensionId,
                         tOils,
-                        GT_Utility.sortByValueToList(tOres),
+                        GTUtility.sortByValueToList(tOres),
                         radius);
                 }
         }
@@ -275,15 +274,14 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
         Block tBlock = this.getBaseMetaTileEntity()
             .getBlock(x, y, z);
 
-        if (tBlock instanceof GT_Block_Ores_Abstract) {
+        if (tBlock instanceof BlockOresAbstract) {
             TileEntity tTileEntity = getBaseMetaTileEntity().getWorld()
                 .getTileEntity(x, y, z);
 
-            if ((tTileEntity instanceof GT_TileEntity_Ores) && (((GT_TileEntity_Ores) tTileEntity).mMetaData < 16000)) { // Filtering
-                                                                                                                         // small
-                                                                                                                         // ores
-                Materials tMaterial = GregTech_API.sGeneratedMaterials[((GT_TileEntity_Ores) tTileEntity).mMetaData
-                    % 1000];
+            if ((tTileEntity instanceof TileEntityOres) && (((TileEntityOres) tTileEntity).mMetaData < 16000)) { // Filtering
+                                                                                                                 // small
+                                                                                                                 // ores
+                Materials tMaterial = GregTechAPI.sGeneratedMaterials[((TileEntityOres) tTileEntity).mMetaData % 1000];
 
                 if ((tMaterial != null) && (tMaterial != Materials._NULL)) return tMaterial.mDefaultLocalName;
             }
@@ -291,10 +289,10 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
             int tMetaID = getBaseMetaTileEntity().getWorld()
                 .getBlockMetadata(x, y, z);
             ItemStack is = new ItemStack(tBlock, 1, tMetaID);
-            ItemData association = GT_OreDictUnificator.getAssociation(is);
+            ItemData association = GTOreDictUnificator.getAssociation(is);
             if ((association != null) && (association.mPrefix.toString()
                 .startsWith("ore"))) return association.mMaterial.mMaterial.mDefaultLocalName;
-            else if (GT_Utility.isOre(tBlock, tMetaID)) return tBlock.getLocalizedName();
+            else if (GTUtility.isOre(tBlock, tMetaID)) return tBlock.getLocalizedName();
         }
         return null;
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_BetterJukebox.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEBetterJukebox.java
index f9a9fba8f4..8f1db317a2 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_BetterJukebox.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEBetterJukebox.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_OUT;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_JUKEBOX;
@@ -44,22 +44,21 @@ import appeng.me.GridAccessException;
 import appeng.me.cache.helpers.TunnelCollection;
 import appeng.me.helpers.AENetworkProxy;
 import appeng.parts.p2p.PartP2PSound;
-import gregtech.api.enums.GTVoltageIndex;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.enums.GTValues;
+import gregtech.api.enums.VoltageIndex;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.BasicUIProperties;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_MusicSystem;
+import gregtech.api.util.GTMusicSystem;
 import gregtech.common.gui.modularui.UIHelper;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 
-public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMachine
-    implements IAddUIWidgets, ISoundP2PHandler {
+public class MTEBetterJukebox extends MTEBasicMachine implements IAddUIWidgets, ISoundP2PHandler {
 
     // Stored state
     public UUID jukeboxUuid = UNSET_UUID;
@@ -73,7 +72,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
     public boolean superFastDebugMode = false;
     // Computed state
     private final Vector4i interdimPositionCache = new Vector4i(); // XYZ, Dimension ID
-    private GT_MusicSystem.MusicSource musicSource = null;
+    private GTMusicSystem.MusicSource musicSource = null;
     private boolean powered = false;
     private long discStartMs = 0;
     public long discDurationMs = 1;
@@ -95,7 +94,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
 
     public static final class BalanceMath {
 
-        public static int MAX_TIER = GTVoltageIndex.IV;
+        public static int MAX_TIER = VoltageIndex.IV;
         public static float VANILLA_JUKEBOX_RANGE = 4.0f; // 64 blocks
 
         private static final float[] LISTENING_VOLUME = new float[] { //
@@ -127,9 +126,9 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
         }
 
         public static HeadphoneLimit headphoneLimit(int tier) {
-            if (tier <= GTVoltageIndex.HV) {
+            if (tier <= VoltageIndex.HV) {
                 return HeadphoneLimit.BLOCK_RANGE;
-            } else if (tier == GTVoltageIndex.EV) {
+            } else if (tier == VoltageIndex.EV) {
                 return HeadphoneLimit.INSIDE_DIMENSION;
             } else {
                 return HeadphoneLimit.BETWEEN_DIMENSIONS;
@@ -173,23 +172,23 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
                 .format("Headphones work anywhere, in %sany dimension", EnumChatFormatting.WHITE);
         });
         strings.add(String.format("Cost: %s%d EU/t", EnumChatFormatting.WHITE, BalanceMath.eutUsage(aTier)));
-        strings.add(GT_Values.AuthorEigenRaven);
+        strings.add(GTValues.AuthorEigenRaven);
         return strings.toArray(new String[0]);
     }
 
-    public GT_MetaTileEntity_BetterJukebox(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEBetterJukebox(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1, buildDescription(aTier), INPUT_SLOTS, 1);
         playbackVolume = BalanceMath.listeningVolume(aTier);
     }
 
-    public GT_MetaTileEntity_BetterJukebox(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBetterJukebox(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, INPUT_SLOTS, 1);
         playbackVolume = BalanceMath.listeningVolume(aTier);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BetterJukebox(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEBetterJukebox(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -223,7 +222,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
             markDirty();
         }
         if (musicSource == null) {
-            musicSource = GT_MusicSystem.ServerSystem.registerOrGetMusicSource(jukeboxUuid);
+            musicSource = GTMusicSystem.ServerSystem.registerOrGetMusicSource(jukeboxUuid);
             musicSource.originPosition.set(interdimPosition);
             musicSource.headphoneLimit = BalanceMath.headphoneLimit(mTier);
             musicSource.headphoneBlockRange = BalanceMath.headphoneBlockRange(mTier);
@@ -235,7 +234,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
             final ResourceLocation resource = record.getRecordResource(record.recordName);
             currentlyPlaying = record;
             // Assume a safe disc duration of 500 seconds if not known in the registry
-            discDurationMs = GT_MusicSystem.getMusicRecordDurations()
+            discDurationMs = GTMusicSystem.getMusicRecordDurations()
                 .getOrDefault(resource, 500_000);
             discStartMs = System.currentTimeMillis() - discProgressMs;
             musicSource.setRecord(
@@ -324,7 +323,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
                     musicSource.setRecord(
                         new ResourceLocation(resource.getResourceDomain(), "records." + resource.getResourcePath()));
                     // Assume a safe disc duration of 500 seconds if not known in the registry
-                    discDurationMs = GT_MusicSystem.getMusicRecordDurations()
+                    discDurationMs = GTMusicSystem.getMusicRecordDurations()
                         .getOrDefault(resource, 500_000);
                     discProgressMs = 0;
                     discStartMs = now;
@@ -395,7 +394,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
         if (jukeboxUuid == UNSET_UUID) {
             return;
         }
-        GT_MusicSystem.ServerSystem.removeMusicSource(jukeboxUuid);
+        GTMusicSystem.ServerSystem.removeMusicSource(jukeboxUuid);
     }
 
     @Override
@@ -490,7 +489,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
             .itemOutputPositionsGetter(count -> UIHelper.getGridPositions(count, 153, 24, 1))
             .specialItemPositionGetter(() -> new Pos2d(115, 62))
             .progressBarPos(Pos2d.cartesian(133, 24))
-            .progressBarTexture(new FallbackableUITexture(GT_UITextures.PROGRESSBAR_ARROW))
+            .progressBarTexture(new FallbackableUITexture(GTUITextures.PROGRESSBAR_ARROW))
             .build();
     }
 
@@ -530,8 +529,8 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
         // Loop
         builder.widget(
             new CycleButtonWidget().setToggle(() -> loopMode, val -> loopMode = val)
-                .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
-                .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+                .setStaticTexture(GTUITextures.OVERLAY_BUTTON_CYCLIC)
+                .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
                 .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.betterjukebox.loop.tooltip"))
                 .setTooltipShowUpDelay(TOOLTIP_DELAY)
                 .setPos(153, 6)
@@ -545,8 +544,8 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
                 playbackSlot = 0;
             }
         })
-            .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_SHUFFLE)
-            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+            .setStaticTexture(GTUITextures.OVERLAY_BUTTON_SHUFFLE)
+            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
             .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.betterjukebox.shuffle.tooltip"))
             .setTooltipShowUpDelay(TOOLTIP_DELAY)
             .setPos(153, 42)
@@ -632,7 +631,7 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach
     private final ObjectArrayList<PartP2PSound> combinedOutputsListCache = new ObjectArrayList<>(new PartP2PSound[0]);
 
     private void updateEmitterList() {
-        final GT_MusicSystem.MusicSource target = musicSource;
+        final GTMusicSystem.MusicSource target = musicSource;
         if (target == null) {
             return;
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEBoxinator.java
index 8d2e0959e1..43d2d6b295 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEBoxinator.java
@@ -3,26 +3,27 @@ package gregtech.common.tileentities.machines.basic;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.MachineType;
 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_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 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;
 
-public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine {
+public class MTEBoxinator extends MTEBasicMachine {
 
     ItemStack aInputCache;
     ItemStack aOutputCache;
     int aTypeCache = 0;
 
-    public GT_MetaTileEntity_Boxinator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEBoxinator(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -96,13 +97,13 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
                     .build()));
     }
 
-    public GT_MetaTileEntity_Boxinator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEBoxinator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, 2, 1);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boxinator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEBoxinator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -138,11 +139,11 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
         }
         ItemStack tSlot0 = getInputAt(0);
         ItemStack tSlot1 = getInputAt(1);
-        if ((GT_Utility.isStackValid(tSlot0)) && (GT_Utility.isStackValid(tSlot1))
-            && (GT_Utility.getContainerItem(tSlot0, true) == null)) {
+        if ((GTUtility.isStackValid(tSlot0)) && (GTUtility.isStackValid(tSlot1))
+            && (GTUtility.getContainerItem(tSlot0, true) == null)) {
             if ((ItemList.Schematic_1by1.isStackEqual(tSlot1)) && (tSlot0.stackSize >= 1)) {
                 boolean tIsCached = hasValidCache(tSlot0, 1, true);
-                this.mOutputItems[0] = tIsCached ? aOutputCache.copy() : GT_ModHandler.getRecipeOutput(tSlot0);
+                this.mOutputItems[0] = tIsCached ? aOutputCache.copy() : GTModHandler.getRecipeOutput(tSlot0);
                 if (this.mOutputItems[0] != null) {
                     if (canOutput(this.mOutputItems[0])) {
                         tSlot0.stackSize -= 1;
@@ -159,7 +160,7 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
             if ((ItemList.Schematic_2by2.isStackEqual(tSlot1)) && (getInputAt(0).stackSize >= 4)) {
                 boolean tIsCached = hasValidCache(tSlot0, 2, true);
                 this.mOutputItems[0] = tIsCached ? aOutputCache.copy()
-                    : GT_ModHandler.getRecipeOutput(tSlot0, tSlot0, null, tSlot0, tSlot0);
+                    : GTModHandler.getRecipeOutput(tSlot0, tSlot0, null, tSlot0, tSlot0);
                 if (this.mOutputItems[0] != null) {
                     if (canOutput(this.mOutputItems[0])) {
                         getInputAt(0).stackSize -= 4;
@@ -176,7 +177,7 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
             if ((ItemList.Schematic_3by3.isStackEqual(tSlot1)) && (getInputAt(0).stackSize >= 9)) {
                 boolean tIsCached = hasValidCache(tSlot0, 3, true);
                 this.mOutputItems[0] = tIsCached ? aOutputCache.copy()
-                    : GT_ModHandler
+                    : GTModHandler
                         .getRecipeOutput(tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0);
                 if (this.mOutputItems[0] != null) {
                     if (canOutput(this.mOutputItems[0])) {
@@ -208,20 +209,21 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
             if (RecipeMaps.packagerRecipes.findRecipe(
                 getBaseMetaTileEntity(),
                 true,
-                gregtech.api.enums.GT_Values.V[mTier],
+                GTValues.V[mTier],
                 null,
-                GT_Utility.copyAmount(64, aStack),
+                GTUtility.copyAmount(64, aStack),
                 tInput1) != null) {
                 return true;
             }
-            if (ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) && GT_ModHandler.getRecipeOutput(aStack) != null)
+            if (ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) && GTModHandler.getRecipeOutput(aStack) != null)
                 return true;
             if (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))
-                && GT_ModHandler.getRecipeOutput(aStack, aStack, null, aStack, aStack) != null) {
+                && GTModHandler.getRecipeOutput(aStack, aStack, null, aStack, aStack) != null) {
                 return true;
             }
-            return ItemList.Schematic_3by3.isStackEqual(getInputAt(1)) && (GT_ModHandler
-                .getRecipeOutput(aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack) != null);
+            return ItemList.Schematic_3by3.isStackEqual(getInputAt(1))
+                && (GTModHandler.getRecipeOutput(aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack)
+                    != null);
         } else {
             return RecipeMaps.packagerRecipes.containsInput(aStack);
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTECharger.java
index de43fd715e..52c15cc6df 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTECharger.java
@@ -1,36 +1,33 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 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.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicBatteryBuffer;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuffer {
+public class MTECharger extends MTEBasicBatteryBuffer {
 
-    public GT_MetaTileEntity_Charger(int aID, String aName, String aNameRegional, int aTier, String aDescription,
-        int aSlotCount) {
+    public MTECharger(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
     }
 
-    public GT_MetaTileEntity_Charger(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
-        int aSlotCount) {
+    public MTECharger(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
         super(aName, aTier, aDescription, aTextures, aSlotCount);
     }
 
-    public GT_MetaTileEntity_Charger(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
-        int aSlotCount) {
+    public MTECharger(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int aSlotCount) {
         super(aName, aTier, aDescription, aTextures, aSlotCount);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Charger(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
+        return new MTECharger(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
     }
 
     @Override
@@ -68,9 +65,9 @@ public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuf
                             if (mMetaTileEntity.mInventory[i] != null
                                 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
                                 mBaseMetaTileEntity.increaseStoredEnergyUnits(
-                                    GT_ModHandler.dischargeElectricItem(
+                                    GTModHandler.dischargeElectricItem(
                                         mMetaTileEntity.mInventory[i],
-                                        GT_Utility.safeInt(
+                                        GTUtility.safeInt(
                                             Math.min(
                                                 V[mTier] * 15,
                                                 mBaseMetaTileEntity.getEUCapacity()
@@ -90,9 +87,9 @@ public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuf
                             if (mBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) {
                                 mBaseMetaTileEntity
                                     .decreaseStoredEU(
-                                        GT_ModHandler.chargeElectricItem(
+                                        GTModHandler.chargeElectricItem(
                                             mMetaTileEntity.mInventory[i],
-                                            GT_Utility
+                                            GTUtility
                                                 .safeInt(Math.min(V[mTier] * 15, mBaseMetaTileEntity.getStoredEU())),
                                             (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getOutputTier()),
                                             true,
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEIndustrialApiary.java
index 9249673c7c..f43c8d0a5e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEIndustrialApiary.java
@@ -1,7 +1,7 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.AuthorKuba;
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.AuthorKuba;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_INDUSTRIAL_APIARY;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE_GLOW;
@@ -20,7 +20,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_INDUSTRIAL_APIA
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_INDUSTRIAL_APIARY_GLOW;
 import static gregtech.api.metatileentity.BaseTileEntity.STALLED_STUTTERING_TOOLTIP;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -100,24 +100,24 @@ import forestry.apiculture.genetics.Bee;
 import forestry.apiculture.genetics.alleles.AlleleEffectThrottled;
 import forestry.core.errors.EnumErrorCode;
 import forestry.plugins.PluginApiculture;
-import gregtech.GT_Mod;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.GTMod;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.BasicUIProperties;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ApiaryModifier;
-import gregtech.api.util.GT_ApiaryUpgrade;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Client;
+import gregtech.api.util.GTApiaryModifier;
+import gregtech.api.util.GTApiaryUpgrade;
+import gregtech.api.util.GTUtility;
+import gregtech.common.GTClient;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicMachine
+public class MTEIndustrialApiary extends MTEBasicMachine
     implements IBeeHousing, IBeeHousingInventory, IErrorLogic, IBeeModifier, IBeeListener, IAddUIWidgets {
 
     public static final int beeCycleLength = 550;
@@ -138,7 +138,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
     private IBee usedQueenBee = null;
     private IEffectData[] effectData = new IEffectData[2];
 
-    public GT_MetaTileEntity_IndustrialApiary(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEIndustrialApiary(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -204,20 +204,19 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                     .build()));
     }
 
-    public GT_MetaTileEntity_IndustrialApiary(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEIndustrialApiary(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures, 6, 9);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_IndustrialApiary(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEIndustrialApiary(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (aBaseMetaTileEntity.isClientSide()) return true;
-        if (!GT_Mod.gregtechproxy.mForceFreeFace) {
+        if (!GTMod.gregtechproxy.mForceFreeFace) {
             openGUI(aBaseMetaTileEntity, aPlayer);
             return true;
         }
@@ -227,7 +226,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 return true;
             }
         }
-        GT_Utility.sendChatToPlayer(aPlayer, "No free Side!");
+        GTUtility.sendChatToPlayer(aPlayer, "No free Side!");
         return true;
     }
 
@@ -292,7 +291,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
 
                 // PRODUCTS
 
-                final HashMap<GT_Utility.ItemId, ItemStack> pollen = new HashMap<>();
+                final HashMap<GTUtility.ItemId, ItemStack> pollen = new HashMap<>();
 
                 if (isRetrievingPollen && floweringMod > 0f) {
                     final int icycles = (int) cycles
@@ -304,7 +303,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                                 .getSpeciesRoot()
                                 .getMemberStack(p, EnumGermlingType.POLLEN.ordinal());
                             if (s != null) {
-                                final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(s);
+                                final GTUtility.ItemId id = GTUtility.ItemId.createNoCopy(s);
                                 pollen.computeIfAbsent(id, k -> {
                                     final ItemStack ns = s.copy();
                                     ns.stackSize = 0;
@@ -326,12 +325,12 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 final float speed = genome.getSpeed();
                 final float prodMod = getProductionModifier(null, 0f) + beemodifier.getProductionModifier(null, 0f);
 
-                final HashMap<GT_Utility.ItemId, Float> drops = new HashMap<>();
-                final HashMap<GT_Utility.ItemId, ItemStack> dropstacks = new HashMap<>();
+                final HashMap<GTUtility.ItemId, Float> drops = new HashMap<>();
+                final HashMap<GTUtility.ItemId, ItemStack> dropstacks = new HashMap<>();
 
                 for (Map.Entry<ItemStack, Float> entry : primary.getProductChances()
                     .entrySet()) {
-                    final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey());
+                    final GTUtility.ItemId id = GTUtility.ItemId.createNoCopy(entry.getKey());
                     drops.merge(
                         id,
                         Bee.getFinalChance(entry.getValue(), speed, prodMod, 8f) * (float) entry.getKey().stackSize
@@ -341,7 +340,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 }
                 for (Map.Entry<ItemStack, Float> entry : secondary.getProductChances()
                     .entrySet()) {
-                    final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey());
+                    final GTUtility.ItemId id = GTUtility.ItemId.createNoCopy(entry.getKey());
                     drops.merge(
                         id,
                         Bee.getFinalChance(entry.getValue() / 2f, speed, prodMod, 8f) * (float) entry.getKey().stackSize
@@ -352,7 +351,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 if (primary.isJubilant(genome, this) && secondary.isJubilant(genome, this))
                     for (Map.Entry<ItemStack, Float> entry : primary.getSpecialtyChances()
                         .entrySet()) {
-                            final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey());
+                            final GTUtility.ItemId id = GTUtility.ItemId.createNoCopy(entry.getKey());
                             drops.merge(
                                 id,
                                 Bee.getFinalChance(entry.getValue(), speed, prodMod, 8f)
@@ -382,11 +381,11 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                     }
                     final IBee[] d = bee.spawnDrones(this);
                     if (d != null && d.length > 0) {
-                        final HashMap<GT_Utility.ItemId, ItemStack> drones = new HashMap<>(d.length);
+                        final HashMap<GTUtility.ItemId, ItemStack> drones = new HashMap<>(d.length);
                         for (IBee dr : d) {
                             final ItemStack drone = beeRoot.getMemberStack(dr, EnumBeeType.DRONE.ordinal());
                             breedingTracker.registerDrone(dr);
-                            final GT_Utility.ItemId drid = GT_Utility.ItemId.createNoCopy(drone);
+                            final GTUtility.ItemId drid = GTUtility.ItemId.createNoCopy(drone);
                             if (drones.containsKey(drid)) drones.get(drid).stackSize += drone.stackSize;
                             else {
                                 this.mOutputItems[i++] = drone;
@@ -400,7 +399,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
 
                 setQueen(null);
 
-                for (Map.Entry<GT_Utility.ItemId, Float> entry : drops.entrySet()) {
+                for (Map.Entry<GTUtility.ItemId, Float> entry : drops.entrySet()) {
                     final ItemStack s = dropstacks.get(entry.getKey())
                         .copy();
                     s.stackSize = entry.getValue()
@@ -547,7 +546,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         if (aBaseMetaTileEntity.isClientSide()) {
-            if (GT_Client.changeDetected == 4) {
+            if (GTClient.changeDetected == 4) {
                 /*
                  * Client tick counter that is set to 5 on hiding pipes and covers. It triggers a texture update next
                  * client tick when reaching 4, with provision for 3 more update tasks, spreading client change
@@ -705,17 +704,17 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
             || beeRoot.isMember(aStack, EnumBeeType.PRINCESS.ordinal());
         else if (aIndex == drone) return beeRoot.isMember(aStack, EnumBeeType.DRONE.ordinal());
         else if (aIndex < getOutputSlot()) {
-            if (!GT_ApiaryUpgrade.isUpgrade(aStack)) return false;
+            if (!GTApiaryUpgrade.isUpgrade(aStack)) return false;
             for (int i = upgradeSlot; i < upgradeSlot + upgradeSlotCount; i++) {
                 if (aIndex == i) continue;
                 final ItemStack s = getStackInSlot(i);
                 if (s == null) continue;
-                if (GT_Utility.areStacksEqual(getStackInSlot(i), aStack)) return false;
-                if (GT_ApiaryUpgrade.isUpgrade(aStack)) {
-                    if (!GT_ApiaryUpgrade.getUpgrade(aStack)
+                if (GTUtility.areStacksEqual(getStackInSlot(i), aStack)) return false;
+                if (GTApiaryUpgrade.isUpgrade(aStack)) {
+                    if (!GTApiaryUpgrade.getUpgrade(aStack)
                         .isAllowedToWorkWith(getStackInSlot(i))) return false;
-                } else if (GT_ApiaryUpgrade.isUpgrade(s)) {
-                    if (!GT_ApiaryUpgrade.getUpgrade(s)
+                } else if (GTApiaryUpgrade.isUpgrade(s)) {
+                    if (!GTApiaryUpgrade.getUpgrade(s)
                         .isAllowedToWorkWith(aStack)) return false;
                 }
             }
@@ -991,12 +990,12 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
     private int maxspeed = 0;
 
     public void updateModifiers() {
-        final GT_ApiaryModifier mods = new GT_ApiaryModifier();
+        final GTApiaryModifier mods = new GTApiaryModifier();
         for (int i = 0; i < upgradeSlotCount; i++) {
             final ItemStack s = getStackInSlot(upgradeSlot + i);
             if (s == null) continue;
-            if (GT_ApiaryUpgrade.isUpgrade(s)) {
-                final GT_ApiaryUpgrade upgrade = GT_ApiaryUpgrade.getUpgrade(s);
+            if (GTApiaryUpgrade.isUpgrade(s)) {
+                final GTApiaryUpgrade upgrade = GTApiaryUpgrade.getUpgrade(s);
                 upgrade.applyModifiers(mods, s);
             }
         }
@@ -1025,13 +1024,13 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
 
     /** Tries to move as much of [stack] into a possible upgrade slot */
     public void addUpgrade(ItemStack stack) {
-        if (stack == null || !GT_ApiaryUpgrade.isUpgrade(stack)) return;
+        if (stack == null || !GTApiaryUpgrade.isUpgrade(stack)) return;
 
         int amount = stack.stackSize;
         for (int i = upgradeSlot; i < upgradeSlot + upgradeSlotCount; i++) {
             if (!isItemValidForSlot(i, stack)) continue;
 
-            int maxStackSize = GT_ApiaryUpgrade.getUpgrade(stack)
+            int maxStackSize = GTApiaryUpgrade.getUpgrade(stack)
                 .getMaxNumber();
             ItemStack stackInSlot = getStackInSlot(i);
 
@@ -1042,7 +1041,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                 return;
             }
 
-            if (!GT_Utility.areStacksEqual(stack, stackInSlot)) continue;
+            if (!GTUtility.areStacksEqual(stack, stackInSlot)) continue;
             amount = Math.max(Math.min(amount, maxStackSize - stackInSlot.stackSize), 0);
             if (amount == 0) return;
             stackInSlot.stackSize += amount;
@@ -1204,11 +1203,11 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
         builder
             .widget(
                 new SlotWidget(new ApiarySlot(inventoryHandler, queen))
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_BEE_QUEEN)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_BEE_QUEEN)
                     .setPos(36, 21))
             .widget(
                 new SlotWidget(new ApiarySlot(inventoryHandler, drone))
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_BEE_DRONE)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_BEE_DRONE)
                     .setPos(36, 41))
             .widget(
                 SlotGroup.ofItemHandler(inventoryHandler, 2)
@@ -1225,7 +1224,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
 
         builder.widget(
             new ButtonWidget().setOnClick((clickData, widget) -> cancelProcess())
-                .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_CROSS)
+                .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_CROSS)
                 .setGTTooltip(() -> mTooltipCache.getData(CANCEL_PROCESS_TOOLTIP))
                 .setTooltipShowUpDelay(TOOLTIP_DELAY)
                 .setPos(7, 26)
@@ -1233,18 +1232,18 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
             .widget(
                 new CycleButtonWidget().setToggle(() -> mAutoQueen, x -> mAutoQueen = x)
                     .setTextureGetter(
-                        i -> i == 0 ? GT_UITextures.OVERLAY_BUTTON_CROSS : GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
+                        i -> i == 0 ? GTUITextures.OVERLAY_BUTTON_CROSS : GTUITextures.OVERLAY_BUTTON_CHECKMARK)
                     .setGTTooltip(() -> mTooltipCache.getData(AUTOQUEEN_TOOLTIP))
                     .setTooltipShowUpDelay(TOOLTIP_DELAY)
                     .setPos(7, 44)
                     .setSize(18, 18)
-                    .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_SLOT_BEE_QUEEN))
+                    .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_SLOT_BEE_QUEEN))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_INFORMATION)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_INFORMATION)
                     .setGTTooltip(() -> {
-                        final String energyreq = GT_Utility.formatNumbers(
-                            (int) ((float) GT_MetaTileEntity_IndustrialApiary.baseEUtUsage * getEnergyModifier()
-                                * getAcceleration()) + getAdditionalEnergyUsage());
+                        final String energyreq = GTUtility.formatNumbers(
+                            (int) ((float) MTEIndustrialApiary.baseEUtUsage * getEnergyModifier() * getAcceleration())
+                                + getAdditionalEnergyUsage());
                         final String Temp = StatCollector.translateToLocal(getTemperature().getName());
                         final String Hum = StatCollector.translateToLocal(getHumidity().getName());
                         if (getUsedQueen() != null
@@ -1303,7 +1302,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                     () -> mTooltipCache.getUncachedTooltipData(
                         mLockedSpeed ? SPEED_LOCKED_TOOLTIP : SPEED_TOOLTIP,
                         getAcceleration(),
-                        GT_Utility.formatNumbers(getAdditionalEnergyUsage())))
+                        GTUtility.formatNumbers(getAdditionalEnergyUsage())))
                 .attachSyncer(
                     new FakeSyncWidget.IntegerSyncer(() -> mSpeed, val -> mSpeed = val),
                     builder,
@@ -1313,7 +1312,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                     builder,
                     (widget, val) -> widget.notifyTooltipChange())
                 .setTooltipShowUpDelay(TOOLTIP_DELAY)
-                .setBackground(GT_UITextures.PICTURE_SQUARE_LIGHT_GRAY)
+                .setBackground(GTUITextures.PICTURE_SQUARE_LIGHT_GRAY)
                 .setPos(25, 62)
                 .setSize(18, 18))
             .widget(
@@ -1327,8 +1326,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                     .setPos(26, 72));
     }
 
-    private static final FallbackableUITexture progressBarTexture = GT_UITextures
-        .fallbackableProgressbar("iapiary", GT_UITextures.PROGRESSBAR_ARROW);
+    private static final FallbackableUITexture progressBarTexture = GTUITextures
+        .fallbackableProgressbar("iapiary", GTUITextures.PROGRESSBAR_ARROW);
 
     @Override
     protected BasicUIProperties getUIProperties() {
@@ -1424,12 +1423,12 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
         }
     }
 
-    private static final UIInfo<?, ?> IndustrialApiaryUI = GT_UIInfos.GTTileEntityUIFactory
-        .apply(GT_ModularUIContainer_IndustrialApiary::new);
+    private static final UIInfo<?, ?> IndustrialApiaryUI = GTUIInfos.GTTileEntityUIFactory
+        .apply(GTModularUIContainer_IndustrialApiary::new);
 
-    private static class GT_ModularUIContainer_IndustrialApiary extends ModularUIContainer {
+    private static class GTModularUIContainer_IndustrialApiary extends ModularUIContainer {
 
-        public GT_ModularUIContainer_IndustrialApiary(ModularUIContext context, ModularWindow mainWindow) {
+        public GTModularUIContainer_IndustrialApiary(ModularUIContext context, ModularWindow mainWindow) {
             super(context, mainWindow);
         }
 
@@ -1446,11 +1445,11 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
             if (s == null) return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
             final Slot slot = getSlot(aSlotNumber);
             final ItemStack slotStack = slot.getStack();
-            if (slotStack != null && !GT_Utility.areStacksEqual(slotStack, s)) return null; // super would replace item
+            if (slotStack != null && !GTUtility.areStacksEqual(slotStack, s)) return null; // super would replace item
             if (slotStack == null && !slot.isItemValid(s))
                 return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
-            if (!GT_ApiaryUpgrade.isUpgrade(s)) return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
-            int max = GT_ApiaryUpgrade.getUpgrade(s)
+            if (!GTApiaryUpgrade.isUpgrade(s)) return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer);
+            int max = GTApiaryUpgrade.getUpgrade(s)
                 .getMaxNumber();
             if (slotStack != null) max = Math.max(0, max - slotStack.stackSize);
             max = Math.min(max, s.stackSize);
@@ -1470,16 +1469,16 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
             if (aSlotIndex >= playerInventorySlot) return super.transferStackInSlot(aPlayer, aSlotIndex);
             final ItemStack aStack = s.getStack();
             if (aStack == null) return super.transferStackInSlot(aPlayer, aSlotIndex);
-            if (!GT_ApiaryUpgrade.isUpgrade(aStack)) return super.transferStackInSlot(aPlayer, aSlotIndex);
+            if (!GTApiaryUpgrade.isUpgrade(aStack)) return super.transferStackInSlot(aPlayer, aSlotIndex);
             for (int i = playerInventorySlot + 2; i < playerInventorySlot + 2 + 4; i++) {
                 final Slot iSlot = getSlot(i);
                 final ItemStack iStack = iSlot.getStack();
                 if (iStack == null) {
                     if (!iSlot.isItemValid(aStack)) continue;
                 } else {
-                    if (!GT_Utility.areStacksEqual(aStack, iStack)) continue;
+                    if (!GTUtility.areStacksEqual(aStack, iStack)) continue;
                 }
-                int max = GT_ApiaryUpgrade.getUpgrade(aStack)
+                int max = GTApiaryUpgrade.getUpgrade(aStack)
                     .getMaxNumber();
                 if (iStack == null) {
                     max = Math.min(max, aStack.stackSize);
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMassfabricator.java
index 7eaa8122c1..195d2317de 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMassfabricator.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE_GLOW;
@@ -32,29 +32,29 @@ import gregtech.api.enums.Materials;
 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.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.objects.overclockdescriber.EUOverclockDescriber;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-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.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
 import gregtech.common.config.machinestats.ConfigMassFabricator;
 
-public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMachine {
+public class MTEMassfabricator extends MTEBasicMachine {
 
     public static int sUUAperUUM = 1;
     public static int sUUASpeedBonus = 4;
     public static int sDurationMultiplier = 3215;
     public static boolean sRequiresUUA = false;
     public static int BASE_EUT = 256;
-    public static GT_Recipe nonUUARecipe;
-    public static GT_Recipe uuaRecipe;
+    public static GTRecipe nonUUARecipe;
+    public static GTRecipe uuaRecipe;
 
-    public GT_MetaTileEntity_Massfabricator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEMassfabricator(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -114,13 +114,13 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac
                     .build()));
     }
 
-    public GT_MetaTileEntity_Massfabricator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEMassfabricator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 8, aDescription, aTextures, 1, 1);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Massfabricator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEMassfabricator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -202,7 +202,7 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac
         }
 
         @Override
-        public GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe) {
+        public OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe) {
             return super.createCalculator(template, recipe).setEUt(Ints.saturatedCast(V[tier] * amperage))
                 .setEUtIncreasePerOC(2.0)
                 .limitOverclockCount(tier - 1)
@@ -210,19 +210,19 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac
         }
 
         @Override
-        protected boolean shouldShowAmperage(GT_OverclockCalculator calculator) {
+        protected boolean shouldShowAmperage(OverclockCalculator calculator) {
             return true;
         }
 
         @Override
-        protected String getVoltageString(GT_OverclockCalculator calculator) {
+        protected String getVoltageString(OverclockCalculator calculator) {
             // standard amperage calculation doesn't work here
-            return decorateWithOverclockLabel(GT_Utility.formatNumbers(V[mTier]) + " EU/t", calculator)
-                + GT_Utility.getTierNameWithParentheses(V[mTier]);
+            return decorateWithOverclockLabel(GTUtility.formatNumbers(V[mTier]) + " EU/t", calculator)
+                + GTUtility.getTierNameWithParentheses(V[mTier]);
         }
 
         @Override
-        protected String getAmperageString(GT_OverclockCalculator calculator) {
+        protected String getAmperageString(OverclockCalculator calculator) {
             int amperage = this.amperage;
             int denominator = 1;
             for (int i = 1; i < mTier; i++) {
@@ -232,7 +232,7 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac
                 }
             }
             if (amperage > 0) {
-                return GT_Utility.formatNumbers(amperage);
+                return GTUtility.formatNumbers(amperage);
             } else {
                 return "1/" + denominator;
             }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMicrowaveEnergyTransmitter.java
index 575e98c5c6..52d38beba0 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMicrowaveEnergyTransmitter.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE;
@@ -27,10 +27,10 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -39,14 +39,13 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IEnergyConnected;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.common.config.machinestats.ConfigMicrowaveEnergyTransmitter;
 import gregtech.common.config.machinestats.ConfigTeleporter;
 
-public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEntity_BasicTank
-    implements IAddGregtechLogo, IAddUIWidgets {
+public class MTEMicrowaveEnergyTransmitter extends MTEBasicTank implements IAddGregtechLogo, IAddUIWidgets {
 
     private static boolean sInterDimensionalTeleportAllowed = true;
     private static int mMaxLoss = 50;
@@ -64,7 +63,7 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
     public int tTargetD = 0;
     public TileEntity tTile = null;
 
-    public GT_MetaTileEntity_MicrowaveEnergyTransmitter(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEMicrowaveEnergyTransmitter(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -75,13 +74,11 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
                 "0.004EU Loss per 100 Blocks" });
     }
 
-    public GT_MetaTileEntity_MicrowaveEnergyTransmitter(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTEMicrowaveEnergyTransmitter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_MicrowaveEnergyTransmitter(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEMicrowaveEnergyTransmitter(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
@@ -89,27 +86,23 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (aBaseMetaTileEntity.isClientSide()) return true;
         this.hasBlock = checkForBlock();
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_MicrowaveEnergyTransmitter(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEMicrowaveEnergyTransmitter(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
     public String[] getInfoData() {
         return new String[] { "Coordinates:",
-            "X: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetX) + EnumChatFormatting.RESET,
-            "Y: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetY) + EnumChatFormatting.RESET,
-            "Z: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetZ) + EnumChatFormatting.RESET,
+            "X: " + EnumChatFormatting.GREEN + GTUtility.formatNumbers(this.mTargetX) + EnumChatFormatting.RESET,
+            "Y: " + EnumChatFormatting.GREEN + GTUtility.formatNumbers(this.mTargetY) + EnumChatFormatting.RESET,
+            "Z: " + EnumChatFormatting.GREEN + GTUtility.formatNumbers(this.mTargetZ) + EnumChatFormatting.RESET,
             "Dimension: " + EnumChatFormatting.GREEN + this.mTargetD + EnumChatFormatting.RESET,
-            "Dimension Valid: " + (GT_Utility.isRealDimension(this.mTargetD)
+            "Dimension Valid: " + (GTUtility.isRealDimension(this.mTargetD)
                 ? EnumChatFormatting.GREEN + "Yes" + EnumChatFormatting.RESET
                 : EnumChatFormatting.RED + "No" + EnumChatFormatting.RESET),
             "Dimension Registered: " + (DimensionManager.isDimensionRegistered(this.mTargetD)
@@ -178,7 +171,7 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
         for (byte i = -5; i <= 5; i = (byte) (i + 1)) {
             for (byte j = -5; j <= 5; j = (byte) (j + 1)) {
                 for (byte k = -5; k <= 5; k = (byte) (k + 1)) {
-                    if (getBaseMetaTileEntity().getBlockOffset(i, j, k) == GregTech_API.sBlockMetal5
+                    if (getBaseMetaTileEntity().getBlockOffset(i, j, k) == GregTechAPI.sBlockMetal5
                         && getBaseMetaTileEntity().getMetaIDOffset(i, j, k) == 8) { // require osmiridium block
                         return true;
                     }
@@ -194,8 +187,8 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
     }
 
     public boolean isDimensionalTeleportAvailable() {
-        return this.mDebug || (hasDimensionalTeleportCapability() && GT_Utility.isRealDimension(this.mTargetD)
-            && GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId));
+        return this.mDebug || (hasDimensionalTeleportCapability() && GTUtility.isRealDimension(this.mTargetD)
+            && GTUtility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId));
     }
 
     @Override
@@ -247,7 +240,7 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
                             }
                             long energyUse = 10;
                             if (mMaxLossDistance != 0) {
-                                energyUse = GT_Utility
+                                energyUse = GTUtility
                                     .safeInt(10L + (tDistance * Math.max(mMaxLoss - 10L, 0) / mMaxLossDistance));
                             }
                             energyUse = packetSize + ((V[mTier] * energyUse) / 100);
@@ -412,7 +405,7 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
     @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)
                 .setSize(90, 72)
                 .setPos(43, 4))
             .widget(
@@ -432,35 +425,21 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
                     .setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setPos(46, 32))
             .widget(
-                TextWidget.dynamicString(() -> "Dim Valid: " + (GT_Utility.isRealDimension(mTargetD) ? "Yes" : "No"))
+                TextWidget.dynamicString(() -> "Dim Valid: " + (GTUtility.isRealDimension(mTargetD) ? "Yes" : "No"))
                     .setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> hasDimensionalTeleportCapability())
                     .setPos(46, 40))
             .widget(new FakeSyncWidget.FluidStackSyncer(() -> mFluid, val -> mFluid = val));
 
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, -512, -64, 7);
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, -16, -1, 25);
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, 16, 1, 133);
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, 512, 64, 151);
-
-        addChangeNumberButton(
-            builder,
-            GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE,
-            val -> mTargetD += val,
-            -16,
-            -8,
-            7,
-            58);
-        addChangeNumberButton(
-            builder,
-            GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL,
-            val -> mTargetD += val,
-            -4,
-            -1,
-            25,
-            58);
-        addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, val -> mTargetD += val, 4, 1, 133, 58);
-        addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, val -> mTargetD += val, 16, 8, 151, 58);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_MINUS_LARGE, -512, -64, 7);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_MINUS_SMALL, -16, -1, 25);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_PLUS_SMALL, 16, 1, 133);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_PLUS_LARGE, 512, 64, 151);
+
+        addChangeNumberButton(builder, GTUITextures.OVERLAY_BUTTON_MINUS_LARGE, val -> mTargetD += val, -16, -8, 7, 58);
+        addChangeNumberButton(builder, GTUITextures.OVERLAY_BUTTON_MINUS_SMALL, val -> mTargetD += val, -4, -1, 25, 58);
+        addChangeNumberButton(builder, GTUITextures.OVERLAY_BUTTON_PLUS_SMALL, val -> mTargetD += val, 4, 1, 133, 58);
+        addChangeNumberButton(builder, GTUITextures.OVERLAY_BUTTON_PLUS_LARGE, val -> mTargetD += val, 16, 8, 151, 58);
     }
 
     private void addChangeNumberButtons(ModularWindow.Builder builder, IDrawable overlay, int addNumberShift,
@@ -475,14 +454,14 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
         builder.widget(
             new ButtonWidget()
                 .setOnClick((clickData, widget) -> setter.accept(clickData.shift ? addNumberShift : addNumber))
-                .setBackground(GT_UITextures.BUTTON_STANDARD, overlay)
+                .setBackground(GTUITextures.BUTTON_STANDARD, overlay)
                 .setSize(18, 18)
                 .setPos(xPos, yPos));
     }
 
     @Override
     public GUITextureSet getGUITextureSet() {
-        return new GUITextureSet().setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY);
+        return new GUITextureSet().setGregTechLogo(GTUITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMiner.java
index b1ce994fb3..7707564b93 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMiner.java
@@ -1,7 +1,7 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.debugBlockMiner;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.enums.GTValues.debugBlockMiner;
 
 import java.util.ArrayList;
 
@@ -19,23 +19,22 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture;
 
 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.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.BasicUIProperties;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
-import gregtech.common.misc.GT_DrillingLogicDelegate;
-import gregtech.common.misc.GT_IDrillingLogicDelegateOwner;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.BlockOresAbstract;
+import gregtech.common.blocks.TileEntityOres;
+import gregtech.common.misc.DrillingLogicDelegate;
+import gregtech.common.misc.IDrillingLogicDelegateOwner;
 
-public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
-    implements GT_IDrillingLogicDelegateOwner, IAddUIWidgets {
+public class MTEMiner extends MTEBasicMachine implements IDrillingLogicDelegateOwner, IAddUIWidgets {
 
     static final int[] RADIUS = { 8, 8, 16, 24, 32 }; // Miner radius per tier
     static final int[] SPEED = { 160, 160, 80, 40, 20 }; // Miner cycle time per tier
@@ -47,11 +46,11 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
     private final ArrayList<ChunkPosition> oreBlockPositions = new ArrayList<>();
 
     /** General pipe accessor */
-    private final GT_DrillingLogicDelegate pipe = new GT_DrillingLogicDelegate(this);
+    private final DrillingLogicDelegate pipe = new DrillingLogicDelegate(this);
 
     private final int mSpeed;
 
-    public GT_MetaTileEntity_Miner(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEMiner(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -117,7 +116,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
         radiusConfig = RADIUS[mTier];
     }
 
-    public GT_MetaTileEntity_Miner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEMiner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, 2, 2);
         mSpeed = SPEED[aTier];
         radiusConfig = RADIUS[mTier];
@@ -125,7 +124,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Miner(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEMiner(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -138,7 +137,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
     protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
         return super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack) //
-            && aStack.getItem() == GT_DrillingLogicDelegate.MINING_PIPE_STACK.getItem();
+            && aStack.getItem() == DrillingLogicDelegate.MINING_PIPE_STACK.getItem();
     }
 
     /** Both output slots must be free to work */
@@ -171,7 +170,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
                 }
             }
 
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 String.format(
                     "%s %dx%d",
@@ -198,7 +197,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
         if (!aBaseMetaTileEntity.isAllowedToWork()) {
             mMaxProgresstime = 0;
             if (debugBlockMiner) {
-                GT_Log.out.println("MINER: Disabled");
+                GTLog.out.println("MINER: Disabled");
             }
             return;
         }
@@ -206,7 +205,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
         if (!hasFreeSpace()) {
             mMaxProgresstime = 0;
             if (debugBlockMiner) {
-                GT_Log.out.println("MINER: No free space");
+                GTLog.out.println("MINER: No free space");
             }
             return;
         }
@@ -214,7 +213,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
         if (!aBaseMetaTileEntity.isUniversalEnergyStored((long) ENERGY[mTier] * (mSpeed - mProgresstime))) {
             mMaxProgresstime = 0;
             if (debugBlockMiner) {
-                GT_Log.out.println(
+                GTLog.out.println(
                     "MINER: Not enough energy yet, want " + (ENERGY[mTier] * mSpeed)
                         + " have "
                         + aBaseMetaTileEntity.getUniversalEnergyStored());
@@ -252,7 +251,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
                     x = aBaseMetaTileEntity.getXCoord() + oreBlockPos.chunkPosX;
                     y = aBaseMetaTileEntity.getYCoord() + oreBlockPos.chunkPosY;
                     z = aBaseMetaTileEntity.getZCoord() + oreBlockPos.chunkPosZ;
-                    isOre = GT_Utility.isOre(
+                    isOre = GTUtility.isOre(
                         oreBlock,
                         aBaseMetaTileEntity.getWorld()
                             .getBlockMetadata(x, y, z));
@@ -278,12 +277,12 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
                 int blockMeta = aBaseMetaTileEntity.getMetaIDOffset(x, pipe.getTipDepth(), z);
 
                 // todo some weird checks. refactorings needed
-                if (block instanceof GT_Block_Ores_Abstract) {
+                if (block instanceof BlockOresAbstract) {
                     TileEntity oreEntity = aBaseMetaTileEntity.getTileEntityOffset(x, pipe.getTipDepth(), z);
-                    if (oreEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) oreEntity).mNatural) {
+                    if (oreEntity instanceof TileEntityOres && ((TileEntityOres) oreEntity).mNatural) {
                         oreBlockPositions.add(new ChunkPosition(x, pipe.getTipDepth(), z));
                     }
-                } else if (GT_Utility.isOre(block, blockMeta)) {
+                } else if (GTUtility.isOre(block, blockMeta)) {
                     oreBlockPositions.add(new ChunkPosition(x, pipe.getTipDepth(), z));
                 }
             }
@@ -326,7 +325,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
                     mInventory[i] = copy;
                 }
                 return true;
-            } else if (GT_Utility.areStacksEqual(slot, stack) && slot.stackSize <= slot.getMaxStackSize() - count) {
+            } else if (GTUtility.areStacksEqual(slot, stack) && slot.stackSize <= slot.getMaxStackSize() - count) {
                 if (!simulate) {
                     slot.stackSize += count;
                 }
@@ -391,12 +390,12 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine
         return mSpeed;
     }
 
-    public GT_DrillingLogicDelegate getPipe() {
+    public DrillingLogicDelegate getPipe() {
         return pipe;
     }
 
-    private static final FallbackableUITexture progressBarTexture = GT_UITextures
-        .fallbackableProgressbar("miner", GT_UITextures.PROGRESSBAR_CANNER);
+    private static final FallbackableUITexture progressBarTexture = GTUITextures
+        .fallbackableProgressbar("miner", GTUITextures.PROGRESSBAR_CANNER);
 
     @Override
     protected BasicUIProperties getUIProperties() {
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMonsterRepellent.java
index fde78cfa2e..fc9c40856e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMonsterRepellent.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE;
@@ -16,15 +16,15 @@ import net.minecraftforge.common.util.ForgeDirection;
 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.metatileentity.implementations.MTETieredMachineBlock;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_SpawnEventHandler;
+import gregtech.api.util.GTSpawnEventHandler;
 
-public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_TieredMachineBlock {
+public class MTEMonsterRepellent extends MTETieredMachineBlock {
 
     public int mRange = 16;
 
-    public GT_MetaTileEntity_MonsterRepellent(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEMonsterRepellent(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -39,19 +39,19 @@ public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_Tiered
                 + " EU/t");
     }
 
-    public GT_MetaTileEntity_MonsterRepellent(String aName, int aTier, int aInvSlotCount, String aDescription,
+    public MTEMonsterRepellent(String aName, int aTier, int aInvSlotCount, String aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_MonsterRepellent(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTEMonsterRepellent(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_MonsterRepellent(
+        return new MTEMonsterRepellent(
             this.mName,
             this.mTier,
             this.mInventory.length,
@@ -80,14 +80,14 @@ public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_Tiered
         if (aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.isServerSide()) {
             int[] tCoords = { aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(),
                 aBaseMetaTileEntity.getZCoord(), aBaseMetaTileEntity.getWorld().provider.dimensionId };
-            if ((aTimer % 600 == 0) && !GT_SpawnEventHandler.mobReps.contains(tCoords)) {
-                GT_SpawnEventHandler.mobReps.add(tCoords);
+            if ((aTimer % 600 == 0) && !GTSpawnEventHandler.mobReps.contains(tCoords)) {
+                GTSpawnEventHandler.mobReps.add(tCoords);
             }
             if (aBaseMetaTileEntity.isUniversalEnergyStored(getMinimumStoredEU())
                 && aBaseMetaTileEntity.decreaseStoredEnergyUnits(1L << (this.mTier * 2), false)) {
-                mRange = GT_SpawnEventHandler.getPoweredRepellentRange(mTier);
+                mRange = GTSpawnEventHandler.getPoweredRepellentRange(mTier);
             } else {
-                mRange = GT_SpawnEventHandler.getUnpoweredRepellentRange(mTier);
+                mRange = GTSpawnEventHandler.getUnpoweredRepellentRange(mTier);
             }
         }
     }
@@ -96,7 +96,7 @@ public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_Tiered
     public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
         int[] tCoords = { aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(),
             aBaseMetaTileEntity.getZCoord(), aBaseMetaTileEntity.getWorld().provider.dimensionId };
-        GT_SpawnEventHandler.mobReps.add(tCoords);
+        GTSpawnEventHandler.mobReps.add(tCoords);
     }
 
     @Override
@@ -109,7 +109,7 @@ public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_Tiered
                 .getZCoord(),
             this.getBaseMetaTileEntity()
                 .getWorld().provider.dimensionId };
-        GT_SpawnEventHandler.mobReps.removeIf(coords -> Arrays.equals(coords, tCoords));
+        GTSpawnEventHandler.mobReps.removeIf(coords -> Arrays.equals(coords, tCoords));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEPotionBrewer.java
index 8254c6440d..d889ca0d40 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEPotionBrewer.java
@@ -13,16 +13,16 @@ 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_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachine {
+public class MTEPotionBrewer extends MTEBasicMachine {
 
-    public GT_MetaTileEntity_PotionBrewer(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEPotionBrewer(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -105,13 +105,13 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
                     .build()));
     }
 
-    public GT_MetaTileEntity_PotionBrewer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEPotionBrewer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, 1, 0);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PotionBrewer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEPotionBrewer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -142,7 +142,7 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
                 if (!tModifier.isEmpty()) {
                     tInputName = tInputName.replaceFirst("." + tModifier, "");
                 }
-                if (GT_Utility.areStacksEqual(new ItemStack(Items.fermented_spider_eye, 1, 0), getInputAt(0))) {
+                if (GTUtility.areStacksEqual(new ItemStack(Items.fermented_spider_eye, 1, 0), getInputAt(0))) {
                     return switch (tInputName) {
                         case "poison", "health", "waterbreathing" -> setOutput("potion.damage" + tModifier);
                         case "nightvision" -> setOutput("potion.invisibility" + tModifier);
@@ -152,8 +152,8 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
                         default -> setOutput("potion.weakness");
                     };
                 }
-                if (GT_Utility.areStacksEqual(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L),
+                if (GTUtility.areStacksEqual(
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L),
                     getInputAt(0))) {
                     if (!tModifier.startsWith("strong")) {
                         return setOutput(
@@ -164,9 +164,8 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
                     }
                     return setOutput("potion.thick");
                 }
-                if (GT_Utility.areStacksEqual(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
-                    getInputAt(0))) {
+                if (GTUtility
+                    .areStacksEqual(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), getInputAt(0))) {
                     if (!tModifier.startsWith("long")) {
                         return setOutput(
                             "potion." + tInputName + ".long" + (tModifier.isEmpty() ? "" : "." + tModifier));
@@ -176,8 +175,8 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
                     }
                     return setOutput("potion.mundane");
                 }
-                if (GT_Utility.areStacksEqual(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L),
+                if (GTUtility.areStacksEqual(
+                    GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L),
                     getInputAt(0))) {
                     if (!tInputName.endsWith(".splash")) {
                         return setOutput("potion." + tInputName + ".splash");
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java
index eff998d405..a6a99a58fa 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.debugBlockPump;
+import static gregtech.api.enums.GTValues.debugBlockPump;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -23,27 +23,27 @@ import net.minecraftforge.fluids.IFluidBlock;
 import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture;
 
 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.metatileentity.BaseTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.BasicUIProperties;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.misc.GT_DrillingLogicDelegate;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gregtech.common.misc.DrillingLogicDelegate;
 
-public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
+public class MTEPump extends MTEBasicMachine {
 
-    private static final ItemStack MINING_PIPE = GT_ModHandler.getIC2Item("miningPipe", 0);
+    private static final ItemStack MINING_PIPE = GTModHandler.getIC2Item("miningPipe", 0);
 
-    private static final ItemStack MINING_PIPE_ONE = GT_ModHandler.getIC2Item("miningPipe", 1);
-    private static final Block MINING_PIPE_BLOCK = GT_Utility.getBlockFromStack(MINING_PIPE);
-    private static final Block MINING_PIPE_TIP_BLOCK = GT_Utility
-        .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 0));
+    private static final ItemStack MINING_PIPE_ONE = GTModHandler.getIC2Item("miningPipe", 1);
+    private static final Block MINING_PIPE_BLOCK = GTUtility.getBlockFromStack(MINING_PIPE);
+    private static final Block MINING_PIPE_TIP_BLOCK = GTUtility
+        .getBlockFromStack(GTModHandler.getIC2Item("miningPipeTip", 0));
 
     public static int getMaxDistanceForTier(int aTier) {
         return (10 * ((int) Math.pow(1.6D, aTier)));
@@ -65,7 +65,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
 
     private boolean mDisallowRetract = true;
 
-    public GT_MetaTileEntity_Pump(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEPump(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -74,7 +74,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
             1,
             new String[] { "The best way to empty Oceans!",
                 getEuUsagePerTier(aTier) + " EU/operation, "
-                    + GT_Utility.safeInt(160 / 20 / (long) Math.pow(2, aTier))
+                    + GTUtility.safeInt(160 / 20 / (long) Math.pow(2, aTier))
                     + " sec per bucket, no stuttering",
                 "Maximum pumping area: " + (getMaxDistanceForTier(aTier) * 2 + 1)
                     + "x"
@@ -136,18 +136,18 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
         radiusConfig = getMaxDistanceForTier(mTier);
     }
 
-    public GT_MetaTileEntity_Pump(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEPump(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, 2, 2);
         radiusConfig = getMaxDistanceForTier(mTier);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Pump(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEPump(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
-    private static final FallbackableUITexture progressBarTexture = GT_UITextures
-        .fallbackableProgressbar("pump", GT_UITextures.PROGRESSBAR_CANNER);
+    private static final FallbackableUITexture progressBarTexture = GTUITextures
+        .fallbackableProgressbar("pump", GTUITextures.PROGRESSBAR_CANNER);
 
     @Override
     protected BasicUIProperties getUIProperties() {
@@ -156,7 +156,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
             .maxItemOutputs(2)
             .slotOverlays((index, isFluid, isOutput, isSpecial) -> {
                 if (!isFluid && !isOutput && !isSpecial) {
-                    return GT_UITextures.OVERLAY_SLOT_MINING_PIPE;
+                    return GTUITextures.OVERLAY_SLOT_MINING_PIPE;
                 } else {
                     return null;
                 }
@@ -176,14 +176,14 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
     protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
         return super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack)
-            && aStack.getItem() == GT_DrillingLogicDelegate.MINING_PIPE_STACK.getItem();
+            && aStack.getItem() == DrillingLogicDelegate.MINING_PIPE_STACK.getItem();
     }
 
     @Override
     public void saveNBTData(NBTTagCompound aNBT) {
         boolean wasPumping = this.wasPumping || !this.mPumpList.isEmpty();
         if (debugBlockPump) {
-            GT_Log.out.println(
+            GTLog.out.println(
                 "PUMP: NBT:Save - WasPumping - " + wasPumping
                     + " blocks ("
                     + this.mPrimaryPumpedBlock
@@ -241,7 +241,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
         }
 
         if (debugBlockPump) {
-            GT_Log.out.println(
+            GTLog.out.println(
                 "PUMP: NBT:Load - WasPumping - " + this.wasPumping
                     + "("
                     + aNBT.getString("mPumpedBlock1")
@@ -278,7 +278,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
             }
             if (radiusConfig > max) radiusConfig = 0;
         }
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             StatCollector.translateToLocal("GT5U.machines.workareaset") + " "
                 + (radiusConfig * 2 + 1)
@@ -293,7 +293,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
         EntityPlayer entityPlayer, float aX, float aY, float aZ) {
         if (super.onSolderingToolRightClick(side, wrenchingSide, entityPlayer, aX, aY, aZ)) return true;
         mDisallowRetract = !mDisallowRetract;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             entityPlayer,
             StatCollector.translateToLocal(
                 mDisallowRetract ? "GT5U.machines.autoretract.disabled" : "GT5U.machines.autoretract.enabled"));
@@ -316,16 +316,16 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
             for (int i = 1; (i < 21)
                 && ((tTileEntity = getBaseMetaTileEntity()
                     .getIGregTechTileEntityAtSideAndDistance(ForgeDirection.DOWN, i)) != null)
-                && ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Pump)); i++) {
+                && ((tTileEntity.getMetaTileEntity() instanceof MTEPump)); i++) {
                 // Apparently someone might stack 21 pumps on top of each other, so let's check for that
                 getBaseMetaTileEntity().setActive(tTileEntity.isActive());
                 this.mPumpCountBelow += 1;
                 // The more pumps we have stacked, the faster the ones below go
-                ((GT_MetaTileEntity_Pump) tTileEntity.getMetaTileEntity()).mPumpTimer -= 1;
-                ((GT_MetaTileEntity_Pump) tTileEntity.getMetaTileEntity()).mProgresstime += 1;
+                ((MTEPump) tTileEntity.getMetaTileEntity()).mPumpTimer -= 1;
+                ((MTEPump) tTileEntity.getMetaTileEntity()).mProgresstime += 1;
             }
             if (debugBlockPump && (this.mPumpCountBelow != 0)) {
-                GT_Log.out.println("PUMP: Detected " + this.mPumpCountBelow + " pumps below this pump.");
+                GTLog.out.println("PUMP: Detected " + this.mPumpCountBelow + " pumps below this pump.");
             }
             if (this.mPumpCountBelow <= 0) {
                 // Only the bottom most pump does anything
@@ -343,20 +343,20 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
                                         Math.max(getYOfPumpHead() - 1, 1),
                                         getBaseMetaTileEntity().getZCoord())) {
                                         if (debugBlockPump) {
-                                            GT_Log.out.println("PUMP: No pipe left. Idle for a little longer.");
+                                            GTLog.out.println("PUMP: No pipe left. Idle for a little longer.");
                                         }
                                         this.mPumpTimer = 160;
                                     } else {
                                         getBaseMetaTileEntity().disableWorking();
                                         if (debugBlockPump) {
-                                            GT_Log.out.println("PUMP: Can't move. Retracting in next few ticks");
+                                            GTLog.out.println("PUMP: Can't move. Retracting in next few ticks");
                                         }
                                     }
                                 } else if (debugBlockPump) {
-                                    GT_Log.out.println("PUMP: Moved down");
+                                    GTLog.out.println("PUMP: Moved down");
                                 }
                             } else if (debugBlockPump) {
-                                GT_Log.out.println("PUMP: Was pumping, didn't move down");
+                                GTLog.out.println("PUMP: Was pumping, didn't move down");
                             }
                         }
                         int x = getBaseMetaTileEntity().getXCoord(), z = getBaseMetaTileEntity().getZCoord();
@@ -366,7 +366,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
                             int y = getYOfPumpHead();
 
                             if (debugBlockPump && this.mPrimaryPumpedBlock != null) {
-                                GT_Log.out.println(
+                                GTLog.out.println(
                                     "PUMP: Had an invalid pump block. Trying to find a fluid at Y: " + y
                                         + " Previous blocks 1: "
                                         + this.mPrimaryPumpedBlock
@@ -399,7 +399,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
                                 // 3) We have an empty queue and enough time has passed
                                 // 4) A long while has passed
                                 if (debugBlockPump) {
-                                    GT_Log.out.println(
+                                    GTLog.out.println(
                                         "PUMP: Rebuilding pump list - Size " + this.mPumpList.size()
                                             + " WasPumping: "
                                             + this.wasPumping
@@ -411,7 +411,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
                                 this.rebuildPumpQueue(x, yPump, z, yHead);
 
                                 if (debugBlockPump) {
-                                    GT_Log.out.println("PUMP: Rebuilt pump list - Size " + this.mPumpList.size());
+                                    GTLog.out.println("PUMP: Rebuilt pump list - Size " + this.mPumpList.size());
                                 }
                             }
                             if ((!tMovedOneDown) && (this.mPumpTimer <= 0)) {
@@ -422,7 +422,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
                                         break;
                                     }
                                 }
-                                this.mPumpTimer = GT_Utility.safeInt(160 / (long) Math.pow(2, this.mTier));
+                                this.mPumpTimer = GTUtility.safeInt(160 / (long) Math.pow(2, this.mTier));
                                 this.mPumpTimer = mPumpTimer == 0 ? 1 : mPumpTimer;
 
                                 mMaxProgresstime = mPumpTimer;
@@ -435,7 +435,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
                             this.clearQueue(false);
                         }
                     } else if (debugBlockPump) {
-                        GT_Log.out.println("PUMP: Not enough energy? Free space?");
+                        GTLog.out.println("PUMP: Not enough energy? Free space?");
                     }
                 } else {
                     mMaxProgresstime = 0;
@@ -468,12 +468,12 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
                             }
 
                             if (debugBlockPump) {
-                                GT_Log.out.println("PUMP: Retracted one pipe");
+                                GTLog.out.println("PUMP: Retracted one pipe");
                             }
                         } else {
                             mRetractDone = true;
                             if (debugBlockPump) {
-                                GT_Log.out.println("PUMP: Retract done");
+                                GTLog.out.println("PUMP: Retract done");
                             }
                         }
                     }
@@ -500,7 +500,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
 
         for (int i = 0; i < mInputSlotCount; i++) {
             ItemStack stack = getInputAt(i);
-            if (stack != null && GT_Utility.areStacksEqual(stack, MINING_PIPE) && stack.stackSize > 0) {
+            if (stack != null && GTUtility.areStacksEqual(stack, MINING_PIPE) && stack.stackSize > 0) {
                 foundPipe = true;
                 break;
             }
@@ -509,7 +509,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
         if (!foundPipe) {
             // No mining pipes
             if (debugBlockPump) {
-                GT_Log.out.println("PUMP: No mining pipes");
+                GTLog.out.println("PUMP: No mining pipes");
             }
             return false;
         }
@@ -518,7 +518,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
         if (yHead <= 1) {
             // Let's not punch through bedrock
             if (debugBlockPump) {
-                GT_Log.out.println("PUMP: At bottom");
+                GTLog.out.println("PUMP: At bottom");
             }
             return false;
         }
@@ -533,12 +533,12 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
         if (!canReplaceBlock || (isFluid(aBlock) && !consumeFluid(x, yHead - 1, z) && !isWater(aBlock))) {
             // Either we didn't consume a fluid, or it's a non-replaceable block, or it's water.
             if (debugBlockPump) {
-                GT_Log.out.println("PUMP: Did not consume fluid, or non-replaceable block found");
+                GTLog.out.println("PUMP: Did not consume fluid, or non-replaceable block found");
             }
             return false;
         }
         // Try to set the block below us to a tip
-        if (!GT_Utility.setBlockByFakePlayer(
+        if (!GTUtility.setBlockByFakePlayer(
             getFakePlayer(getBaseMetaTileEntity()),
             x,
             yHead - 1,
@@ -547,7 +547,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
             0,
             false)) {
             if (debugBlockPump) {
-                GT_Log.out.println("PUMP: Could not set block below to new tip");
+                GTLog.out.println("PUMP: Could not set block below to new tip");
             }
             return false;
         }
@@ -562,7 +562,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
 
         for (int i = 0; i < mInputSlotCount; i++) {
             ItemStack stack = getInputAt(i);
-            if (stack != null && GT_Utility.areStacksEqual(stack, MINING_PIPE) && stack.stackSize > 0) {
+            if (stack != null && GTUtility.areStacksEqual(stack, MINING_PIPE) && stack.stackSize > 0) {
                 foundPipe = true;
                 stack.stackSize -= 1;
                 if (stack.stackSize == 0) {
@@ -574,9 +574,9 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
 
         if (debugBlockPump) {
             if (foundPipe) {
-                GT_Log.out.println("PUMP: Using 1 pipe");
+                GTLog.out.println("PUMP: Using 1 pipe");
             } else {
-                GT_Log.err.println("PUMP: Lowered pipe but could not find pipe in input");
+                GTLog.err.println("PUMP: Lowered pipe but could not find pipe in input");
             }
         }
 
@@ -602,7 +602,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
                     getBaseMetaTileEntity().getWorld()
                         .setBlock(x, y, z, MINING_PIPE_BLOCK);
                     if (debugBlockPump) {
-                        GT_Log.out.println("PUMP: Hit pipes already in place, trying to merge");
+                        GTLog.out.println("PUMP: Hit pipes already in place, trying to merge");
                     }
                 }
                 y--;
@@ -621,7 +621,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
                 getBaseMetaTileEntity().getWorld()
                     .setBlock(x, y + 1, z, MINING_PIPE_TIP_BLOCK);
                 if (debugBlockPump) {
-                    GT_Log.out.println("PUMP: Did not find a tip at bottom, setting last pipe as tip");
+                    GTLog.out.println("PUMP: Did not find a tip at bottom, setting last pipe as tip");
                 }
             }
             return y + 1;
@@ -721,7 +721,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
 
     /** only check if block below can be replaced with pipe tip. pipe stockpile condition is ignored */
     private boolean canMoveDown(int aX, int aY, int aZ) {
-        if (!GT_Utility.eraseBlockByFakePlayer(getFakePlayer(getBaseMetaTileEntity()), aX, aY, aZ, true)) return false;
+        if (!GTUtility.eraseBlockByFakePlayer(getFakePlayer(getBaseMetaTileEntity()), aX, aY, aZ, true)) return false;
 
         Block aBlock = getBaseMetaTileEntity().getBlock(aX, aY, aZ);
 
@@ -731,7 +731,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
     private boolean consumeFluid(int aX, int aY, int aZ) {
         // Try to consume a fluid at a location
         // Returns true if something was consumed, otherwise false
-        if (!GT_Utility.eraseBlockByFakePlayer(getFakePlayer(getBaseMetaTileEntity()), aX, aY, aZ, true)) return false;
+        if (!GTUtility.eraseBlockByFakePlayer(getFakePlayer(getBaseMetaTileEntity()), aX, aY, aZ, true)) return false;
 
         Block aBlock = getBaseMetaTileEntity().getBlock(aX, aY, aZ);
         if (!isFluid(aBlock)) {
@@ -746,20 +746,20 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
                 // Water/Lava that isn't a source block - do nothing here, but set the block to air and consume energy
                 // below
                 if (debugBlockPump) {
-                    GT_Log.out.println("PUMP: Water/Lava - Not a source block");
+                    GTLog.out.println("PUMP: Water/Lava - Not a source block");
                 }
 
             } else if (getDrainableStack() == null) {
                 // The pump has no internal fluid
-                if (this.mPrimaryPumpedBlock == Blocks.water) setDrainableStack(GT_ModHandler.getWater(1000L));
-                else if (this.mPrimaryPumpedBlock == Blocks.lava) setDrainableStack(GT_ModHandler.getLava(1000L));
+                if (this.mPrimaryPumpedBlock == Blocks.water) setDrainableStack(GTModHandler.getWater(1000L));
+                else if (this.mPrimaryPumpedBlock == Blocks.lava) setDrainableStack(GTModHandler.getLava(1000L));
                 else {
                     // Not water or lava; try to drain and set to air
                     setDrainableStack(
                         ((IFluidBlock) aBlock).drain(getBaseMetaTileEntity().getWorld(), aX, aY, aZ, true));
                 }
 
-            } else if (GT_ModHandler.isWater(getDrainableStack()) || GT_ModHandler.isLava(getDrainableStack())
+            } else if (GTModHandler.isWater(getDrainableStack()) || GTModHandler.isLava(getDrainableStack())
                 || getDrainableStack().isFluidEqual(
                     ((IFluidBlock) aBlock).drain(getBaseMetaTileEntity().getWorld(), aX, aY, aZ, false))) {
                         if (!isWaterOrLava) {
@@ -772,7 +772,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
 
                     } else {
                         if (debugBlockPump) {
-                            GT_Log.out.println("PUMP: Couldn't consume " + aBlock);
+                            GTLog.out.println("PUMP: Couldn't consume " + aBlock);
                         }
                         // We didn't do anything
                         return false;
@@ -826,7 +826,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine {
     private FakePlayer mFakePlayer = null;
 
     protected FakePlayer getFakePlayer(IGregTechTileEntity aBaseTile) {
-        if (mFakePlayer == null) mFakePlayer = GT_Utility.getFakePlayer(aBaseTile);
+        if (mFakePlayer == null) mFakePlayer = GTUtility.getFakePlayer(aBaseTile);
         mFakePlayer.setWorld(aBaseTile.getWorld());
         mFakePlayer.setPosition(aBaseTile.getXCoord(), aBaseTile.getYCoord(), aBaseTile.getZCoord());
         return mFakePlayer;
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEReplicator.java
index e9f3d98dd5..6140fde577 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEReplicator.java
@@ -11,14 +11,14 @@ 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_BasicMachine;
+import gregtech.api.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_Replicator extends GT_MetaTileEntity_BasicMachine {
+public class MTEReplicator extends MTEBasicMachine {
 
-    public GT_MetaTileEntity_Replicator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEReplicator(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -97,13 +97,13 @@ public class GT_MetaTileEntity_Replicator extends GT_MetaTileEntity_BasicMachine
                     .build()));
     }
 
-    public GT_MetaTileEntity_Replicator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEReplicator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, 1, 1);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Replicator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEReplicator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTERockBreaker.java
index e632f4eeda..68dc225793 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTERockBreaker.java
@@ -27,16 +27,16 @@ import gregtech.api.enums.OrePrefixes;
 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.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_RockBreaker extends GT_MetaTileEntity_BasicMachine {
+public class MTERockBreaker extends MTEBasicMachine {
 
-    public GT_MetaTileEntity_RockBreaker(int aID, String aName, String aNameRegional, int aTier) {
+    public MTERockBreaker(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -96,13 +96,13 @@ public class GT_MetaTileEntity_RockBreaker extends GT_MetaTileEntity_BasicMachin
                     .build()));
     }
 
-    public GT_MetaTileEntity_RockBreaker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTERockBreaker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, 1, 1);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RockBreaker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTERockBreaker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -139,10 +139,10 @@ public class GT_MetaTileEntity_RockBreaker extends GT_MetaTileEntity_BasicMachin
                     tOutput = new ItemStack(Blocks.cobblestone, 1);
                 }
             if (tOutput != null) {
-                if (GT_Utility.areStacksEqual(getStackInSlot(getCircuitSlot()), GT_Utility.getIntegratedCircuit(1))) {
-                    if (GT_Utility.areStacksEqual(
+                if (GTUtility.areStacksEqual(getStackInSlot(getCircuitSlot()), GTUtility.getIntegratedCircuit(1))) {
+                    if (GTUtility.areStacksEqual(
                         getInputAt(0),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) {
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) {
                         tOutput = new ItemStack(Blocks.obsidian, 1);
                         if (canOutput(tOutput)) {
                             getInputAt(0).stackSize -= 1;
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEScanner.java
index ba00be67f8..742a6a0e84 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEScanner.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.D1;
+import static gregtech.api.enums.GTValues.D1;
 import static gregtech.api.enums.Mods.GalacticraftCore;
 import static gregtech.api.enums.Mods.GalacticraftMars;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER;
@@ -31,7 +31,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IIndividual;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.MachineType;
 import gregtech.api.enums.Materials;
@@ -40,21 +40,21 @@ import gregtech.api.enums.SoundResource;
 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.metatileentity.implementations.MTEBasicMachine;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_AssemblyLineUtils;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.behaviors.Behaviour_DataOrb;
+import gregtech.api.util.AssemblyLineUtils;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.behaviors.BehaviourDataOrb;
 
-public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
+public class MTEScanner extends MTEBasicMachine {
 
-    public GT_MetaTileEntity_Scanner(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEScanner(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -114,13 +114,13 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                     .build()));
     }
 
-    public GT_MetaTileEntity_Scanner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEScanner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 1, aDescription, aTextures, 1, 1);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Scanner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEScanner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -128,14 +128,14 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
         ItemStack aStack = getInputAt(0);
         if (getOutputAt(0) != null) {
             this.mOutputBlocked += 1;
-        } else if ((GT_Utility.isStackValid(aStack)) && (aStack.stackSize > 0)) {
+        } else if ((GTUtility.isStackValid(aStack)) && (aStack.stackSize > 0)) {
             if ((getFillableStack() != null) && (getFillableStack().containsFluid(Materials.Honey.getFluid(100L)))) {
                 try {
                     IIndividual tIndividual = AlleleManager.alleleRegistry.getIndividual(aStack);
                     if (tIndividual != null) {
                         if (tIndividual.analyze()) {
                             getFillableStack().amount -= 100;
-                            this.mOutputItems[0] = GT_Utility.copyOrNull(aStack);
+                            this.mOutputItems[0] = GTUtility.copyOrNull(aStack);
                             aStack.stackSize = 0;
                             NBTTagCompound tNBT = new NBTTagCompound();
                             tIndividual.writeToNBT(tNBT);
@@ -146,7 +146,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                                 return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
                             return 2;
                         }
-                        this.mOutputItems[0] = GT_Utility.copyOrNull(aStack);
+                        this.mOutputItems[0] = GTUtility.copyOrNull(aStack);
                         aStack.stackSize = 0;
                         this.mMaxProgresstime = 1;
                         this.mEUt = 1;
@@ -154,7 +154,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                     }
                 } catch (Throwable e) {
                     if (D1) {
-                        e.printStackTrace(GT_Log.err);
+                        e.printStackTrace(GTLog.err);
                     }
                 }
             }
@@ -174,7 +174,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                     this.mEUt = 1;
                 }
                 aStack.stackSize -= 1;
-                this.mOutputItems[0] = GT_Utility.copyAmount(1, aStack);
+                this.mOutputItems[0] = GTUtility.copyAmount(1, aStack);
                 assert this.mOutputItems[0] != null;
                 this.mOutputItems[0].setTagCompound(tNBT);
                 return 2;
@@ -182,14 +182,14 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
             if (ItemList.Tool_DataOrb.isStackEqual(getSpecialSlot(), false, true)) {
                 if (ItemList.Tool_DataOrb.isStackEqual(aStack, false, true)) {
                     aStack.stackSize -= 1;
-                    this.mOutputItems[0] = GT_Utility.copyAmount(1, getSpecialSlot());
+                    this.mOutputItems[0] = GTUtility.copyAmount(1, getSpecialSlot());
                     calculateOverclockedNess(30, 512);
                     // In case recipe is too OP for that machine
                     if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
                         return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
                     return 2;
                 }
-                ItemData tData = GT_OreDictUnificator.getAssociation(aStack);
+                ItemData tData = GTOreDictUnificator.getAssociation(aStack);
                 if ((tData != null) && ((tData.mPrefix == OrePrefixes.dust) || (tData.mPrefix == OrePrefixes.cell))
                     && (tData.mMaterial.mMaterial.mElement != null)
                     && (!tData.mMaterial.mMaterial.mElement.mIsIsotope)
@@ -199,9 +199,9 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                     aStack.stackSize -= 1;
 
                     this.mOutputItems[0] = ItemList.Tool_DataOrb.get(1L);
-                    Behaviour_DataOrb.setDataTitle(this.mOutputItems[0], "Elemental-Scan");
-                    Behaviour_DataOrb.setDataName(this.mOutputItems[0], tData.mMaterial.mMaterial.mElement.name());
-                    calculateOverclockedNess(30, GT_Utility.safeInt(tData.mMaterial.mMaterial.getMass() * 8192L));
+                    BehaviourDataOrb.setDataTitle(this.mOutputItems[0], "Elemental-Scan");
+                    BehaviourDataOrb.setDataName(this.mOutputItems[0], tData.mMaterial.mMaterial.mElement.name());
+                    calculateOverclockedNess(30, GTUtility.safeInt(tData.mMaterial.mMaterial.getMass() * 8192L));
                     // In case recipe is too OP for that machine
                     if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
                         return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
@@ -211,7 +211,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
             if (ItemList.Tool_DataStick.isStackEqual(getSpecialSlot(), false, true)) {
                 if (ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) {
                     aStack.stackSize -= 1;
-                    this.mOutputItems[0] = GT_Utility.copyAmount(1, getSpecialSlot());
+                    this.mOutputItems[0] = GTUtility.copyAmount(1, getSpecialSlot());
                     calculateOverclockedNess(30, 128);
                     // In case recipe is too OP for that machine
                     if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
@@ -222,7 +222,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                     getSpecialSlot().stackSize -= 1;
                     aStack.stackSize -= 1;
 
-                    this.mOutputItems[0] = GT_Utility.copyAmount(1, getSpecialSlot());
+                    this.mOutputItems[0] = GTUtility.copyAmount(1, getSpecialSlot());
                     assert this.mOutputItems[0] != null;
                     this.mOutputItems[0].setTagCompound(aStack.getTagCompound());
                     calculateOverclockedNess(30, 128);
@@ -235,10 +235,10 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                     getSpecialSlot().stackSize -= 1;
                     aStack.stackSize -= 1;
 
-                    this.mOutputItems[0] = GT_Utility.copyAmount(1, getSpecialSlot());
+                    this.mOutputItems[0] = GTUtility.copyAmount(1, getSpecialSlot());
                     assert this.mOutputItems[0] != null;
                     this.mOutputItems[0].setTagCompound(
-                        GT_Utility
+                        GTUtility
                             .getNBTContainingShort(new NBTTagCompound(), "map_id", (short) aStack.getItemDamage()));
                     calculateOverclockedNess(30, 128);
                     // In case recipe is too OP for that machine
@@ -262,13 +262,13 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                     int stackItemID = Item.getIdFromItem(aStack.getItem());
                     int stackItemDamage = aStack.getItemDamage();
                     if (stackItemID == Item.getIdFromItem(
-                        Objects.requireNonNull(GT_ModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1L, 0))
+                        Objects.requireNonNull(GTModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1L, 0))
                             .getItem())) {
                         if (stackItemDamage == 0 && aStack.toString()
                             .equals(
                                 Objects
                                     .requireNonNull(
-                                        GT_ModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1L, 0))
+                                        GTModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1L, 0))
                                     .copy()
                                     .toString()))
                             sTier = "100";
@@ -276,20 +276,20 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                             .equals(
                                 Objects
                                     .requireNonNull(
-                                        GT_ModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1L, 1))
+                                        GTModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1L, 1))
                                     .copy()
                                     .toString()))
                             sTier = "2";
                     } else {
                         if (stackItemID == Item.getIdFromItem(
                             Objects
-                                .requireNonNull(GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 0))
+                                .requireNonNull(GTModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 0))
                                 .getItem())) {
                             if (stackItemDamage == 0 && aStack.toString()
                                 .equals(
                                     Objects
                                         .requireNonNull(
-                                            GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 0))
+                                            GTModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 0))
                                         .copy()
                                         .toString()))
                                 sTier = "3";
@@ -297,7 +297,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                                 .equals(
                                     Objects
                                         .requireNonNull(
-                                            GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 1))
+                                            GTModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 1))
                                         .copy()
                                         .toString()))
                                 sTier = "101";
@@ -305,7 +305,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                                 .equals(
                                     Objects
                                         .requireNonNull(
-                                            GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 2))
+                                            GTModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 2))
                                         .copy()
                                         .toString()))
                                 sTier = "102";
@@ -319,10 +319,10 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                     getSpecialSlot().stackSize -= 1;
                     aStack.stackSize -= 1;
 
-                    this.mOutputItems[0] = GT_Utility.copyAmount(1, getSpecialSlot());
+                    this.mOutputItems[0] = GTUtility.copyAmount(1, getSpecialSlot());
                     assert this.mOutputItems[0] != null;
                     this.mOutputItems[0].setTagCompound(
-                        GT_Utility.getNBTContainingShort(new NBTTagCompound(), "rocket_tier", Short.parseShort(sTier)));
+                        GTUtility.getNBTContainingShort(new NBTTagCompound(), "rocket_tier", Short.parseShort(sTier)));
 
                     calculateOverclockedNess(480, 36000);
                     // In case recipe is too OP for that machine
@@ -332,13 +332,13 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                 }
             }
             if (getSpecialSlot() == null && ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) {
-                if (GT_Utility.ItemNBT.getBookTitle(aStack)
+                if (GTUtility.ItemNBT.getBookTitle(aStack)
                     .equals("Raw Prospection Data")) {
-                    GT_Utility.ItemNBT.setBookTitle(aStack, "Analyzed Prospection Data");
-                    GT_Utility.ItemNBT.convertProspectionData(aStack);
+                    GTUtility.ItemNBT.setBookTitle(aStack, "Analyzed Prospection Data");
+                    GTUtility.ItemNBT.convertProspectionData(aStack);
                     aStack.stackSize -= 1;
 
-                    this.mOutputItems[0] = GT_Utility.copyAmount(1, aStack);
+                    this.mOutputItems[0] = GTUtility.copyAmount(1, aStack);
                     calculateOverclockedNess(30, 1000);
                     // In case recipe is too OP for that machine
                     if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
@@ -347,11 +347,11 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                 }
             }
             if (ItemList.Tool_DataStick.isStackEqual(getSpecialSlot(), false, true)) {
-                for (GT_Recipe.GT_Recipe_AssemblyLine tRecipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) {
-                    if (GT_Utility.areStacksEqual(tRecipe.mResearchItem, aStack, true)) {
+                for (GTRecipe.RecipeAssemblyLine tRecipe : GTRecipe.RecipeAssemblyLine.sAssemblylineRecipes) {
+                    if (GTUtility.areStacksEqual(tRecipe.mResearchItem, aStack, true)) {
                         boolean failScanner = true;
-                        for (GT_Recipe scannerRecipe : scannerFakeRecipes.getAllRecipes()) {
-                            if (GT_Utility.areStacksEqual(scannerRecipe.mInputs[0], aStack, true)) {
+                        for (GTRecipe scannerRecipe : scannerFakeRecipes.getAllRecipes()) {
+                            if (GTUtility.areStacksEqual(scannerRecipe.mInputs[0], aStack, true)) {
                                 failScanner = false;
                                 break;
                             }
@@ -360,10 +360,10 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
                         }
 
-                        this.mOutputItems[0] = GT_Utility.copyAmount(1, getSpecialSlot());
+                        this.mOutputItems[0] = GTUtility.copyAmount(1, getSpecialSlot());
 
                         // Use Assline Utils
-                        if (GT_AssemblyLineUtils.setAssemblyLineRecipeOnDataStick(this.mOutputItems[0], tRecipe)) {
+                        if (AssemblyLineUtils.setAssemblyLineRecipeOnDataStick(this.mOutputItems[0], tRecipe)) {
                             aStack.stackSize -= 1;
                             calculateOverclockedNess(30, tRecipe.mResearchTime);
                             // In case recipe is too OP for that machine
@@ -384,7 +384,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
         if (mProgresstime >= (mMaxProgresstime - 1)) {
             if ((this.mOutputItems[0] != null) && (this.mOutputItems[0].getUnlocalizedName()
                 .equals("gt.metaitem.01.32707"))) {
-                GT_Mod.achievements.issueAchievement(
+                GTMod.achievements.issueAchievement(
                     aBaseMetaTileEntity.getWorld()
                         .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()),
                     "scanning");
@@ -414,7 +414,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTETeleporter.java
index 9de00b4a0e..cb7d6d6d71 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTETeleporter.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE;
@@ -50,21 +50,20 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.common.config.machinestats.ConfigTeleporter;
 
-public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
-    implements IAddGregtechLogo, IAddUIWidgets {
+public class MTETeleporter extends MTEBasicTank implements IAddGregtechLogo, IAddUIWidgets {
 
     private static boolean sInterDimensionalTeleportAllowed = true;
     private static int sPassiveEnergyDrain = 2048;
@@ -76,7 +75,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
     public int mTargetD = Integer.MIN_VALUE;
     public boolean mDebug = false;
 
-    public GT_MetaTileEntity_Teleporter(int aID, String aName, String aNameRegional, int aTier) {
+    public MTETeleporter(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -87,11 +86,11 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
                 "for Inter-dimensional transmission" });
     }
 
-    public GT_MetaTileEntity_Teleporter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTETeleporter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Teleporter(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTETeleporter(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
@@ -120,11 +119,11 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
             }
             return Math.min(5.0F, tCount / 666.6F);
         }
-        if (GT_Utility.getClassName(aEntity)
+        if (GTUtility.getClassName(aEntity)
             .equals("EntityItnt")) {
             return 5.0F;
         }
-        if (GT_Utility.getClassName(aEntity)
+        if (GTUtility.getClassName(aEntity)
             .equals("EntityNuke")) {
             return 50.0F;
         }
@@ -173,13 +172,13 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
         if (aBaseMetaTileEntity.isClientSide()) return true;
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Teleporter(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTETeleporter(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -190,11 +189,11 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
     @Override
     public String[] getInfoData() {
         return new String[] { "Coordinates:",
-            "X: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetX) + EnumChatFormatting.RESET,
-            "Y: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetY) + EnumChatFormatting.RESET,
-            "Z: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetZ) + EnumChatFormatting.RESET,
+            "X: " + EnumChatFormatting.GREEN + GTUtility.formatNumbers(this.mTargetX) + EnumChatFormatting.RESET,
+            "Y: " + EnumChatFormatting.GREEN + GTUtility.formatNumbers(this.mTargetY) + EnumChatFormatting.RESET,
+            "Z: " + EnumChatFormatting.GREEN + GTUtility.formatNumbers(this.mTargetZ) + EnumChatFormatting.RESET,
             "Dimension: " + EnumChatFormatting.GREEN + this.mTargetD + EnumChatFormatting.RESET,
-            "Dimension Valid: " + (GT_Utility.isRealDimension(this.mTargetD)
+            "Dimension Valid: " + (GTUtility.isRealDimension(this.mTargetD)
                 ? EnumChatFormatting.GREEN + "Yes" + EnumChatFormatting.RESET
                 : EnumChatFormatting.RED + "No" + EnumChatFormatting.RESET),
             "Dimension Registered: " + (DimensionManager.isDimensionRegistered(this.mTargetD)
@@ -271,8 +270,8 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
     }
 
     public boolean isDimensionalTeleportAvailable() {
-        return this.mDebug || (hasDimensionalTeleportCapability() && GT_Utility.isRealDimension(this.mTargetD)
-            && GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId));
+        return this.mDebug || (hasDimensionalTeleportCapability() && GTUtility.isRealDimension(this.mTargetD)
+            && GTUtility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId));
     }
 
     @Override
@@ -298,7 +297,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
                         }
                         if (tTile instanceof IInventory) {
                             int tStacksize = mInventory[0].stackSize;
-                            GT_Utility.moveOneItemStack(
+                            GTUtility.moveOneItemStack(
                                 this,
                                 tTile,
                                 ForgeDirection.DOWN,
@@ -343,7 +342,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
                                 }
                                 if ((this.mTargetD == getBaseMetaTileEntity().getWorld().provider.dimensionId)
                                     || (!isDimensionalTeleportAvailable())
-                                    || (!GT_Utility.moveEntityToDimensionAtCoords(
+                                    || (!GTUtility.moveEntityToDimensionAtCoords(
                                         tEntity,
                                         this.mTargetD,
                                         this.mTargetX + 0.5D,
@@ -518,7 +517,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
     @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)
                 .setSize(90, 72)
                 .setPos(43, 4))
             .widget(
@@ -538,35 +537,21 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
                     .setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setPos(46, 32))
             .widget(
-                TextWidget.dynamicString(() -> "Dim Valid: " + (GT_Utility.isRealDimension(mTargetD) ? "Yes" : "No"))
+                TextWidget.dynamicString(() -> "Dim Valid: " + (GTUtility.isRealDimension(mTargetD) ? "Yes" : "No"))
                     .setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> hasDimensionalTeleportCapability())
                     .setPos(46, 40))
             .widget(new FakeSyncWidget.FluidStackSyncer(() -> mFluid, val -> mFluid = val));
 
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, -512, -64, 7);
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, -16, -1, 25);
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, 16, 1, 133);
-        addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, 512, 64, 151);
-
-        addChangeNumberButton(
-            builder,
-            GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE,
-            val -> mTargetD += val,
-            -16,
-            -8,
-            7,
-            58);
-        addChangeNumberButton(
-            builder,
-            GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL,
-            val -> mTargetD += val,
-            -4,
-            -1,
-            25,
-            58);
-        addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, val -> mTargetD += val, 4, 1, 133, 58);
-        addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, val -> mTargetD += val, 16, 8, 151, 58);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_MINUS_LARGE, -512, -64, 7);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_MINUS_SMALL, -16, -1, 25);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_PLUS_SMALL, 16, 1, 133);
+        addChangeNumberButtons(builder, GTUITextures.OVERLAY_BUTTON_PLUS_LARGE, 512, 64, 151);
+
+        addChangeNumberButton(builder, GTUITextures.OVERLAY_BUTTON_MINUS_LARGE, val -> mTargetD += val, -16, -8, 7, 58);
+        addChangeNumberButton(builder, GTUITextures.OVERLAY_BUTTON_MINUS_SMALL, val -> mTargetD += val, -4, -1, 25, 58);
+        addChangeNumberButton(builder, GTUITextures.OVERLAY_BUTTON_PLUS_SMALL, val -> mTargetD += val, 4, 1, 133, 58);
+        addChangeNumberButton(builder, GTUITextures.OVERLAY_BUTTON_PLUS_LARGE, val -> mTargetD += val, 16, 8, 151, 58);
     }
 
     private void addChangeNumberButtons(ModularWindow.Builder builder, IDrawable overlay, int addNumberShift,
@@ -581,14 +566,14 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
         builder.widget(
             new ButtonWidget()
                 .setOnClick((clickData, widget) -> setter.accept(clickData.shift ? addNumberShift : addNumber))
-                .setBackground(GT_UITextures.BUTTON_STANDARD, overlay)
+                .setBackground(GTUITextures.BUTTON_STANDARD, overlay)
                 .setSize(18, 18)
                 .setPos(xPos, yPos));
     }
 
     @Override
     public GUITextureSet getGUITextureSet() {
-        return new GUITextureSet().setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY);
+        return new GUITextureSet().setGregTechLogo(GTUITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_TurboCharger.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTETurboCharger.java
index a098e635f0..3e1ebd298e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_TurboCharger.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTETurboCharger.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 
 import net.minecraft.item.ItemStack;
 
@@ -10,27 +10,26 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
 /**
  * Created by danie_000 on 15.10.2016.
  */
-public class GT_MetaTileEntity_TurboCharger extends GT_MetaTileEntity_Charger {
+public class MTETurboCharger extends MTECharger {
 
-    public GT_MetaTileEntity_TurboCharger(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+    public MTETurboCharger(int aID, String aName, String aNameRegional, int aTier, String aDescription,
         int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
     }
 
-    public GT_MetaTileEntity_TurboCharger(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
-        int aSlotCount) {
+    public MTETurboCharger(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int aSlotCount) {
         super(aName, aTier, aDescription, aTextures, aSlotCount);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TurboCharger(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
+        return new MTETurboCharger(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
     }
 
     @Override
@@ -80,8 +79,8 @@ public class GT_MetaTileEntity_TurboCharger extends GT_MetaTileEntity_Charger {
             mBatteryCount = 0;
             mChargeableCount = 0;
             for (ItemStack tStack : mInventory) {
-                if (GT_ModHandler.isElectricItem(tStack, mTier)) {
-                    if (GT_ModHandler.isChargerItem(tStack)) {
+                if (GTModHandler.isElectricItem(tStack, mTier)) {
+                    if (GTModHandler.isChargerItem(tStack)) {
                         mBatteryCount++;
                     }
                     mChargeableCount++;
@@ -100,9 +99,9 @@ public class GT_MetaTileEntity_TurboCharger extends GT_MetaTileEntity_Charger {
                                 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
                                 // CODE
                                 mBaseMetaTileEntity.increaseStoredEnergyUnits(
-                                    GT_ModHandler.dischargeElectricItem(
+                                    GTModHandler.dischargeElectricItem(
                                         mMetaTileEntity.mInventory[i],
-                                        GT_Utility.safeInt(
+                                        GTUtility.safeInt(
                                             Math.min(
                                                 V[mTier] * 120,
                                                 mBaseMetaTileEntity.getEUCapacity()
@@ -125,9 +124,9 @@ public class GT_MetaTileEntity_TurboCharger extends GT_MetaTileEntity_Charger {
                                 // CODE
                                 mBaseMetaTileEntity
                                     .decreaseStoredEU(
-                                        GT_ModHandler.chargeElectricItem(
+                                        GTModHandler.chargeElectricItem(
                                             mMetaTileEntity.mInventory[i],
-                                            GT_Utility
+                                            GTUtility
                                                 .safeInt(Math.min(V[mTier] * 120, mBaseMetaTileEntity.getStoredEU())),
                                             (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getOutputTier()),
                                             true,
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java
index 1b0048f2ec..a89064ba35 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GTValues.V;
 import static gregtech.api.enums.Mods.GregTech;
 
 import java.util.ArrayList;
@@ -20,16 +20,16 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import eu.usrv.yamcore.auxiliary.PlayerChatHelper;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Log;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.GTLog;
 
-public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_TieredMachineBlock {
+public class MTEWorldAccelerator extends MTETieredMachineBlock {
 
     // simple name is rather expensive to compute and it's not cached
     // see https://stackoverflow.com/q/17369304
@@ -111,7 +111,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
         return mMode;
     }
 
-    public GT_MetaTileEntity_WorldAccelerator(int pID, String pName, String pNameRegional, int pTier) {
+    public MTEWorldAccelerator(int pID, String pName, String pNameRegional, int pTier) {
         super(pID, pName, pNameRegional, pTier, 0, "");
     }
 
@@ -152,14 +152,14 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
         return tInfoDisplay.toArray(new String[0]);
     }
 
-    public GT_MetaTileEntity_WorldAccelerator(String pName, int pTier, int pInvSlotCount, String[] pDescription,
+    public MTEWorldAccelerator(String pName, int pTier, int pInvSlotCount, String[] pDescription,
         ITexture[][][] pTextures) {
         super(pName, pTier, pInvSlotCount, pDescription, pTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity pTileEntity) {
-        return new GT_MetaTileEntity_WorldAccelerator(mName, mTier, mInventory.length, mDescriptionArray, mTextures);
+        return new MTEWorldAccelerator(mName, mTier, mInventory.length, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -172,10 +172,10 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
         int colorIndex, boolean pActive, boolean pRedstone) {
         if (mMode == 0) {
             return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][colorIndex + 1], side.offsetY != 0 ? null
-                : pActive ? new GT_RenderedTexture(_mGTIco_Norm_Active) : new GT_RenderedTexture(_mGTIco_Norm_Idle) };
+                : pActive ? new GTRenderedTexture(_mGTIco_Norm_Active) : new GTRenderedTexture(_mGTIco_Norm_Idle) };
         } else {
             return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][colorIndex + 1], side.offsetY != 0 ? null
-                : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle) };
+                : pActive ? new GTRenderedTexture(_mGTIco_TE_Active) : new GTRenderedTexture(_mGTIco_TE_Idle) };
         }
     }
 
@@ -342,7 +342,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
                 }
             }
         } catch (Exception e) {
-            GT_Log.err.println("GT_MetaTileEntity_WorldAccelerator.onPostTick.crash\n" + e.getMessage());
+            GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.onPostTick.crash\n" + e.getMessage());
         }
     }
 
@@ -367,7 +367,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
                 }
             }
         } catch (Exception e) {
-            GT_Log.err.println("GT_MetaTileEntity_WorldAccelerator.doAccelerateTileEntities.crash\n" + e.getMessage());
+            GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.doAccelerateTileEntities.crash\n" + e.getMessage());
         }
     }
 
@@ -401,13 +401,13 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
             return true;
         }
 
-        for (String tS : GT_Values.blacklistedTileEntiyClassNamesForWA) {
+        for (String tS : GTValues.blacklistedTileEntiyClassNamesForWA) {
             if (tCanonicalName.equalsIgnoreCase(tS)) {
                 return true;
             }
         }
 
-        return GT_MetaTileEntity_WorldAccelerator._mBlacklistedTiles.stream()
+        return MTEWorldAccelerator._mBlacklistedTiles.stream()
             .map(Class::getCanonicalName)
             .map(String::toLowerCase)
             .anyMatch(tCanonicalName::equalsIgnoreCase);
@@ -464,7 +464,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
                 }
             }
         } catch (Exception e) {
-            GT_Log.err.println("GT_MetaTileEntity_WorldAccelerator.tryTickBlock.crash\n" + e.getMessage());
+            GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.tryTickBlock.crash\n" + e.getMessage());
         }
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java
index ff3048f4b2..6f6f01f3ba 100644
--- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java
@@ -45,18 +45,18 @@ import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-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.items.GT_Block_LongDistancePipe;
+import gregtech.api.items.BlockLongDistancePipe;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull_NonElectric;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicHullNonElectric;
+import gregtech.api.util.GTUtility;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_MetaTileEntity_BasicHull_NonElectric {
+public abstract class MTELongDistancePipelineBase extends MTEBasicHullNonElectric {
 
     protected static final int INPUT_INDEX = 0;
     protected static final int OUTPUT_INDEX = 1;
@@ -65,19 +65,17 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
 
     public static int minimalDistancePoints = 64;
 
-    protected GT_MetaTileEntity_LongDistancePipelineBase mTarget = null;
+    protected MTELongDistancePipelineBase mTarget = null;
     // these two are updated by machine block update thread, so must be volatile
-    protected volatile GT_MetaTileEntity_LongDistancePipelineBase mSender = null;
+    protected volatile MTELongDistancePipelineBase mSender = null;
     protected volatile ChunkCoordinates mTargetPos = null;
-    protected GT_MetaTileEntity_LongDistancePipelineBase mTooCloseTarget = null, mTooCloseSender = null;
+    protected MTELongDistancePipelineBase mTooCloseTarget = null, mTooCloseSender = null;
 
-    public GT_MetaTileEntity_LongDistancePipelineBase(int aID, String aName, String aNameRegional, int aTier,
-        String aDescription) {
+    public MTELongDistancePipelineBase(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
         super(aID, aName, aNameRegional, aTier, aDescription);
     }
 
-    public GT_MetaTileEntity_LongDistancePipelineBase(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTELongDistancePipelineBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
@@ -111,7 +109,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
         }
     }
 
-    public boolean isSameClass(GT_MetaTileEntity_LongDistancePipelineBase other) {
+    public boolean isSameClass(MTELongDistancePipelineBase other) {
         return false;
     }
 
@@ -120,7 +118,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
         if (aBaseMetaTileEntity.isClientSide()) return true;
         ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
         if (tCurrentItem != null) {
-            if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList)) {
+            if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSoftHammerList)) {
                 scanPipes();
                 return true;
             }
@@ -149,11 +147,10 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
                 TileEntity te = world.getTileEntity(mTargetPos.posX, mTargetPos.posY, mTargetPos.posZ);
                 final IMetaTileEntity tMeta;
                 if (te instanceof BaseMetaTileEntity
-                    && ((tMeta = ((BaseMetaTileEntity) te)
-                        .getMetaTileEntity()) instanceof GT_MetaTileEntity_LongDistancePipelineBase)
-                    && isSameClass((GT_MetaTileEntity_LongDistancePipelineBase) tMeta)) {
+                    && ((tMeta = ((BaseMetaTileEntity) te).getMetaTileEntity()) instanceof MTELongDistancePipelineBase)
+                    && isSameClass((MTELongDistancePipelineBase) tMeta)) {
                     // It's the right type!
-                    mTarget = (GT_MetaTileEntity_LongDistancePipelineBase) tMeta;
+                    mTarget = (MTELongDistancePipelineBase) tMeta;
                 } else if (te != null) {
                     // It isn't the right type, kill the target position
                     mTargetPos = null;
@@ -217,7 +214,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
         // Start scanning from the output side
         Block aBlock = gtTile.getBlockAtSide(gtTile.getBackFacing());
 
-        if (aBlock instanceof GT_Block_LongDistancePipe) {
+        if (aBlock instanceof BlockLongDistancePipe) {
             byte aMetaData = gtTile.getMetaIDAtSide(gtTile.getBackFacing());
             if (aMetaData != getPipeMeta()) return;
 
@@ -255,7 +252,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
                     TileEntity tTileEntity = world.getTileEntity(aCoords.posX, aCoords.posY, aCoords.posZ);
                     if (tTileEntity != gtTile && tTileEntity instanceof BaseMetaTileEntity
                         && ((BaseMetaTileEntity) tTileEntity)
-                            .getMetaTileEntity() instanceof GT_MetaTileEntity_LongDistancePipelineBase tGtTile) {
+                            .getMetaTileEntity() instanceof MTELongDistancePipelineBase tGtTile) {
                         if (isSameClass(tGtTile) && tWires.contains(
                             tGtTile.getFacingOffset(
                                 (BaseMetaTileEntity) tTileEntity,
diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineFluid.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java
index 70e295f3ad..e3886360c6 100644
--- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineFluid.java
+++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java
@@ -37,22 +37,21 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_LongDistancePipelineFluid extends GT_MetaTileEntity_LongDistancePipelineBase {
+public class MTELongDistancePipelineFluid extends MTELongDistancePipelineBase {
 
     static final FluidTankInfo[] emptyTank = { new FluidTankInfo(null, Integer.MAX_VALUE) };
 
-    public GT_MetaTileEntity_LongDistancePipelineFluid(int aID, String aName, String aNameRegional, int aTier) {
+    public MTELongDistancePipelineFluid(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "Sends fluids over long distances");
     }
 
-    public GT_MetaTileEntity_LongDistancePipelineFluid(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTELongDistancePipelineFluid(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
-    public boolean isSameClass(GT_MetaTileEntity_LongDistancePipelineBase other) {
-        return other instanceof GT_MetaTileEntity_LongDistancePipelineFluid;
+    public boolean isSameClass(MTELongDistancePipelineBase other) {
+        return other instanceof MTELongDistancePipelineFluid;
     }
 
     @Override
@@ -99,7 +98,7 @@ public class GT_MetaTileEntity_LongDistancePipelineFluid extends GT_MetaTileEnti
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LongDistancePipelineFluid(mName, mTier, getDescription()[0], mTextures);
+        return new MTELongDistancePipelineFluid(mName, mTier, getDescription()[0], mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineItem.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java
index e1510f4d3d..f619d40329 100644
--- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineItem.java
+++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java
@@ -31,26 +31,25 @@ import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_LongDistancePipelineItem extends GT_MetaTileEntity_LongDistancePipelineBase {
+public class MTELongDistancePipelineItem extends MTELongDistancePipelineBase {
 
-    public GT_MetaTileEntity_LongDistancePipelineItem(int aID, String aName, String aNameRegional, int aTier) {
+    public MTELongDistancePipelineItem(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "Sends Items over long distances");
     }
 
-    public GT_MetaTileEntity_LongDistancePipelineItem(String aName, int aTier, String aDescription,
-        ITexture[][][] aTextures) {
+    public MTELongDistancePipelineItem(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
-    public boolean isSameClass(GT_MetaTileEntity_LongDistancePipelineBase other) {
-        return other instanceof GT_MetaTileEntity_LongDistancePipelineItem;
+    public boolean isSameClass(MTELongDistancePipelineBase other) {
+        return other instanceof MTELongDistancePipelineItem;
     }
 
     @Override
@@ -163,7 +162,7 @@ public class GT_MetaTileEntity_LongDistancePipelineItem extends GT_MetaTileEntit
             }
         }
 
-        return GT_Values.emptyIntArray;
+        return GTValues.emptyIntArray;
     }
 
     @Override
@@ -188,7 +187,7 @@ public class GT_MetaTileEntity_LongDistancePipelineItem extends GT_MetaTileEntit
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LongDistancePipelineItem(mName, mTier, getDescription()[0], mTextures);
+        return new MTELongDistancePipelineItem(mName, mTier, getDescription()[0], mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AbstractMultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAbstractMultiFurnace.java
index 0c91951e28..f81f7e1d96 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AbstractMultiFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAbstractMultiFurnace.java
@@ -3,18 +3,18 @@ package gregtech.common.tileentities.machines.multi;
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.HeatingCoilLevel;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
 
-public abstract class GT_MetaTileEntity_AbstractMultiFurnace<T extends GT_MetaTileEntity_AbstractMultiFurnace<T>>
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> {
+public abstract class MTEAbstractMultiFurnace<T extends MTEAbstractMultiFurnace<T>>
+    extends MTEExtendedPowerMultiBlockBase<T> {
 
     private HeatingCoilLevel mCoilLevel;
 
-    protected GT_MetaTileEntity_AbstractMultiFurnace(int aID, String aName, String aNameRegional) {
+    protected MTEAbstractMultiFurnace(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    protected GT_MetaTileEntity_AbstractMultiFurnace(String aName) {
+    protected MTEAbstractMultiFurnace(String aName) {
         super(aName);
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java
index aa422505d7..31456825ba 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java
@@ -3,19 +3,19 @@ package gregtech.common.tileentities.machines.multi;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-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.OutputBus;
+import static gregtech.GTMod.GT_FML_LOGGER;
+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.OutputBus;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofHatchAdder;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,8 +35,8 @@ 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.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
@@ -45,30 +45,30 @@ import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchDataAccess;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
 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.render.TextureFactory;
-import gregtech.api.util.GT_AssemblyLineUtils;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.IGT_HatchAdder;
+import gregtech.api.util.AssemblyLineUtils;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipe.RecipeAssemblyLine;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.IGTHatchAdder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_AssemblyLine extends
-    GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_AssemblyLine> implements ISurvivalConstructable {
+public class MTEAssemblyLine extends MTEExtendedPowerMultiBlockBase<MTEAssemblyLine> implements ISurvivalConstructable {
 
-    public ArrayList<GT_MetaTileEntity_Hatch_DataAccess> mDataAccessHatches = new ArrayList<>();
+    public ArrayList<MTEHatchDataAccess> mDataAccessHatches = new ArrayList<>();
     private static final String STRUCTURE_PIECE_FIRST = "first";
     private static final String STRUCTURE_PIECE_LATER = "later";
     private static final String STRUCTURE_PIECE_LAST = "last";
-    private static final IStructureDefinition<GT_MetaTileEntity_AssemblyLine> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_AssemblyLine>builder()
+    private static final IStructureDefinition<MTEAssemblyLine> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEAssemblyLine>builder()
         .addShape(
             STRUCTURE_PIECE_FIRST,
             transpose(new String[][] { { " ", "e", " " }, { "~", "l", "G" }, { "g", "m", "g" }, { "b", "i", "b" }, }))
@@ -78,58 +78,57 @@ public class GT_MetaTileEntity_AssemblyLine extends
         .addShape(
             STRUCTURE_PIECE_LAST,
             transpose(new String[][] { { " ", "e", " " }, { "d", "l", "d" }, { "g", "m", "g" }, { "o", "i", "b" }, }))
-        .addElement('G', ofBlock(GregTech_API.sBlockCasings3, 10)) // grate machine casing
-        .addElement('l', ofBlock(GregTech_API.sBlockCasings2, 9)) // assembler machine casing
-        .addElement('m', ofBlock(GregTech_API.sBlockCasings2, 5)) // assembling line casing
+        .addElement('G', ofBlock(GregTechAPI.sBlockCasings3, 10)) // grate machine casing
+        .addElement('l', ofBlock(GregTechAPI.sBlockCasings2, 9)) // assembler machine casing
+        .addElement('m', ofBlock(GregTechAPI.sBlockCasings2, 5)) // assembling line casing
         .addElement('g', Glasses.chainAllGlasses())
         .addElement(
             'e',
             ofChain(
                 Energy.newAny(16, 1, ForgeDirection.UP, ForgeDirection.NORTH, ForgeDirection.SOUTH),
-                ofBlock(GregTech_API.sBlockCasings2, 0)))
+                ofBlock(GregTechAPI.sBlockCasings2, 0)))
         .addElement(
             'd',
-            buildHatchAdder(GT_MetaTileEntity_AssemblyLine.class).atLeast(DataHatchElement.DataAccess)
+            buildHatchAdder(MTEAssemblyLine.class).atLeast(DataHatchElement.DataAccess)
                 .dot(2)
                 .casingIndex(42)
                 .allowOnly(ForgeDirection.NORTH)
-                .buildAndChain(GregTech_API.sBlockCasings3, 10))
+                .buildAndChain(GregTechAPI.sBlockCasings3, 10))
         .addElement(
             'b',
-            buildHatchAdder(GT_MetaTileEntity_AssemblyLine.class)
-                .atLeast(InputHatch, InputHatch, InputHatch, InputHatch, Maintenance)
+            buildHatchAdder(MTEAssemblyLine.class).atLeast(InputHatch, InputHatch, InputHatch, InputHatch, Maintenance)
                 .casingIndex(16)
                 .dot(3)
                 .allowOnly(ForgeDirection.DOWN)
                 .buildAndChain(
-                    ofBlock(GregTech_API.sBlockCasings2, 0),
-                    ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addOutputToMachineList, 16, 4)))
+                    ofBlock(GregTechAPI.sBlockCasings2, 0),
+                    ofHatchAdder(MTEAssemblyLine::addOutputToMachineList, 16, 4)))
         .addElement(
             'I',
             ofChain(
                 // all blocks nearby use solid steel casing, so let's use the texture of that
                 InputBus.newAny(16, 5, ForgeDirection.DOWN),
-                ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addOutputToMachineList, 16, 4)))
+                ofHatchAdder(MTEAssemblyLine::addOutputToMachineList, 16, 4)))
         .addElement('i', InputBus.newAny(16, 5, ForgeDirection.DOWN))
         .addElement('o', OutputBus.newAny(16, 4, ForgeDirection.DOWN))
         .build();
 
-    public GT_MetaTileEntity_AssemblyLine(int aID, String aName, String aNameRegional) {
+    public MTEAssemblyLine(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_AssemblyLine(String aName) {
+    public MTEAssemblyLine(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_AssemblyLine(this.mName);
+        return new MTEAssemblyLine(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("Assembling Line")
             .addInfo("Controller block for the Assembling Line")
             .addInfo("Used to make complex machine parts (LuV+)")
@@ -195,7 +194,7 @@ public class GT_MetaTileEntity_AssemblyLine extends
     @Override
     @NotNull
     public CheckRecipeResult checkProcessing() {
-        if (GT_Values.D1) {
+        if (GTValues.D1) {
             GT_FML_LOGGER.info("Start ALine recipe check");
         }
         CheckRecipeResult result = CheckRecipeResultRegistry.NO_DATA_STICKS;
@@ -204,7 +203,7 @@ public class GT_MetaTileEntity_AssemblyLine extends
         if (tDataStickList.isEmpty()) {
             return result;
         }
-        if (GT_Values.D1) {
+        if (GTValues.D1) {
             GT_FML_LOGGER.info("Stick accepted, " + tDataStickList.size() + " Data Sticks found");
         }
 
@@ -213,23 +212,23 @@ public class GT_MetaTileEntity_AssemblyLine extends
         long averageVoltage = getAverageInputVoltage();
         long maxAmp = mEnergyHatches.size() <= 1 ? 1 : getMaxInputAmps();
         int maxParallel = 1;
-        Map<GT_Utility.ItemId, ItemStack> inputsFromME = getStoredInputsFromME();
+        Map<GTUtility.ItemId, ItemStack> inputsFromME = getStoredInputsFromME();
         Map<Fluid, FluidStack> fluidsFromME = getStoredFluidsFromME();
 
         for (ItemStack tDataStick : tDataStickList) {
-            GT_AssemblyLineUtils.LookupResult tLookupResult = GT_AssemblyLineUtils
+            AssemblyLineUtils.LookupResult tLookupResult = AssemblyLineUtils
                 .findAssemblyLineRecipeFromDataStick(tDataStick, false);
 
-            if (tLookupResult.getType() == GT_AssemblyLineUtils.LookupResultType.INVALID_STICK) {
+            if (tLookupResult.getType() == AssemblyLineUtils.LookupResultType.INVALID_STICK) {
                 result = CheckRecipeResultRegistry.NO_RECIPE;
                 continue;
             }
 
-            GT_Recipe_AssemblyLine tRecipe = tLookupResult.getRecipe();
+            GTRecipe.RecipeAssemblyLine tRecipe = tLookupResult.getRecipe();
             // Check if the recipe on the data stick is the current recipe for it's given output, if not we update it
             // and continue to next.
-            if (tLookupResult.getType() != GT_AssemblyLineUtils.LookupResultType.VALID_STACK_AND_VALID_HASH) {
-                tRecipe = GT_AssemblyLineUtils.processDataStick(tDataStick);
+            if (tLookupResult.getType() != AssemblyLineUtils.LookupResultType.VALID_STACK_AND_VALID_HASH) {
+                tRecipe = AssemblyLineUtils.processDataStick(tDataStick);
                 if (tRecipe == null) {
                     result = CheckRecipeResultRegistry.NO_RECIPE;
                     continue;
@@ -248,7 +247,7 @@ public class GT_MetaTileEntity_AssemblyLine extends
 
             // first validate we have enough input busses and input hatches for this recipe
             if (mInputBusses.size() < tRecipe.mInputs.length || mInputHatches.size() < tRecipe.mFluidInputs.length) {
-                if (GT_Values.D1) {
+                if (GTValues.D1) {
                     GT_FML_LOGGER.info(
                         "Not enough sources: Need ({}, {}), has ({}, {})",
                         mInputBusses.size(),
@@ -261,12 +260,12 @@ public class GT_MetaTileEntity_AssemblyLine extends
             }
 
             // Check Inputs allign
-            int[] itemConsumptions = GT_Recipe_AssemblyLine.getItemConsumptionAmountArray(mInputBusses, tRecipe);
+            int[] itemConsumptions = GTRecipe.RecipeAssemblyLine.getItemConsumptionAmountArray(mInputBusses, tRecipe);
             if (itemConsumptions == null || itemConsumptions.length == 0) {
                 result = CheckRecipeResultRegistry.NO_RECIPE;
                 continue;
             }
-            maxParallel = (int) GT_Recipe_AssemblyLine
+            maxParallel = (int) GTRecipe.RecipeAssemblyLine
                 .maxParallelCalculatedByInputItems(mInputBusses, maxParallel, itemConsumptions, inputsFromME);
             if (maxParallel <= 0) {
                 result = CheckRecipeResultRegistry.NO_RECIPE;
@@ -274,13 +273,13 @@ public class GT_MetaTileEntity_AssemblyLine extends
             }
             tStacks = itemConsumptions;
 
-            if (GT_Values.D1) {
+            if (GTValues.D1) {
                 GT_FML_LOGGER.info("All Items accepted");
             }
 
             // Check Fluid Inputs allign
             if (tRecipe.mFluidInputs.length > 0) {
-                maxParallel = (int) GT_Recipe_AssemblyLine
+                maxParallel = (int) RecipeAssemblyLine
                     .maxParallelCalculatedByInputFluids(mInputHatches, maxParallel, tRecipe.mFluidInputs, fluidsFromME);
                 if (maxParallel <= 0) {
                     result = CheckRecipeResultRegistry.NO_RECIPE;
@@ -289,11 +288,11 @@ public class GT_MetaTileEntity_AssemblyLine extends
                 tFluids = tRecipe.mFluidInputs;
             }
 
-            if (GT_Values.D1) {
+            if (GTValues.D1) {
                 GT_FML_LOGGER.info("All fluids accepted");
             }
 
-            if (GT_Values.D1) {
+            if (GTValues.D1) {
                 GT_FML_LOGGER.info("Check overclock");
             }
 
@@ -312,7 +311,7 @@ public class GT_MetaTileEntity_AssemblyLine extends
             calculateOverclockedNessMultiInternal(tRecipe.mEUt, tRecipe.mDuration, (int) maxAmp, averageVoltage, false);
             // In case recipe is too OP for that machine
             if (lEUt == Long.MAX_VALUE) {
-                if (GT_Values.D1) {
+                if (GTValues.D1) {
                     GT_FML_LOGGER.info("Recipe too OP");
                 }
                 result = CheckRecipeResultRegistry.POWER_OVERFLOW;
@@ -320,14 +319,14 @@ public class GT_MetaTileEntity_AssemblyLine extends
             }
 
             if (mMaxProgresstime == Integer.MAX_VALUE) {
-                if (GT_Values.D1) {
+                if (GTValues.D1) {
                     GT_FML_LOGGER.info("Recipe too OP");
                 }
                 result = CheckRecipeResultRegistry.DURATION_OVERFLOW;
                 continue;
             }
 
-            if (GT_Values.D1) {
+            if (GTValues.D1) {
                 GT_FML_LOGGER.info("Find available recipe");
             }
             result = CheckRecipeResultRegistry.SUCCESSFUL;
@@ -344,12 +343,12 @@ public class GT_MetaTileEntity_AssemblyLine extends
             return CheckRecipeResultRegistry.INTERNAL_ERROR;
         }
 
-        if (GT_Values.D1) {
+        if (GTValues.D1) {
             GT_FML_LOGGER.info("All checked start consuming inputs");
         }
 
-        GT_Recipe_AssemblyLine.consumeInputItems(mInputBusses, maxParallel, tStacks, inputsFromME);
-        GT_Recipe_AssemblyLine.consumeInputFluids(mInputHatches, maxParallel, tFluids, fluidsFromME);
+        GTRecipe.RecipeAssemblyLine.consumeInputItems(mInputBusses, maxParallel, tStacks, inputsFromME);
+        GTRecipe.RecipeAssemblyLine.consumeInputFluids(mInputHatches, maxParallel, tFluids, fluidsFromME);
 
         if (this.lEUt > 0) {
             this.lEUt = -this.lEUt;
@@ -357,7 +356,7 @@ public class GT_MetaTileEntity_AssemblyLine extends
         this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
         this.mEfficiencyIncrease = 10000;
         updateSlots();
-        if (GT_Values.D1) {
+        if (GTValues.D1) {
             GT_FML_LOGGER.info("Recipe successful");
         }
         return result;
@@ -365,14 +364,14 @@ public class GT_MetaTileEntity_AssemblyLine extends
 
     @Override
     public boolean onRunningTick(ItemStack aStack) {
-        for (GT_MetaTileEntity_Hatch_DataAccess hatch_dataAccess : mDataAccessHatches) {
+        for (MTEHatchDataAccess hatch_dataAccess : mDataAccessHatches) {
             hatch_dataAccess.setActive(true);
         }
         return super.onRunningTick(aStack);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_AssemblyLine> getStructureDefinition() {
+    public IStructureDefinition<MTEAssemblyLine> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -406,10 +405,10 @@ public class GT_MetaTileEntity_AssemblyLine extends
      */
     public ArrayList<ItemStack> getDataItems(int state) {
         ArrayList<ItemStack> rList = new ArrayList<>();
-        if (GT_Utility.isStackValid(mInventory[1]) && isCorrectDataItem(mInventory[1], state)) {
+        if (GTUtility.isStackValid(mInventory[1]) && isCorrectDataItem(mInventory[1], state)) {
             rList.add(mInventory[1]);
         }
-        for (GT_MetaTileEntity_Hatch_DataAccess tHatch : filterValidMTEs(mDataAccessHatches)) {
+        for (MTEHatchDataAccess tHatch : filterValidMTEs(mDataAccessHatches)) {
             rList.addAll(tHatch.getInventoryItems(stack -> isCorrectDataItem(stack, state)));
         }
         return rList;
@@ -419,9 +418,9 @@ public class GT_MetaTileEntity_AssemblyLine extends
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DataAccess) {
-            ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-            return mDataAccessHatches.add((GT_MetaTileEntity_Hatch_DataAccess) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchDataAccess) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            return mDataAccessHatches.add((MTEHatchDataAccess) aMetaTileEntity);
         }
         return false;
     }
@@ -473,22 +472,22 @@ public class GT_MetaTileEntity_AssemblyLine extends
         return VoidingMode.ITEM_ONLY_MODES;
     }
 
-    private enum DataHatchElement implements IHatchElement<GT_MetaTileEntity_AssemblyLine> {
+    private enum DataHatchElement implements IHatchElement<MTEAssemblyLine> {
 
         DataAccess;
 
         @Override
         public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
-            return Collections.singletonList(GT_MetaTileEntity_Hatch_DataAccess.class);
+            return Collections.singletonList(MTEHatchDataAccess.class);
         }
 
         @Override
-        public IGT_HatchAdder<GT_MetaTileEntity_AssemblyLine> adder() {
-            return GT_MetaTileEntity_AssemblyLine::addDataAccessToMachineList;
+        public IGTHatchAdder<MTEAssemblyLine> adder() {
+            return MTEAssemblyLine::addDataAccessToMachineList;
         }
 
         @Override
-        public long count(GT_MetaTileEntity_AssemblyLine t) {
+        public long count(MTEAssemblyLine t) {
             return t.mDataAccessHatches.size();
         }
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEBrickedBlastFurnace.java
index a9cb7708cf..f37b5e3e81 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEBrickedBlastFurnace.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.multi;
 
-import static gregtech.api.util.GT_Waila.getMachineProgressString;
+import static gregtech.api.util.GTWaila.getMachineProgressString;
 
 import java.util.List;
 
@@ -14,8 +14,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import org.lwjgl.input.Keyboard;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SteamVariant;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
@@ -24,12 +24,11 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_PrimitiveBlastFurnace
-    implements ISecondaryDescribable {
+public class MTEBrickedBlastFurnace extends MTEPrimitiveBlastFurnace implements ISecondaryDescribable {
 
     private static final ITexture[] FACING_SIDE = { TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_DENSEBRICKS) };
     private static final ITexture[] FACING_FRONT = {
@@ -39,13 +38,13 @@ public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_Pri
             .addIcon(BlockIcons.MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE_GLOW)
             .glow()
             .build() };
-    private GT_Multiblock_Tooltip_Builder tooltipBuilder;
+    private MultiblockTooltipBuilder tooltipBuilder;
 
-    public GT_MetaTileEntity_BrickedBlastFurnace(int aID, String aName, String aNameRegional) {
+    public MTEBrickedBlastFurnace(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_BrickedBlastFurnace(String aName) {
+    public MTEBrickedBlastFurnace(String aName) {
         super(aName);
     }
 
@@ -67,14 +66,14 @@ public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_Pri
         return getTooltip().getStructureInformation();
     }
 
-    protected GT_Multiblock_Tooltip_Builder getTooltip() {
+    protected MultiblockTooltipBuilder getTooltip() {
         if (tooltipBuilder == null) {
-            tooltipBuilder = new GT_Multiblock_Tooltip_Builder();
+            tooltipBuilder = new MultiblockTooltipBuilder();
             tooltipBuilder.addMachineType("Blast Furnace")
                 .addInfo("Controller Block for the Bricked Blast Furnace")
                 .addInfo("Usable for Steel and general Pyrometallurgy")
                 .addInfo("Has a useful interface, unlike other gregtech multis")
-                .addPollutionAmount(GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond)
+                .addPollutionAmount(GTMod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond)
                 .addSeparator()
                 .beginStructureBlock(3, 4, 3, true)
                 .addController("Front center")
@@ -98,12 +97,12 @@ public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_Pri
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BrickedBlastFurnace(this.mName);
+        return new MTEBrickedBlastFurnace(this.mName);
     }
 
     @Override
     protected Block getCasingBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java
index 3a22c4ee99..268ef069a7 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java
@@ -20,33 +20,32 @@ import net.minecraft.world.ChunkPosition;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.oredict.OreDictionary;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.ParticleFX;
 import gregtech.api.interfaces.ISecondaryDescribable;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TooltipMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTETooltipMultiBlockBase;
 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.MultiblockTooltipBuilder;
 import gregtech.api.util.WorldSpawnedEventBuilder;
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 
-public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMultiBlockBase
-    implements ISecondaryDescribable {
+public class MTECharcoalPit extends MTETooltipMultiBlockBase implements ISecondaryDescribable {
 
     private boolean running = false;
 
-    public GT_MetaTileEntity_Charcoal_Pit(int aID, String aName, String aNameRegional) {
+    public MTECharcoalPit(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_Charcoal_Pit(String aName) {
+    public MTECharcoalPit(String aName) {
         super(aName);
     }
 
@@ -83,7 +82,7 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMul
             mMaxProgresstime = Math.max(1, mMaxProgresstime);
 
             // adds all the pollution at once when the recipe starts
-            GT_Pollution.addPollution(getBaseMetaTileEntity(), mMaxProgresstime * getPollutionPerTick(null));
+            Pollution.addPollution(getBaseMetaTileEntity(), mMaxProgresstime * getPollutionPerTick(null));
             return CheckRecipeResultRegistry.SUCCESSFUL;
         } else {
             mEfficiency = 0;
@@ -118,7 +117,7 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMul
                             getBaseMetaTileEntity().getXCoord() + tPos.chunkPosX,
                             getBaseMetaTileEntity().getYCoord() + tPos.chunkPosY,
                             getBaseMetaTileEntity().getZCoord() + tPos.chunkPosZ,
-                            GregTech_API.sBlockReinforced,
+                            GregTechAPI.sBlockReinforced,
                             4,
                             3);
             }
@@ -171,7 +170,7 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMul
             if (!aList1.contains(new ChunkPosition(aX, aY + 1, aZ))
                 && (!aList2.contains(new ChunkPosition(aX, aY + 1, aZ)))) expandToChunkYPos = true;
         } else if (!(blockYPos == Blocks.dirt || blockYPos == Blocks.grass
-            || (aX == 0 && aY == -1 && aZ == 0 && blockYPos == GregTech_API.sBlockMachines))) {
+            || (aX == 0 && aY == -1 && aZ == 0 && blockYPos == GregTechAPI.sBlockMachines))) {
                 return false;
             }
 
@@ -220,7 +219,7 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMul
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond;
+        return GTMod.gregtechproxy.mPollutionCharcoalPitPerSecond;
     }
 
     @Override
@@ -240,11 +239,11 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMul
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Charcoal_Pit(mName);
+        return new MTECharcoalPit(mName);
     }
 
-    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("Charcoal Pile Igniter")
             .addInfo("Controller for the Charcoal Pit")
             .addInfo("Converts Logs into Brittle Charcoal blocks")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTECleanroom.java
index 93f6db2044..99a256e3f8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTECleanroom.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.multi;
 
-import static gregtech.api.enums.GT_Values.debugCleanroom;
+import static gregtech.api.enums.GTValues.debugCleanroom;
 import static gregtech.api.enums.Textures.BlockIcons.BLOCK_PLASCRETE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_CLEANROOM;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_CLEANROOM_ACTIVE;
@@ -25,8 +25,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.gtnewhorizon.structurelib.StructureLibAPI;
 import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.TierEU;
 import gregtech.api.interfaces.ICleanroom;
 import gregtech.api.interfaces.ICleanroomReceiver;
@@ -34,32 +34,32 @@ import gregtech.api.interfaces.ISecondaryDescribable;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TooltipMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEBasicHull;
+import gregtech.api.metatileentity.implementations.MTETooltipMultiBlockBase;
 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_Log;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiBlockBase
+public class MTECleanroom extends MTETooltipMultiBlockBase
     implements IConstructable, ISecondaryDescribable, ICleanroom {
 
     private final Set<ICleanroomReceiver> cleanroomReceivers = new HashSet<>();
     private int mHeight = -1;
 
-    public GT_MetaTileEntity_Cleanroom(int aID, String aName, String aNameRegional) {
+    public MTECleanroom(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_Cleanroom(String aName) {
+    public MTECleanroom(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Cleanroom(mName);
+        return new MTECleanroom(mName);
     }
 
     @Override
@@ -84,8 +84,8 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
     }
 
     @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("Cleanroom")
             .addInfo("Controller block for the Cleanroom")
             .addInfo("Consumes 40 EU/t when first turned on")
@@ -101,7 +101,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
             .addController("Top center")
             .addCasingInfoRange("Plascrete", 20, 1007, false)
             .addStructureInfo(
-                GT_Values.cleanroomGlass
+                GTValues.cleanroomGlass
                     + "% of the Plascrete can be replaced with Reinforced Glass (not counting the top layer)")
             .addStructureInfo(
                 "Other material can be used in place of Plascrete, even in higher percentages. See config for detail")
@@ -167,18 +167,18 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         cleanroomReceivers.clear();
 
         if (debugCleanroom) {
-            GT_Log.out.println("Cleanroom: Checking machine");
+            GTLog.out.println("Cleanroom: Checking machine");
         }
         for (int i = 1; i < 8; i++) {
             final Block tBlock = aBaseMetaTileEntity.getBlockOffset(i, 0, 0);
             final int tMeta = aBaseMetaTileEntity.getMetaIDOffset(i, 0, 0);
-            if (tBlock != GregTech_API.sBlockCasings3 || tMeta != 11) {
-                if (tBlock == GregTech_API.sBlockReinforced || tMeta == 2) {
+            if (tBlock != GregTechAPI.sBlockCasings3 || tMeta != 11) {
+                if (tBlock == GregTechAPI.sBlockReinforced || tMeta == 2) {
                     x = i;
                     break;
                 } else {
                     if (debugCleanroom) {
-                        GT_Log.out.println("Cleanroom: Unable to detect room X edge?");
+                        GTLog.out.println("Cleanroom: Unable to detect room X edge?");
                     }
                     return false;
                 }
@@ -187,13 +187,13 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         for (int i = 1; i < 8; i++) {
             final Block tBlock = aBaseMetaTileEntity.getBlockOffset(0, 0, i);
             final int tMeta = aBaseMetaTileEntity.getMetaIDOffset(0, 0, i);
-            if (tBlock != GregTech_API.sBlockCasings3 || tMeta != 11) {
-                if (tBlock == GregTech_API.sBlockReinforced || tMeta == 2) {
+            if (tBlock != GregTechAPI.sBlockCasings3 || tMeta != 11) {
+                if (tBlock == GregTechAPI.sBlockReinforced || tMeta == 2) {
                     z = i;
                     break;
                 } else {
                     if (debugCleanroom) {
-                        GT_Log.out.println("Cleanroom: Unable to detect room Z edge?");
+                        GTLog.out.println("Cleanroom: Unable to detect room Z edge?");
                     }
                     return false;
                 }
@@ -205,9 +205,9 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
                 if (i == 0 && j == 0) continue;
                 final Block tBlock = aBaseMetaTileEntity.getBlockOffset(i, 0, j);
                 final int tMeta = aBaseMetaTileEntity.getMetaIDOffset(i, 0, j);
-                if (tBlock != GregTech_API.sBlockCasings3 && tMeta != 11) {
+                if (tBlock != GregTechAPI.sBlockCasings3 && tMeta != 11) {
                     if (debugCleanroom) {
-                        GT_Log.out.println("Cleanroom: This is not a filter.");
+                        GTLog.out.println("Cleanroom: This is not a filter.");
                     }
                     return false;
                 }
@@ -217,14 +217,14 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         for (int i = -1; i > -16; i--) {
             final Block tBlock = aBaseMetaTileEntity.getBlockOffset(x, i, z);
             final int tMeta = aBaseMetaTileEntity.getMetaIDOffset(x, i, z);
-            if (tBlock != GregTech_API.sBlockReinforced || tMeta != 2) {
+            if (tBlock != GregTechAPI.sBlockReinforced || tMeta != 2) {
                 y = i + 1;
                 break;
             }
         }
         if (y > -2) {
             if (debugCleanroom) {
-                GT_Log.out.println("Cleanroom: Room not tall enough?");
+                GTLog.out.println("Cleanroom: Room not tall enough?");
             }
             return false;
         }
@@ -236,23 +236,23 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
                         int tMeta = aBaseMetaTileEntity.getMetaIDOffset(dX, dY, dZ);
                         if (dY == 0) { // TOP
                             if (dX == -x || dX == x || dZ == -z || dZ == z) { // Top Border
-                                if (tBlock != GregTech_API.sBlockReinforced || tMeta != 2) {
+                                if (tBlock != GregTechAPI.sBlockReinforced || tMeta != 2) {
                                     if (debugCleanroom) {
-                                        GT_Log.out.println("Cleanroom: Non reinforced block on top edge? tMeta != 2");
+                                        GTLog.out.println("Cleanroom: Non reinforced block on top edge? tMeta != 2");
                                     }
                                     return false;
                                 }
                                 mPlascreteCount++;
                             } else if (dX != 0 || dZ != 0) { // Top Inner exclude center
-                                if (tBlock != GregTech_API.sBlockCasings3 || tMeta != 11) {
+                                if (tBlock != GregTechAPI.sBlockCasings3 || tMeta != 11) {
                                     if (debugCleanroom) {
-                                        GT_Log.out.println(
+                                        GTLog.out.println(
                                             "Cleanroom: Non reinforced block on top face interior? tMeta != 11");
                                     }
                                     return false;
                                 }
                             }
-                        } else if (tBlock == GregTech_API.sBlockReinforced && tMeta == 2) {
+                        } else if (tBlock == GregTechAPI.sBlockReinforced && tMeta == 2) {
                             mPlascreteCount++;
                         } else {
                             final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity
@@ -274,15 +274,15 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
                                         final IMetaTileEntity aMetaTileEntity = tTileEntity.getMetaTileEntity();
                                         if (aMetaTileEntity == null) {
                                             if (debugCleanroom) {
-                                                GT_Log.out.println("Cleanroom: Missing block? Not a aMetaTileEntity");
+                                                GTLog.out.println("Cleanroom: Missing block? Not a aMetaTileEntity");
                                             }
                                             return false;
                                         }
-                                        if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicHull) {
+                                        if (aMetaTileEntity instanceof MTEBasicHull) {
                                             mHullCount++;
                                         } else {
                                             if (debugCleanroom) {
-                                                GT_Log.out.println(
+                                                GTLog.out.println(
                                                     "Cleanroom: Incorrect GT block? " + tBlock.getUnlocalizedName());
                                             }
                                             return false;
@@ -297,7 +297,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
                                                 otherBlocks.compute(key, (k, v) -> v == null ? 1 : v + 1);
                                             } else {
                                                 if (debugCleanroom) {
-                                                    GT_Log.out.println(
+                                                    GTLog.out.println(
                                                         "Cleanroom: not allowed block " + tBlock.getUnlocalizedName());
                                                 }
                                                 return false;
@@ -315,13 +315,13 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
             || mDoorCount > 4
             || mHullCount > 10) {
             if (debugCleanroom) {
-                GT_Log.out.println("Cleanroom: Incorrect number of doors, hulls, or hatches.");
+                GTLog.out.println("Cleanroom: Incorrect number of doors, hulls, or hatches.");
             }
             return false;
         }
         if (mPlascreteCount < 20) {
             if (debugCleanroom) {
-                GT_Log.out.println("Cleanroom: Could not find 20 Plascrete.");
+                GTLog.out.println("Cleanroom: Could not find 20 Plascrete.");
             }
             return false;
         }
@@ -336,20 +336,20 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
             if (ce.allowedCount > 0) { // count has priority
                 if (e.getValue() > ce.allowedCount) {
                     if (debugCleanroom) {
-                        GT_Log.out.println("Cleanroom: Absolute count too high for a block.");
+                        GTLog.out.println("Cleanroom: Absolute count too high for a block.");
                     }
                     return false;
                 }
             } else if ((e.getValue() * 100) / (mPlascreteCount + otherBlockCount) > ce.percentage) {
                 if (debugCleanroom) {
-                    GT_Log.out.println("Cleanroom: Relative count too high for a block.");
+                    GTLog.out.println("Cleanroom: Relative count too high for a block.");
                 }
                 return false;
             }
         }
         if ((otherBlockCount * 100) / (mPlascreteCount + otherBlockCount) > maxAllowedRatio) {
             if (debugCleanroom) {
-                GT_Log.out.println("Cleanroom: Relative count of all non-plascrete blocks too high.");
+                GTLog.out.println("Cleanroom: Relative count of all non-plascrete blocks too high.");
             }
             return false;
         }
@@ -365,7 +365,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         }
         this.mHeight = -y;
         if (debugCleanroom) {
-            GT_Log.out.println("Cleanroom: Check successful.");
+            GTLog.out.println("Cleanroom: Check successful.");
         }
         return true;
     }
@@ -440,11 +440,11 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         for (int X = x - i; X <= x + i; X++) for (int Y = y; Y >= y - yoff; Y--) for (int Z = z - i; Z <= z + i; Z++) {
             if (X == x && Y == y && Z == z) continue;
             if (X == x - i || X == x + i || Z == z - i || Z == z + i || Y == y - yoff) {
-                if (b) StructureLibAPI.hintParticle(world, X, Y, Z, GregTech_API.sBlockReinforced, 2);
-                else world.setBlock(X, Y, Z, GregTech_API.sBlockReinforced, 2, 2);
+                if (b) StructureLibAPI.hintParticle(world, X, Y, Z, GregTechAPI.sBlockReinforced, 2);
+                else world.setBlock(X, Y, Z, GregTechAPI.sBlockReinforced, 2, 2);
             } else if (Y == y) {
-                if (b) StructureLibAPI.hintParticle(world, X, Y, Z, GregTech_API.sBlockCasings3, 11);
-                else world.setBlock(X, Y, Z, GregTech_API.sBlockCasings3, 11, 2);
+                if (b) StructureLibAPI.hintParticle(world, X, Y, Z, GregTechAPI.sBlockCasings3, 11);
+                else world.setBlock(X, Y, Z, GregTechAPI.sBlockCasings3, 11, 2);
             }
         }
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfiller1.java
index e61cfc0feb..080c4b3c40 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfiller1.java
@@ -4,26 +4,26 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_ConcreteBackfiller1 extends GT_MetaTileEntity_ConcreteBackfillerBase {
+public class MTEConcreteBackfiller1 extends MTEConcreteBackfillerBase {
 
-    public GT_MetaTileEntity_ConcreteBackfiller1(int aID, String aName, String aNameRegional) {
+    public MTEConcreteBackfiller1(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_ConcreteBackfiller1(String aName) {
+    public MTEConcreteBackfiller1(String aName) {
         super(aName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         return createTooltip("Concrete Backfiller");
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ConcreteBackfiller1(mName);
+        return new MTEConcreteBackfiller1(mName);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfiller2.java
index c175d73cb1..2d5fd17c82 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller2.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfiller2.java
@@ -4,26 +4,26 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_ConcreteBackfiller2 extends GT_MetaTileEntity_ConcreteBackfillerBase {
+public class MTEConcreteBackfiller2 extends MTEConcreteBackfillerBase {
 
-    public GT_MetaTileEntity_ConcreteBackfiller2(int aID, String aName, String aNameRegional) {
+    public MTEConcreteBackfiller2(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_ConcreteBackfiller2(String aName) {
+    public MTEConcreteBackfiller2(String aName) {
         super(aName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         return createTooltip("Advanced Concrete Backfiller");
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ConcreteBackfiller2(mName);
+        return new MTEConcreteBackfiller2(mName);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfillerBase.java
index 3ad37f4c37..2671db1e8c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfillerBase.java
@@ -1,10 +1,10 @@
 package gregtech.common.tileentities.machines.multi;
 
-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_Values.VN;
+import static gregtech.api.enums.GTValues.VN;
+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.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
 
 import java.util.List;
@@ -29,18 +29,18 @@ 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.GregTechAPI;
 import gregtech.api.enums.Materials;
-import gregtech.api.gui.modularui.GT_UITextures;
-import gregtech.api.gui.widgets.GT_LockedWhileActiveButton;
+import gregtech.api.gui.modularui.GTUITextures;
+import gregtech.api.gui.widgets.LockedWhileActiveButton;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 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.ShutDownReasonRegistry;
 
-public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTileEntity_DrillerBase {
+public abstract class MTEConcreteBackfillerBase extends MTEDrillerBase {
 
     private int mLastXOff = 0, mLastZOff = 0;
 
@@ -61,12 +61,12 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi
         return isWater(aBlock) || isLava(aBlock) || aBlock instanceof IFluidBlock;
     }
 
-    public GT_MetaTileEntity_ConcreteBackfillerBase(int aID, String aName, String aNameRegional) {
+    public MTEConcreteBackfillerBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         initRecipeResults();
     }
 
-    public GT_MetaTileEntity_ConcreteBackfillerBase(String aName) {
+    public MTEConcreteBackfillerBase(String aName) {
         super(aName);
         initRecipeResults();
     }
@@ -87,11 +87,11 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi
         if (aNBT.hasKey("liquidenabled")) mLiquidEnabled = aNBT.getBoolean("liquidenabled");
     }
 
-    protected GT_Multiblock_Tooltip_Builder createTooltip(String aStructureName) {
+    protected MultiblockTooltipBuilder createTooltip(String aStructureName) {
         String casings = getCasingBlockItem().get(0)
             .getDisplayName();
 
-        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+        final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Concrete Backfiller")
             .addInfo("Controller Block for the " + aStructureName)
             .addInfo("Will fill in areas below it with light concrete. This goes through walls")
@@ -121,7 +121,7 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi
     }
 
     @Override
-    protected List<IHatchElement<? super GT_MetaTileEntity_DrillerBase>> getAllowedHatches() {
+    protected List<IHatchElement<? super MTEDrillerBase>> getAllowedHatches() {
         return ImmutableList.of(InputHatch, InputBus, Maintenance, Energy);
     }
 
@@ -129,7 +129,7 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi
     protected void setElectricityStats() {
         this.mEfficiency = getCurrentEfficiency(null);
         this.mEfficiencyIncrease = 10000;
-        int tier = Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
+        int tier = Math.max(1, GTUtility.getTier(getMaxInputVoltage()));
         this.mEUt = -6 * (1 << (tier << 1));
         this.mMaxProgresstime = (workState == STATE_UPWARD ? 240 : 80) / (1 << tier);
         this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
@@ -184,8 +184,8 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi
             .isSolid()) {
             return false;
         }
-        return GT_Utility
-            .setBlockByFakePlayer(getFakePlayer(aBaseTile), aX, aY, aZ, GregTech_API.sBlockConcretes, 8, true);
+        return GTUtility
+            .setBlockByFakePlayer(getFakePlayer(aBaseTile), aX, aY, aZ, GregTechAPI.sBlockConcretes, 8, true);
     }
 
     private boolean tryRefillBlock(int aX, int aY, int aZ) {
@@ -194,7 +194,7 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi
             return false;
         }
         getBaseMetaTileEntity().getWorld()
-            .setBlock(aX, aY, aZ, GregTech_API.sBlockConcretes, 8, 3);
+            .setBlock(aX, aY, aZ, GregTechAPI.sBlockConcretes, 8, 3);
         return true;
     }
 
@@ -231,16 +231,15 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi
         final int BUTTON_Y_LEVEL = 91;
 
         builder.widget(
-            new GT_LockedWhileActiveButton(this.getBaseMetaTileEntity(), builder)
+            new LockedWhileActiveButton(this.getBaseMetaTileEntity(), builder)
                 .setOnClick((clickData, widget) -> mLiquidEnabled = !mLiquidEnabled)
                 .setPlayClickSound(true)
                 .setBackground(() -> {
                     if (mLiquidEnabled) {
-                        return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED,
-                            GT_UITextures.OVERLAY_BUTTON_LIQUIDMODE };
+                        return new IDrawable[] { GTUITextures.BUTTON_STANDARD_PRESSED,
+                            GTUITextures.OVERLAY_BUTTON_LIQUIDMODE };
                     }
-                    return new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
-                        GT_UITextures.OVERLAY_BUTTON_LIQUIDMODE_OFF };
+                    return new IDrawable[] { GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_LIQUIDMODE_OFF };
                 })
                 .attachSyncer(
                     new FakeSyncWidget.BooleanSyncer(() -> mLiquidEnabled, newBoolean -> mLiquidEnabled = newBoolean),
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDieselEngine.java
index 6c77dc7f0d..1465e6ba31 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDieselEngine.java
@@ -3,17 +3,17 @@ package gregtech.common.tileentities.machines.multi;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 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.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.Textures.BlockIcons.OVERLAY_FRONT_DIESEL_ENGINE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DIESEL_ENGINE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 
@@ -32,15 +32,15 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 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.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
@@ -48,19 +48,18 @@ import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
 import gregtech.api.recipe.maps.FuelBackend;
 import gregtech.api.render.TextureFactory;
-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;
 
-public class GT_MetaTileEntity_DieselEngine
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_DieselEngine> implements ISurvivalConstructable {
+public class MTEDieselEngine extends MTEEnhancedMultiBlockBase<MTEDieselEngine> implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DieselEngine>> STRUCTURE_DEFINITION = new ClassValue<>() {
+    private static final ClassValue<IStructureDefinition<MTEDieselEngine>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
-        protected IStructureDefinition<GT_MetaTileEntity_DieselEngine> computeValue(Class<?> type) {
-            return StructureDefinition.<GT_MetaTileEntity_DieselEngine>builder()
+        protected IStructureDefinition<MTEDieselEngine> computeValue(Class<?> type) {
+            return StructureDefinition.<MTEDieselEngine>builder()
                 .addShape(
                     STRUCTURE_PIECE_MAIN,
                     transpose(
@@ -73,7 +72,7 @@ public class GT_MetaTileEntity_DieselEngine
                 .addElement(
                     'h',
                     lazy(
-                        t -> buildHatchAdder(GT_MetaTileEntity_DieselEngine.class)
+                        t -> buildHatchAdder(MTEDieselEngine.class)
                             .atLeast(InputHatch, InputHatch, InputHatch, Muffler, Maintenance)
                             .casingIndex(t.getCasingTextureIndex())
                             .dot(1)
@@ -86,17 +85,17 @@ public class GT_MetaTileEntity_DieselEngine
     protected int fuelRemaining = 0;
     protected boolean boostEu = false;
 
-    public GT_MetaTileEntity_DieselEngine(int aID, String aName, String aNameRegional) {
+    public MTEDieselEngine(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_DieselEngine(String aName) {
+    public MTEDieselEngine(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("Combustion Generator")
             .addInfo("Controller block for the Large Combustion Engine")
             .addInfo("Supply Diesel Fuels and 1000L of Lubricant per hour to run")
@@ -207,14 +206,14 @@ public class GT_MetaTileEntity_DieselEngine
             double boostedOutput = 0;
             double extraFuelFraction = 0;
             for (FluidStack tFluid : tFluids) {
-                GT_Recipe tRecipe = getRecipeMap().getBackend()
+                GTRecipe tRecipe = getRecipeMap().getBackend()
                     .findFuel(tFluid);
                 if (tRecipe == null) continue;
                 fuelValue = tRecipe.mSpecialValue;
 
                 FluidStack tLiquid = tFluid.copy();
                 if (boostEu) {
-                    boostedFuelValue = GT_Utility.safeInt((long) (fuelValue * 1.5));
+                    boostedFuelValue = GTUtility.safeInt((long) (fuelValue * 1.5));
                     boostedOutput = getNominalOutput() * 3;
 
                     fuelConsumption = tLiquid.amount = getBoostFactor() * getNominalOutput() / fuelValue;
@@ -262,7 +261,7 @@ public class GT_MetaTileEntity_DieselEngine
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_DieselEngine> getStructureDefinition() {
+    public IStructureDefinition<MTEDieselEngine> getStructureDefinition() {
         return STRUCTURE_DEFINITION.get(getClass());
     }
 
@@ -273,7 +272,7 @@ public class GT_MetaTileEntity_DieselEngine
     }
 
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     public byte getCasingMeta() {
@@ -281,7 +280,7 @@ public class GT_MetaTileEntity_DieselEngine
     }
 
     public Block getIntakeBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     public byte getIntakeMeta() {
@@ -289,7 +288,7 @@ public class GT_MetaTileEntity_DieselEngine
     }
 
     public Block getGearboxBlock() {
-        return GregTech_API.sBlockCasings2;
+        return GregTechAPI.sBlockCasings2;
     }
 
     public byte getGearboxMeta() {
@@ -302,7 +301,7 @@ public class GT_MetaTileEntity_DieselEngine
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_DieselEngine(this.mName);
+        return new MTEDieselEngine(this.mName);
     }
 
     @Override
@@ -327,7 +326,7 @@ public class GT_MetaTileEntity_DieselEngine
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond;
+        return GTMod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond;
     }
 
     @Override
@@ -338,13 +337,13 @@ public class GT_MetaTileEntity_DieselEngine
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
         }
 
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch_Dynamo tHatch : filterValidMTEs(mDynamoHatches)) {
+        for (MTEHatchDynamo tHatch : filterValidMTEs(mDynamoHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -354,11 +353,11 @@ public class GT_MetaTileEntity_DieselEngine
         return new String[] { EnumChatFormatting.BLUE + "Diesel Engine" + 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",
             getIdealStatus() == getRepairStatus()
@@ -368,22 +367,22 @@ public class GT_MetaTileEntity_DieselEngine
                     + EnumChatFormatting.RESET,
             StatCollector.translateToLocal("GT5U.engine.output") + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(((long) mEUt * mEfficiency / 10000))
+                + GTUtility.formatNumbers(((long) mEUt * mEfficiency / 10000))
                 + EnumChatFormatting.RESET
                 + " EU/t",
             StatCollector.translateToLocal("GT5U.engine.consumption") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(fuelConsumption)
+                + GTUtility.formatNumbers(fuelConsumption)
                 + EnumChatFormatting.RESET
                 + " L/t",
             StatCollector.translateToLocal("GT5U.engine.value") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(fuelValue)
+                + GTUtility.formatNumbers(fuelValue)
                 + EnumChatFormatting.RESET
                 + " EU/L",
             StatCollector.translateToLocal("GT5U.turbine.fuel") + ": "
                 + EnumChatFormatting.GOLD
-                + GT_Utility.formatNumbers(fuelRemaining)
+                + GTUtility.formatNumbers(fuelRemaining)
                 + EnumChatFormatting.RESET
                 + " L",
             StatCollector.translateToLocal("GT5U.engine.efficiency") + ": "
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java
index 1f5fec10f3..9e89ad1a22 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java
@@ -5,18 +5,18 @@ 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.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.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofHatchAdder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +31,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.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
@@ -41,29 +41,29 @@ 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_EnhancedMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.tileentities.machines.MTEHatchOutputME;
 
-public class GT_MetaTileEntity_DistillationTower extends
-    GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_DistillationTower> implements ISurvivalConstructable {
+public class MTEDistillationTower extends MTEEnhancedMultiBlockBase<MTEDistillationTower>
+    implements ISurvivalConstructable {
 
     protected static final int CASING_INDEX = 49;
     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<GT_MetaTileEntity_DistillationTower> STRUCTURE_DEFINITION;
+    private static final IStructureDefinition<MTEDistillationTower> STRUCTURE_DEFINITION;
 
     static {
-        IHatchElement<GT_MetaTileEntity_DistillationTower> layeredOutputHatch = OutputHatch
-            .withCount(GT_MetaTileEntity_DistillationTower::getCurrentLayerOutputHatchCount)
-            .withAdder(GT_MetaTileEntity_DistillationTower::addLayerOutputHatch);
-        STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_DistillationTower>builder()
+        IHatchElement<MTEDistillationTower> layeredOutputHatch = OutputHatch
+            .withCount(MTEDistillationTower::getCurrentLayerOutputHatchCount)
+            .withAdder(MTEDistillationTower::addLayerOutputHatch);
+        STRUCTURE_DEFINITION = StructureDefinition.<MTEDistillationTower>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" }, }))
@@ -71,74 +71,67 @@ public class GT_MetaTileEntity_DistillationTower extends
             .addElement(
                 'b',
                 ofChain(
-                    buildHatchAdder(GT_MetaTileEntity_DistillationTower.class)
+                    buildHatchAdder(MTEDistillationTower.class)
                         .atLeast(Energy, OutputBus, InputHatch, InputBus, Maintenance)
                         .casingIndex(CASING_INDEX)
                         .dot(1)
                         .build(),
-                    onElementPass(
-                        GT_MetaTileEntity_DistillationTower::onCasingFound,
-                        ofBlock(GregTech_API.sBlockCasings4, 1))))
+                    onElementPass(MTEDistillationTower::onCasingFound, ofBlock(GregTechAPI.sBlockCasings4, 1))))
             .addElement(
                 'l',
                 ofChain(
-                    buildHatchAdder(GT_MetaTileEntity_DistillationTower.class).atLeast(layeredOutputHatch)
+                    buildHatchAdder(MTEDistillationTower.class).atLeast(layeredOutputHatch)
                         .casingIndex(CASING_INDEX)
                         .dot(2)
                         .disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN)
                         .build(),
-                    ofHatchAdder(GT_MetaTileEntity_DistillationTower::addEnergyInputToMachineList, CASING_INDEX, 2),
-                    ofHatchAdder(GT_MetaTileEntity_DistillationTower::addLayerOutputHatch, CASING_INDEX, 2),
-                    ofHatchAdder(GT_MetaTileEntity_DistillationTower::addMaintenanceToMachineList, CASING_INDEX, 2),
-                    onElementPass(
-                        GT_MetaTileEntity_DistillationTower::onCasingFound,
-                        ofBlock(GregTech_API.sBlockCasings4, 1))))
+                    ofHatchAdder(MTEDistillationTower::addEnergyInputToMachineList, CASING_INDEX, 2),
+                    ofHatchAdder(MTEDistillationTower::addLayerOutputHatch, CASING_INDEX, 2),
+                    ofHatchAdder(MTEDistillationTower::addMaintenanceToMachineList, CASING_INDEX, 2),
+                    onElementPass(MTEDistillationTower::onCasingFound, ofBlock(GregTechAPI.sBlockCasings4, 1))))
             // hint element only used in top layer
             .addElement(
                 'L',
-                buildHatchAdder(GT_MetaTileEntity_DistillationTower.class).atLeast(layeredOutputHatch)
+                buildHatchAdder(MTEDistillationTower.class).atLeast(layeredOutputHatch)
                     .casingIndex(CASING_INDEX)
                     .dot(2)
                     .disallowOnly(ForgeDirection.UP)
-                    .buildAndChain(GregTech_API.sBlockCasings4, 1))
+                    .buildAndChain(GregTechAPI.sBlockCasings4, 1))
             .addElement(
                 'c',
                 ofChain(
                     onElementPass(
                         t -> t.onTopLayerFound(false),
-                        ofHatchAdder(GT_MetaTileEntity_DistillationTower::addOutputToMachineList, CASING_INDEX, 3)),
+                        ofHatchAdder(MTEDistillationTower::addOutputToMachineList, CASING_INDEX, 3)),
                     onElementPass(
                         t -> t.onTopLayerFound(false),
-                        ofHatchAdder(
-                            GT_MetaTileEntity_DistillationTower::addMaintenanceToMachineList,
-                            CASING_INDEX,
-                            3)),
-                    onElementPass(t -> t.onTopLayerFound(true), ofBlock(GregTech_API.sBlockCasings4, 1)),
+                        ofHatchAdder(MTEDistillationTower::addMaintenanceToMachineList, CASING_INDEX, 3)),
+                    onElementPass(t -> t.onTopLayerFound(true), ofBlock(GregTechAPI.sBlockCasings4, 1)),
                     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 GT_MetaTileEntity_DistillationTower(int aID, String aName, String aNameRegional) {
+    public MTEDistillationTower(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_DistillationTower(String aName) {
+    public MTEDistillationTower(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_DistillationTower(this.mName);
+        return new MTEDistillationTower(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("Distillery")
             .addInfo("Controller block for the Distillation Tower")
             .addInfo("Fluids are only put out at the correct height")
@@ -214,7 +207,7 @@ public class GT_MetaTileEntity_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)
@@ -239,7 +232,7 @@ public class GT_MetaTileEntity_DistillationTower extends
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_DistillationTower> getStructureDefinition() {
+    public IStructureDefinition<MTEDistillationTower> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -308,9 +301,7 @@ public class GT_MetaTileEntity_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/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDrillerBase.java
index 702185c9bd..131a1a3166 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDrillerBase.java
@@ -3,23 +3,23 @@ package gregtech.common.tileentities.machines.multi;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 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.GT_Values.W;
+import static gregtech.api.enums.GTValues.W;
+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.Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.getCasingTextureForId;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -59,44 +59,43 @@ 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.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
-import gregtech.api.gui.modularui.GT_UITextures;
-import gregtech.api.gui.widgets.GT_LockedWhileActiveButton;
+import gregtech.api.gui.modularui.GTUITextures;
+import gregtech.api.gui.widgets.LockedWhileActiveButton;
 import gregtech.api.interfaces.IChunkLoader;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.objects.GT_ChunkManager;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchDataAccess;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.objects.GTChunkManager;
 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_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.IGT_HatchAdder;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.IGTHatchAdder;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 
-public abstract class GT_MetaTileEntity_DrillerBase
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_DrillerBase>
+public abstract class MTEDrillerBase extends MTEEnhancedMultiBlockBase<MTEDrillerBase>
     implements IChunkLoader, ISurvivalConstructable {
 
-    private static final ItemStack miningPipe = GT_ModHandler.getIC2Item("miningPipe", 0);
-    private static final ItemStack miningPipeTip = GT_ModHandler.getIC2Item("miningPipeTip", 0);
-    private static final Block miningPipeBlock = GT_Utility.getBlockFromStack(miningPipe);
-    private static final Block miningPipeTipBlock = GT_Utility.getBlockFromStack(miningPipeTip);
+    private static final ItemStack miningPipe = GTModHandler.getIC2Item("miningPipe", 0);
+    private static final ItemStack miningPipeTip = GTModHandler.getIC2Item("miningPipeTip", 0);
+    private static final Block miningPipeBlock = GTUtility.getBlockFromStack(miningPipe);
+    private static final Block miningPipeTipBlock = GTUtility.getBlockFromStack(miningPipeTip);
     protected static final String STRUCTURE_PIECE_MAIN = "main";
-    protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DrillerBase>> STRUCTURE_DEFINITION = new ClassValue<>() {
+    protected static final ClassValue<IStructureDefinition<MTEDrillerBase>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
-        protected IStructureDefinition<GT_MetaTileEntity_DrillerBase> computeValue(Class<?> type) {
-            return StructureDefinition.<GT_MetaTileEntity_DrillerBase>builder()
+        protected IStructureDefinition<MTEDrillerBase> computeValue(Class<?> type) {
+            return StructureDefinition.<MTEDrillerBase>builder()
                 .addShape(
                     STRUCTURE_PIECE_MAIN,
                     transpose(
@@ -116,8 +115,8 @@ public abstract class GT_MetaTileEntity_DrillerBase
                 .addElement(
                     'b',
                     lazy(
-                        t -> buildHatchAdder(GT_MetaTileEntity_DrillerBase.class).atLeastList(t.getAllowedHatches())
-                            .adder(GT_MetaTileEntity_DrillerBase::addToMachineList)
+                        t -> buildHatchAdder(MTEDrillerBase.class).atLeastList(t.getAllowedHatches())
+                            .adder(MTEDrillerBase::addToMachineList)
                             .casingIndex(t.casingTextureIndex)
                             .dot(1)
                             .buildAndChain(
@@ -172,12 +171,12 @@ public abstract class GT_MetaTileEntity_DrillerBase
     /** Allows inheritors to suppress wiping the last error if the machine is forcibly turned off. */
     protected boolean suppressErrorWipe = false;
 
-    public GT_MetaTileEntity_DrillerBase(int aID, String aName, String aNameRegional) {
+    public MTEDrillerBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         initFields();
     }
 
-    public GT_MetaTileEntity_DrillerBase(String aName) {
+    public MTEDrillerBase(String aName) {
         super(aName);
         initFields();
     }
@@ -187,8 +186,8 @@ public abstract class GT_MetaTileEntity_DrillerBase
         casingMeta = getCasingBlockItem().get(0)
             .getItemDamage();
         int frameId = 4096 + getFrameMaterial().mMetaItemSubID;
-        frameMeta = GregTech_API.METATILEENTITIES[frameId] != null
-            ? GregTech_API.METATILEENTITIES[frameId].getTileEntityBaseType()
+        frameMeta = GregTechAPI.METATILEENTITIES[frameId] != null
+            ? GregTechAPI.METATILEENTITIES[frameId].getTileEntityBaseType()
             : W;
         casingTextureIndex = getCasingTextureIndex();
         workState = STATE_DOWNWARD;
@@ -261,10 +260,10 @@ public abstract class GT_MetaTileEntity_DrillerBase
         EntityPlayer entityPlayer, float aX, float aY, float aZ) {
         if (side == getBaseMetaTileEntity().getFrontFacing()) {
             mChunkLoadingEnabled = !mChunkLoadingEnabled;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 entityPlayer,
-                mChunkLoadingEnabled ? GT_Utility.trans("502", "Mining chunk loading enabled")
-                    : GT_Utility.trans("503", "Mining chunk loading disabled"));
+                mChunkLoadingEnabled ? GTUtility.trans("502", "Mining chunk loading enabled")
+                    : GTUtility.trans("503", "Mining chunk loading disabled"));
             return true;
         }
         return super.onSolderingToolRightClick(side, wrenchingSide, entityPlayer, aX, aY, aZ);
@@ -272,7 +271,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
 
     @Override
     public void onRemoval() {
-        if (mChunkLoadingEnabled) GT_ChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity());
+        if (mChunkLoadingEnabled) GTChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity());
         super.onRemoval();
     }
 
@@ -283,7 +282,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
             && !mWorkChunkNeedsReload
             && !aBaseMetaTileEntity.isAllowedToWork()) {
             // if machine has stopped, stop chunkloading
-            GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity);
+            GTChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity);
             mWorkChunkNeedsReload = true;
         }
     }
@@ -322,7 +321,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
         }
 
         Block b = getBaseMetaTileEntity().getBlock(xPipe, yHead - 1, zPipe);
-        if (b != miningPipeTipBlock && !GT_Utility.setBlockByFakePlayer(
+        if (b != miningPipeTipBlock && !GTUtility.setBlockByFakePlayer(
             getFakePlayer(getBaseMetaTileEntity()),
             xPipe,
             yHead - 1,
@@ -349,7 +348,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
             if (!storedItem.isItemEqual(miningPipe)) continue;
 
             if (pipes == null) {
-                setInventorySlotContents(1, GT_Utility.copyOrNull(miningPipe));
+                setInventorySlotContents(1, GTUtility.copyOrNull(miningPipe));
                 pipes = getStackInSlot(1);
             }
 
@@ -365,8 +364,8 @@ public abstract class GT_MetaTileEntity_DrillerBase
     }
 
     private boolean tryOutputPipe() {
-        if (!getBaseMetaTileEntity().addStackToSlot(1, GT_Utility.copyAmount(1, miningPipe)))
-            mOutputItems = new ItemStack[] { GT_Utility.copyAmount(1, miningPipe) };
+        if (!getBaseMetaTileEntity().addStackToSlot(1, GTUtility.copyAmount(1, miningPipe)))
+            mOutputItems = new ItemStack[] { GTUtility.copyAmount(1, miningPipe) };
         return true;
     }
 
@@ -375,8 +374,8 @@ public abstract class GT_MetaTileEntity_DrillerBase
      */
     protected int canLowerPipe() {
         IGregTechTileEntity aBaseTile = getBaseMetaTileEntity();
-        if (yHead > 0 && GT_Utility.getBlockHardnessAt(aBaseTile.getWorld(), xPipe, yHead - 1, zPipe) >= 0) {
-            return GT_Utility.eraseBlockByFakePlayer(getFakePlayer(aBaseTile), xPipe, yHead - 1, zPipe, true) ? 0 : 2;
+        if (yHead > 0 && GTUtility.getBlockHardnessAt(aBaseTile.getWorld(), xPipe, yHead - 1, zPipe) >= 0) {
+            return GTUtility.eraseBlockByFakePlayer(getFakePlayer(aBaseTile), xPipe, yHead - 1, zPipe, true) ? 0 : 2;
         }
         return 1;
     }
@@ -405,7 +404,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
 
     private boolean isEnergyEnough() {
         long requiredEnergy = 512 + getMaxInputVoltage() * 4;
-        for (GT_MetaTileEntity_Hatch_Energy energyHatch : mEnergyHatches) {
+        for (MTEHatchEnergy energyHatch : mEnergyHatches) {
             requiredEnergy -= energyHatch.getEUVar();
             if (requiredEnergy <= 0) return true;
         }
@@ -622,7 +621,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
     }
 
     @Override
-    public final IStructureDefinition<GT_MetaTileEntity_DrillerBase> getStructureDefinition() {
+    public final IStructureDefinition<MTEDrillerBase> getStructureDefinition() {
         return STRUCTURE_DEFINITION.get(getClass());
     }
 
@@ -630,7 +629,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
     public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
         updateCoordinates();
         return checkPiece(STRUCTURE_PIECE_MAIN, 1, 6, 0) && checkHatches()
-            && GT_Utility.getTier(getMaxInputVoltage()) >= getMinTier()
+            && GTUtility.getTier(getMaxInputVoltage()) >= getMinTier()
             && mMaintenanceHatches.size() == 1;
     }
 
@@ -662,7 +661,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
     private FakePlayer mFakePlayer = null;
 
     protected FakePlayer getFakePlayer(IGregTechTileEntity aBaseTile) {
-        if (mFakePlayer == null) mFakePlayer = GT_Utility.getFakePlayer(aBaseTile);
+        if (mFakePlayer == null) mFakePlayer = GTUtility.getFakePlayer(aBaseTile);
         mFakePlayer.setWorld(aBaseTile.getWorld());
         mFakePlayer.setPosition(aBaseTile.getXCoord(), aBaseTile.getYCoord(), aBaseTile.getZCoord());
         return mFakePlayer;
@@ -707,7 +706,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
         return config;
     }
 
-    public ArrayList<GT_MetaTileEntity_Hatch_DataAccess> mDataAccessHatches = new ArrayList<>();
+    public ArrayList<MTEHatchDataAccess> mDataAccessHatches = new ArrayList<>();
 
     /**
      * @param state using bitmask, 1 for IntegratedCircuit, 2 for DataStick, 4 for DataOrb
@@ -723,10 +722,10 @@ public abstract class GT_MetaTileEntity_DrillerBase
      */
     public ArrayList<ItemStack> getDataItems(int state) {
         ArrayList<ItemStack> rList = new ArrayList<>();
-        if (GT_Utility.isStackValid(mInventory[1]) && isCorrectDataItem(mInventory[1], state)) {
+        if (GTUtility.isStackValid(mInventory[1]) && isCorrectDataItem(mInventory[1], state)) {
             rList.add(mInventory[1]);
         }
-        for (GT_MetaTileEntity_Hatch_DataAccess tHatch : filterValidMTEs(mDataAccessHatches)) {
+        for (MTEHatchDataAccess tHatch : filterValidMTEs(mDataAccessHatches)) {
             for (int i = 0; i < tHatch.getBaseMetaTileEntity()
                 .getSizeInventory(); i++) {
                 if (tHatch.getBaseMetaTileEntity()
@@ -752,9 +751,9 @@ public abstract class GT_MetaTileEntity_DrillerBase
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DataAccess) {
-            ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture((byte) aBaseCasingIndex);
-            return mDataAccessHatches.add((GT_MetaTileEntity_Hatch_DataAccess) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchDataAccess) {
+            ((MTEHatch) aMetaTileEntity).updateTexture((byte) aBaseCasingIndex);
+            return mDataAccessHatches.add((MTEHatchDataAccess) aMetaTileEntity);
         }
         return false;
     }
@@ -807,16 +806,16 @@ public abstract class GT_MetaTileEntity_DrillerBase
         final int BUTTON_Y_LEVEL = 91;
 
         builder.widget(
-            new GT_LockedWhileActiveButton(this.getBaseMetaTileEntity(), builder)
+            new LockedWhileActiveButton(this.getBaseMetaTileEntity(), builder)
                 .setOnClick((clickData, widget) -> mChunkLoadingEnabled = !mChunkLoadingEnabled)
                 .setPlayClickSound(true)
                 .setBackground(() -> {
                     if (mChunkLoadingEnabled) {
-                        return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED,
-                            GT_UITextures.OVERLAY_BUTTON_CHUNK_LOADING };
+                        return new IDrawable[] { GTUITextures.BUTTON_STANDARD_PRESSED,
+                            GTUITextures.OVERLAY_BUTTON_CHUNK_LOADING };
                     }
-                    return new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
-                        GT_UITextures.OVERLAY_BUTTON_CHUNK_LOADING_OFF };
+                    return new IDrawable[] { GTUITextures.BUTTON_STANDARD,
+                        GTUITextures.OVERLAY_BUTTON_CHUNK_LOADING_OFF };
                 })
                 .attachSyncer(
                     new FakeSyncWidget.BooleanSyncer(
@@ -837,11 +836,11 @@ public abstract class GT_MetaTileEntity_DrillerBase
                     .setPlayClickSound(true)
                     .setBackground(() -> {
                         if (workState == STATE_ABORT) {
-                            return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED,
-                                GT_UITextures.OVERLAY_BUTTON_RETRACT_PIPE, GT_UITextures.OVERLAY_BUTTON_LOCKED };
+                            return new IDrawable[] { GTUITextures.BUTTON_STANDARD_PRESSED,
+                                GTUITextures.OVERLAY_BUTTON_RETRACT_PIPE, GTUITextures.OVERLAY_BUTTON_LOCKED };
                         }
-                        return new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
-                            GT_UITextures.OVERLAY_BUTTON_RETRACT_PIPE };
+                        return new IDrawable[] { GTUITextures.BUTTON_STANDARD,
+                            GTUITextures.OVERLAY_BUTTON_RETRACT_PIPE };
                     })
                     .attachSyncer(
                         new FakeSyncWidget.IntegerSyncer(() -> workState, (newInt) -> workState = newInt),
@@ -865,7 +864,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
         }
     }
 
-    protected List<IHatchElement<? super GT_MetaTileEntity_DrillerBase>> getAllowedHatches() {
+    protected List<IHatchElement<? super MTEDrillerBase>> getAllowedHatches() {
         return ImmutableList.of(
             InputHatch,
             OutputHatch,
@@ -877,22 +876,22 @@ public abstract class GT_MetaTileEntity_DrillerBase
             DataHatchElement.DataAccess);
     }
 
-    protected enum DataHatchElement implements IHatchElement<GT_MetaTileEntity_DrillerBase> {
+    protected enum DataHatchElement implements IHatchElement<MTEDrillerBase> {
 
         DataAccess;
 
         @Override
         public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
-            return Collections.singletonList(GT_MetaTileEntity_Hatch_DataAccess.class);
+            return Collections.singletonList(MTEHatchDataAccess.class);
         }
 
         @Override
-        public IGT_HatchAdder<GT_MetaTileEntity_DrillerBase> adder() {
-            return GT_MetaTileEntity_DrillerBase::addDataAccessToMachineList;
+        public IGTHatchAdder<MTEDrillerBase> adder() {
+            return MTEDrillerBase::addDataAccessToMachineList;
         }
 
         @Override
-        public long count(GT_MetaTileEntity_DrillerBase t) {
+        public long count(MTEDrillerBase t) {
             return t.mDataAccessHatches.size();
         }
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java
index 49b2cc6998..844c6408df 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java
@@ -1,22 +1,22 @@
 package gregtech.common.tileentities.machines.multi;
 
 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.GT_Values.VN;
+import static gregtech.api.enums.GTValues.VN;
+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.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
-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.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,8 +38,8 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.ITexture;
@@ -47,32 +47,32 @@ 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;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
 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.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;
 
-public class GT_MetaTileEntity_ElectricBlastFurnace extends
-    GT_MetaTileEntity_AbstractMultiFurnace<GT_MetaTileEntity_ElectricBlastFurnace> implements ISurvivalConstructable {
+public class MTEElectricBlastFurnace extends MTEAbstractMultiFurnace<MTEElectricBlastFurnace>
+    implements ISurvivalConstructable {
 
     private int mHeatingCapacity = 0;
-    protected final ArrayList<GT_MetaTileEntity_Hatch_Output> mPollutionOutputHatches = new ArrayList<>();
+    protected final ArrayList<MTEHatchOutput> mPollutionOutputHatches = new ArrayList<>();
     protected final FluidStack[] pollutionFluidStacks = { Materials.CarbonDioxide.getGas(1000),
         Materials.CarbonMonoxide.getGas(1000), Materials.SulfurDioxide.getGas(1000) };
 
     protected static final int CASING_INDEX = 11;
     protected static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_ElectricBlastFurnace> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_ElectricBlastFurnace>builder()
+    private static final IStructureDefinition<MTEElectricBlastFurnace> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEElectricBlastFurnace>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(
@@ -80,44 +80,40 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
                     { "b~b", "bbb", "bbb" } }))
         .addElement(
             't',
-            buildHatchAdder(GT_MetaTileEntity_ElectricBlastFurnace.class)
+            buildHatchAdder(MTEElectricBlastFurnace.class)
                 .atLeast(
-                    OutputHatch.withAdder(GT_MetaTileEntity_ElectricBlastFurnace::addOutputHatchToTopList)
+                    OutputHatch.withAdder(MTEElectricBlastFurnace::addOutputHatchToTopList)
                         .withCount(t -> t.mPollutionOutputHatches.size()))
                 .casingIndex(CASING_INDEX)
                 .dot(1)
-                .buildAndChain(GregTech_API.sBlockCasings1, CASING_INDEX))
+                .buildAndChain(GregTechAPI.sBlockCasings1, CASING_INDEX))
         .addElement('m', Muffler.newAny(CASING_INDEX, 2))
-        .addElement(
-            'C',
-            ofCoil(
-                GT_MetaTileEntity_ElectricBlastFurnace::setCoilLevel,
-                GT_MetaTileEntity_ElectricBlastFurnace::getCoilLevel))
+        .addElement('C', ofCoil(MTEElectricBlastFurnace::setCoilLevel, MTEElectricBlastFurnace::getCoilLevel))
         .addElement(
             'b',
-            buildHatchAdder(GT_MetaTileEntity_ElectricBlastFurnace.class)
+            buildHatchAdder(MTEElectricBlastFurnace.class)
                 .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy)
                 .casingIndex(CASING_INDEX)
                 .dot(1)
-                .buildAndChain(GregTech_API.sBlockCasings1, CASING_INDEX))
+                .buildAndChain(GregTechAPI.sBlockCasings1, CASING_INDEX))
         .build();
 
-    public GT_MetaTileEntity_ElectricBlastFurnace(int aID, String aName, String aNameRegional) {
+    public MTEElectricBlastFurnace(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_ElectricBlastFurnace(String aName) {
+    public MTEElectricBlastFurnace(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ElectricBlastFurnace(this.mName);
+        return new MTEElectricBlastFurnace(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("Blast Furnace")
             .addInfo("Controller block for the Electric Blast Furnace")
             .addInfo("You can use some fluids to reduce recipe time. Place the circuit in the Input Bus")
@@ -172,7 +168,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return GT_Mod.gregtechproxy.mPollutionEBFPerSecond;
+        return GTMod.gregtechproxy.mPollutionEBFPerSecond;
     }
 
     @Override
@@ -186,7 +182,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_ElectricBlastFurnace> getStructureDefinition() {
+    public IStructureDefinition<MTEElectricBlastFurnace> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -196,7 +192,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
 
             @Nonnull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) {
+            protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) {
                 return super.createOverclockCalculator(recipe).setRecipeHeat(recipe.mSpecialValue)
                     .setMachineHeat(mHeatingCapacity)
                     .setHeatOC(true)
@@ -204,7 +200,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
             }
 
             @Override
-            protected @Nonnull CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected @Nonnull CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 return recipe.mSpecialValue <= mHeatingCapacity ? CheckRecipeResultRegistry.SUCCESSFUL
                     : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue);
             }
@@ -215,9 +211,9 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
         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);
-            return mPollutionOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchOutput) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            return mPollutionOutputHatches.add((MTEHatchOutput) aMetaTileEntity);
         }
         return false;
     }
@@ -236,7 +232,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
 
         if (mMaintenanceHatches.size() != 1) return false;
 
-        this.mHeatingCapacity = (int) getCoilLevel().getHeat() + 100 * (GT_Utility.getTier(getMaxInputVoltage()) - 2);
+        this.mHeatingCapacity = (int) getCoilLevel().getHeat() + 100 * (GTUtility.getTier(getMaxInputVoltage()) - 2);
         return true;
     }
 
@@ -244,7 +240,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
     public boolean addOutput(FluidStack aLiquid) {
         if (aLiquid == null) return false;
         FluidStack tLiquid = aLiquid.copy();
-        ArrayList<GT_MetaTileEntity_Hatch_Output> tOutputHatches;
+        ArrayList<MTEHatchOutput> tOutputHatches;
         if (isPollutionFluid(tLiquid)) {
             tOutputHatches = this.mPollutionOutputHatches;
             multiplyPollutionFluidAmount(tLiquid);
@@ -277,7 +273,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
      */
     public int getPollutionReduction() {
         int reduction = 100;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             reduction = Math.min(tHatch.calculatePollutionReduction(100), reduction);
         }
         return reduction;
@@ -292,7 +288,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
         int mPollutionReduction = getPollutionReduction();
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
+        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -302,36 +298,36 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
         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.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(getMaxInputVoltage())
+                + GTUtility.formatNumbers(getMaxInputVoltage())
                 + EnumChatFormatting.RESET
                 + " EU/t(*2A) "
                 + StatCollector.translateToLocal("GT5U.machines.tier")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + VN[GT_Utility.getTier(getMaxInputVoltage())]
+                + VN[GTUtility.getTier(getMaxInputVoltage())]
                 + EnumChatFormatting.RESET,
             StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
                 + EnumChatFormatting.RED
@@ -346,7 +342,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
                 + " %",
             StatCollector.translateToLocal("GT5U.EBF.heat") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mHeatingCapacity)
+                + GTUtility.formatNumbers(mHeatingCapacity)
                 + EnumChatFormatting.RESET
                 + " K",
             StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": "
@@ -370,7 +366,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends
     @Override
     public void onScrewdriverRightClick(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/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEExtremeDieselEngine.java
index dace58a492..8aba224e9c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEExtremeDieselEngine.java
@@ -5,7 +5,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_EXTREME_DIESE
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
@@ -13,34 +13,34 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 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.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.maps.FuelBackend;
 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;
 
-public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_DieselEngine {
+public class MTEExtremeDieselEngine extends MTEDieselEngine {
 
-    public GT_MetaTileEntity_ExtremeDieselEngine(int aID, String aName, String aNameRegional) {
+    public MTEExtremeDieselEngine(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_ExtremeDieselEngine(String aName) {
+    public MTEExtremeDieselEngine(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("Combustion Generator")
             .addInfo("Controller block for the Extreme Combustion Engine")
             .addInfo("Supply high rating fuel and 8000L of Lubricant per hour to run")
@@ -99,7 +99,7 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die
 
     @Override
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -109,7 +109,7 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die
 
     @Override
     public Block getIntakeBlock() {
-        return GregTech_API.sBlockCasings8;
+        return GregTechAPI.sBlockCasings8;
     }
 
     @Override
@@ -119,7 +119,7 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die
 
     @Override
     public Block getGearboxBlock() {
-        return GregTech_API.sBlockCasings2;
+        return GregTechAPI.sBlockCasings2;
     }
 
     @Override
@@ -134,7 +134,7 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ExtremeDieselEngine(this.mName);
+        return new MTEExtremeDieselEngine(this.mName);
     }
 
     @Override
@@ -169,19 +169,19 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond;
+        return GTMod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond;
     }
 
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
         }
 
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch_Dynamo tHatch : filterValidMTEs(mDynamoHatches)) {
+        for (MTEHatchDynamo tHatch : filterValidMTEs(mDynamoHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -191,11 +191,11 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die
         return new String[] { EnumChatFormatting.BLUE + "Extreme Diesel Engine" + 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",
             getIdealStatus() == getRepairStatus()
@@ -205,22 +205,22 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die
                     + EnumChatFormatting.RESET,
             StatCollector.translateToLocal("GT5U.engine.output") + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers((long) -mEUt * mEfficiency / 10000)
+                + GTUtility.formatNumbers((long) -mEUt * mEfficiency / 10000)
                 + EnumChatFormatting.RESET
                 + " EU/t",
             StatCollector.translateToLocal("GT5U.engine.consumption") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(fuelConsumption)
+                + GTUtility.formatNumbers(fuelConsumption)
                 + EnumChatFormatting.RESET
                 + " L/t",
             StatCollector.translateToLocal("GT5U.engine.value") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(fuelValue)
+                + GTUtility.formatNumbers(fuelValue)
                 + EnumChatFormatting.RESET
                 + " EU/L",
             StatCollector.translateToLocal("GT5U.turbine.fuel") + ": "
                 + EnumChatFormatting.GOLD
-                + GT_Utility.formatNumbers(fuelRemaining)
+                + GTUtility.formatNumbers(fuelRemaining)
                 + EnumChatFormatting.RESET
                 + " L",
             StatCollector.translateToLocal("GT5U.engine.efficiency") + ": "
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java
index 9dd01c969d..4527436285 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java
@@ -3,15 +3,15 @@ package gregtech.common.tileentities.machines.multi;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 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.OutputHatch;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.filterByMTETier;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.filterByMTETier;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.Set;
 
@@ -45,12 +45,12 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.VoidingMode;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -59,11 +59,11 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IOverclockDescriptionProvider;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
-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_ItemStack;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.overclockdescriber.FusionOverclockDescriber;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.recipe.RecipeMap;
@@ -71,27 +71,26 @@ import gregtech.api.recipe.RecipeMaps;
 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_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 gregtech.api.util.shutdown.ShutDownReason;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
-import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_Hatch_DroneDownLink;
+import gregtech.common.tileentities.machines.multi.drone.MTEHatchDroneDownLink;
 
-public abstract class GT_MetaTileEntity_FusionComputer
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_FusionComputer>
+public abstract class MTEFusionComputer extends MTEEnhancedMultiBlockBase<MTEFusionComputer>
     implements ISurvivalConstructable, IAddUIWidgets, IOverclockDescriptionProvider {
 
     private final OverclockDescriber overclockDescriber;
 
     public static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_FusionComputer>> STRUCTURE_DEFINITION = new ClassValue<>() {
+    private static final ClassValue<IStructureDefinition<MTEFusionComputer>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
-        protected IStructureDefinition<GT_MetaTileEntity_FusionComputer> computeValue(Class<?> type) {
-            return StructureDefinition.<GT_MetaTileEntity_FusionComputer>builder()
+        protected IStructureDefinition<MTEFusionComputer> computeValue(Class<?> type) {
+            return StructureDefinition.<MTEFusionComputer>builder()
                 .addShape(
                     STRUCTURE_PIECE_MAIN,
                     transpose(
@@ -113,9 +112,8 @@ public abstract class GT_MetaTileEntity_FusionComputer
                 .addElement(
                     'i',
                     lazy(
-                        t -> buildHatchAdder(GT_MetaTileEntity_FusionComputer.class)
-                            .atLeast(
-                                ImmutableMap.of(InputHatch.withAdder(GT_MetaTileEntity_FusionComputer::addInjector), 1))
+                        t -> buildHatchAdder(MTEFusionComputer.class)
+                            .atLeast(ImmutableMap.of(InputHatch.withAdder(MTEFusionComputer::addInjector), 1))
                             .hatchItemFilterAnd(t2 -> filterByMTETier(t2.tier(), Integer.MAX_VALUE))
                             .casingIndex(53)
                             .dot(1)
@@ -123,8 +121,8 @@ public abstract class GT_MetaTileEntity_FusionComputer
                 .addElement(
                     'e',
                     lazy(
-                        t -> buildHatchAdder(GT_MetaTileEntity_FusionComputer.class).atLeast(
-                            ImmutableMap.of(Energy.withAdder(GT_MetaTileEntity_FusionComputer::addEnergyInjector), 16))
+                        t -> buildHatchAdder(MTEFusionComputer.class)
+                            .atLeast(ImmutableMap.of(Energy.withAdder(MTEFusionComputer::addEnergyInjector), 16))
                             .hatchItemFilterAnd(t2 -> filterByMTETier(t2.tier(), Integer.MAX_VALUE))
                             .casingIndex(53)
                             .dot(2)
@@ -132,8 +130,8 @@ public abstract class GT_MetaTileEntity_FusionComputer
                 .addElement(
                     'x',
                     lazy(
-                        t -> buildHatchAdder(GT_MetaTileEntity_FusionComputer.class)
-                            .atLeast(OutputHatch.withAdder(GT_MetaTileEntity_FusionComputer::addExtractor))
+                        t -> buildHatchAdder(MTEFusionComputer.class)
+                            .atLeast(OutputHatch.withAdder(MTEFusionComputer::addExtractor))
                             .hatchItemFilterAnd(t2 -> filterByMTETier(t2.tier(), Integer.MAX_VALUE))
                             .casingIndex(53)
                             .dot(3)
@@ -141,8 +139,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
                 .addElement(
                     'd',
                     lazy(
-                        t -> buildHatchAdder(GT_MetaTileEntity_FusionComputer.class)
-                            .adder(GT_MetaTileEntity_FusionComputer::addDroneHatch)
+                        t -> buildHatchAdder(MTEFusionComputer.class).adder(MTEFusionComputer::addDroneHatch)
                             .hatchId(9401)
                             .casingIndex(53)
                             .dot(4)
@@ -150,7 +147,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
                 .build();
         }
     };
-    public GT_Recipe mLastRecipe;
+    public GTRecipe mLastRecipe;
     public long mEUStore;
 
     static {
@@ -168,12 +165,12 @@ public abstract class GT_MetaTileEntity_FusionComputer
                     .build()));
     }
 
-    public GT_MetaTileEntity_FusionComputer(int aID, String aName, String aNameRegional) {
+    public MTEFusionComputer(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         this.overclockDescriber = createOverclockDescriber();
     }
 
-    public GT_MetaTileEntity_FusionComputer(String aName) {
+    public MTEFusionComputer(String aName) {
         super(aName);
         this.overclockDescriber = createOverclockDescriber();
     }
@@ -203,7 +200,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
     public abstract MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity);
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
 
         return side != getBaseMetaTileEntity().getFrontFacing();
     }
@@ -217,13 +214,13 @@ public abstract class GT_MetaTileEntity_FusionComputer
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_FusionComputer> getStructureDefinition() {
+    public IStructureDefinition<MTEFusionComputer> getStructureDefinition() {
         return STRUCTURE_DEFINITION.get(getClass());
     }
 
     @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.addController("Fusion Reactor")
             .addInfo("Some kind of fusion reactor, maybe")
             .addSeparator()
@@ -242,7 +239,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
     private boolean addEnergyInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) {
         IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy tHatch)) return false;
+        if (!(aMetaTileEntity instanceof MTEHatchEnergy tHatch)) return false;
         if (tHatch.mTier < tier()) return false;
         tHatch.updateTexture(aBaseCasingIndex);
         return mEnergyHatches.add(tHatch);
@@ -251,7 +248,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
     private boolean addInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) {
         IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tHatch)) return false;
+        if (!(aMetaTileEntity instanceof MTEHatchInput tHatch)) return false;
         if (tHatch.getTierForStructure() < tier()) return false;
         tHatch.updateTexture(aBaseCasingIndex);
         tHatch.mRecipeMap = getRecipeMap();
@@ -262,7 +259,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
         if (aBaseMetaTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output tHatch)) return false;
+        if (!(aMetaTileEntity instanceof MTEHatchOutput tHatch)) return false;
         if (tHatch.getTierForStructure() < tier()) return false;
         tHatch.updateTexture(aBaseCasingIndex);
         return mOutputHatches.add(tHatch);
@@ -272,7 +269,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
         if (aBaseMetaTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DroneDownLink tHatch)) return false;
+        if (!(aMetaTileEntity instanceof MTEHatchDroneDownLink tHatch)) return false;
         tHatch.updateTexture(aBaseCasingIndex);
         return addToMachineList(aBaseMetaTileEntity, aBaseCasingIndex);
     }
@@ -320,20 +317,20 @@ public abstract class GT_MetaTileEntity_FusionComputer
 
             @NotNull
             @Override
-            protected GT_ParallelHelper createParallelHelper(@NotNull GT_Recipe recipe) {
+            protected ParallelHelper createParallelHelper(@NotNull GTRecipe recipe) {
                 // When the fusion first loads and is still processing, it does the recipe check without consuming.
                 return super.createParallelHelper(recipe).setConsumption(!mRunningOnLoad);
             }
 
             @NotNull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
+            protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) {
                 return overclockDescriber.createCalculator(super.createOverclockCalculator(recipe), recipe);
             }
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 if (!mRunningOnLoad && recipe.mSpecialValue > maxEUStore()) {
                     return CheckRecipeResultRegistry.insufficientStartupPower(recipe.mSpecialValue);
                 }
@@ -358,24 +355,24 @@ public abstract class GT_MetaTileEntity_FusionComputer
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Values.V[tier()]);
+        logic.setAvailableVoltage(GTValues.V[tier()]);
         logic.setAvailableAmperage(1);
         logic.setAmperageOC(false);
     }
 
     public boolean turnCasingActive(boolean status) {
         if (this.mEnergyHatches != null) {
-            for (GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) {
+            for (MTEHatchEnergy hatch : this.mEnergyHatches) {
                 hatch.updateTexture(status ? 52 : 53);
             }
         }
         if (this.mOutputHatches != null) {
-            for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) {
+            for (MTEHatchOutput hatch : this.mOutputHatches) {
                 hatch.updateTexture(status ? 52 : 53);
             }
         }
         if (this.mInputHatches != null) {
-            for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) {
+            for (MTEHatchInput hatch : this.mInputHatches) {
                 hatch.updateTexture(status ? 52 : 53);
             }
         }
@@ -402,8 +399,8 @@ public abstract class GT_MetaTileEntity_FusionComputer
                 if (mMachine) {
                     this.mEUStore = aBaseMetaTileEntity.getStoredEU();
                     if (this.mEnergyHatches != null) {
-                        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
-                            long energyToMove = GT_Values.V[tier()] / 16;
+                        for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
+                            long energyToMove = GTValues.V[tier()] / 16;
                             if (aBaseMetaTileEntity.getStoredEU() + energyToMove < maxEUStore()
                                 && tHatch.getBaseMetaTileEntity()
                                     .decreaseStoredEnergyUnits(energyToMove, false)) {
@@ -430,7 +427,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
                             mEfficiencyIncrease = 0;
                             if (mOutputFluids != null && mOutputFluids.length > 0) {
                                 try {
-                                    GT_Mod.achievements.issueAchivementHatchFluid(
+                                    GTMod.achievements.issueAchivementHatchFluid(
                                         aBaseMetaTileEntity.getWorld()
                                             .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()),
                                         mOutputFluids[0]);
@@ -512,21 +509,21 @@ public abstract class GT_MetaTileEntity_FusionComputer
         return new String[] { EnumChatFormatting.BLUE + "Fusion Reactor MK " + EnumChatFormatting.RESET + tier,
             StatCollector.translateToLocal("GT5U.fusion.req") + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(powerRequired)
+                + GTUtility.formatNumbers(powerRequired)
                 + EnumChatFormatting.RESET
                 + "EU/t",
             StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mEUStore)
+                + GTUtility.formatNumbers(mEUStore)
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxEUStore())
+                + GTUtility.formatNumbers(maxEUStore())
                 + EnumChatFormatting.RESET
                 + " EU",
             StatCollector.translateToLocal("GT5U.fusion.plasma") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(plasmaOut)
+                + GTUtility.formatNumbers(plasmaOut)
                 + EnumChatFormatting.RESET
                 + "L/t" };
     }
@@ -568,7 +565,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
 
     @Override
     public GUITextureSet getGUITextureSet() {
-        return new GUITextureSet().setMainBackground(GT_UITextures.BACKGROUND_FUSION_COMPUTER);
+        return new GUITextureSet().setMainBackground(GTUITextures.BACKGROUND_FUSION_COMPUTER);
     }
 
     @Override
@@ -588,7 +585,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder
             .widget(
-                new TextWidget(GT_Utility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get())
+                new TextWidget(GTUtility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setEnabled(widget -> !mMachine)
                     .setPos(10, 8))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val))
@@ -626,7 +623,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
                     .setProgress(
                         () -> (float) getBaseMetaTileEntity().getStoredEU() / getBaseMetaTileEntity().getEUCapacity())
                     .setDirection(ProgressBar.Direction.RIGHT)
-                    .setTexture(GT_UITextures.PROGRESSBAR_STORED_EU, 147)
+                    .setTexture(GTUITextures.PROGRESSBAR_STORED_EU, 147)
                     .setPos(5, 156)
                     .setSize(147, 5))
             .widget(new TextWidget().setStringSupplier(() -> {
@@ -654,7 +651,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
                 new ButtonWidget().setNEITransferRect(
                     RecipeMaps.fusionRecipes.getFrontend()
                         .getUIProperties().neiTransferRectId)
-                    .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_NEI)
+                    .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_NEI)
                     .setPos(154, 4)
                     .setSize(18, 18));
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer1.java
index e3a2432bf9..e0976106e5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer1.java
@@ -5,14 +5,14 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION1_GLOW;
 
 import net.minecraft.block.Block;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionComputer {
+public class MTEFusionComputer1 extends MTEFusionComputer {
 
     private static final ITexture textureOverlay = TextureFactory.of(
         TextureFactory.builder()
@@ -25,11 +25,11 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC
             .glow()
             .build());
 
-    public GT_MetaTileEntity_FusionComputer1(int aID, String aName, String aNameRegional) {
+    public MTEFusionComputer1(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_FusionComputer1(String aName) {
+    public MTEFusionComputer1(String aName) {
         super(aName);
     }
 
@@ -50,12 +50,12 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_FusionComputer1(mName);
+        return new MTEFusionComputer1(mName);
     }
 
     @Override
     public Block getCasing() {
-        return GregTech_API.sBlockCasings1;
+        return GregTechAPI.sBlockCasings1;
     }
 
     @Override
@@ -65,7 +65,7 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC
 
     @Override
     public Block getFusionCoil() {
-        return GregTech_API.sBlockCasings1;
+        return GregTechAPI.sBlockCasings1;
     }
 
     @Override
@@ -74,8 +74,8 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC
     }
 
     @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("Fusion Reactor")
             .addInfo("It's over 9000!!!")
             .addInfo("Controller block for the Fusion Reactor Mk I")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer2.java
index 0b1f10158b..ee67b74bf8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer2.java
@@ -5,14 +5,14 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION2_GLOW;
 
 import net.minecraft.block.Block;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionComputer {
+public class MTEFusionComputer2 extends MTEFusionComputer {
 
     private static final ITexture textureOverlay = TextureFactory.of(
         TextureFactory.builder()
@@ -25,11 +25,11 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC
             .glow()
             .build());
 
-    public GT_MetaTileEntity_FusionComputer2(int aID, String aName, String aNameRegional) {
+    public MTEFusionComputer2(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_FusionComputer2(String aName) {
+    public MTEFusionComputer2(String aName) {
         super(aName);
     }
 
@@ -50,12 +50,12 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_FusionComputer2(mName);
+        return new MTEFusionComputer2(mName);
     }
 
     @Override
     public Block getCasing() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -65,7 +65,7 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC
 
     @Override
     public Block getFusionCoil() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -74,8 +74,8 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC
     }
 
     @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("Fusion Reactor")
             .addInfo("It's over 9000!!!")
             .addInfo("Controller block for the Fusion Reactor Mk II")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer3.java
index 64d92ccc99..3e4f431351 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer3.java
@@ -5,14 +5,14 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION3_GLOW;
 
 import net.minecraft.block.Block;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionComputer {
+public class MTEFusionComputer3 extends MTEFusionComputer {
 
     private static final ITexture textureOverlay = TextureFactory.of(
         TextureFactory.builder()
@@ -25,11 +25,11 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC
             .glow()
             .build());
 
-    public GT_MetaTileEntity_FusionComputer3(int aID, String aName, String aNameRegional) {
+    public MTEFusionComputer3(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_FusionComputer3(String aName) {
+    public MTEFusionComputer3(String aName) {
         super(aName);
     }
 
@@ -50,12 +50,12 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_FusionComputer3(mName);
+        return new MTEFusionComputer3(mName);
     }
 
     @Override
     public Block getCasing() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -65,7 +65,7 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC
 
     @Override
     public Block getFusionCoil() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -74,8 +74,8 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC
     }
 
     @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("Fusion Reactor")
             .addInfo("A SUN DOWN ON EARTH")
             .addInfo("Controller block for the Fusion Reactor Mk III")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEHeatExchanger.java
index 46c9c712ce..fb90f1acc4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEHeatExchanger.java
@@ -3,17 +3,17 @@ package gregtech.common.tileentities.machines.multi;
 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.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
+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.enums.Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import javax.annotation.Nonnull;
 
@@ -31,64 +31,60 @@ 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.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
-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.MTEEnhancedMultiBlockBase;
+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.render.TextureFactory;
-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;
 
-public class GT_MetaTileEntity_HeatExchanger extends
-    GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_HeatExchanger> implements ISurvivalConstructable {
+public class MTEHeatExchanger extends MTEEnhancedMultiBlockBase<MTEHeatExchanger> implements ISurvivalConstructable {
 
     private int dryHeatCounter = 0; // Counts up to dryHeatMaximum to check for explosion conditions
     private static final int dryHeatMaximum = 2000; // 2000 ticks = 100 seconds
     private static final int CASING_INDEX = 50;
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_HeatExchanger> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_HeatExchanger>builder()
+    private static final IStructureDefinition<MTEHeatExchanger> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEHeatExchanger>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(
                 new String[][] { { "ccc", "cCc", "ccc" }, { "ccc", "cPc", "ccc" }, { "ccc", "cPc", "ccc" },
                     { "c~c", "cHc", "ccc" }, }))
-        .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 14))
+        .addElement('P', ofBlock(GregTechAPI.sBlockCasings2, 14))
         .addElement(
             'C',
-            OutputHatch.withAdder(GT_MetaTileEntity_HeatExchanger::addColdFluidOutputToMachineList)
+            OutputHatch.withAdder(MTEHeatExchanger::addColdFluidOutputToMachineList)
                 .withCount(t -> t.mOutputColdFluidHatch.isValid() ? 1 : 0)
                 .newAny(CASING_INDEX, 3))
         .addElement(
             'H',
-            InputHatch.withAdder(GT_MetaTileEntity_HeatExchanger::addHotFluidInputToMachineList)
+            InputHatch.withAdder(MTEHeatExchanger::addHotFluidInputToMachineList)
                 .withCount(t -> t.mInputHotFluidHatch.isValid() ? 1 : 0)
                 .newAny(CASING_INDEX, 3))
         .addElement(
             'c',
-            buildHatchAdder(GT_MetaTileEntity_HeatExchanger.class)
-                .atLeast(InputBus, InputHatch, OutputBus, OutputHatch, Maintenance)
+            buildHatchAdder(MTEHeatExchanger.class).atLeast(InputBus, InputHatch, OutputBus, OutputHatch, Maintenance)
                 .casingIndex(CASING_INDEX)
                 .dot(1)
                 .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_HeatExchanger::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings4, (byte) 2))))
+                    onElementPass(MTEHeatExchanger::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings4, (byte) 2))))
         .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;
     /**
@@ -98,17 +94,17 @@ public class GT_MetaTileEntity_HeatExchanger extends
 
     private int mCasingAmount;
 
-    public GT_MetaTileEntity_HeatExchanger(int aID, String aName, String aNameRegional) {
+    public MTEHeatExchanger(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_HeatExchanger(String aName) {
+    public MTEHeatExchanger(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("Heat Exchanger")
             .addInfo("Controller Block for the Large Heat Exchanger")
             .addInfo("More complicated than a Fusion Reactor. Seriously")
@@ -237,9 +233,9 @@ public class GT_MetaTileEntity_HeatExchanger extends
 
     private int useWater(int steam) {
         steamBudget -= steam;
-        int usage = -Math.min(0, Math.floorDiv(steamBudget, GT_Values.STEAM_PER_WATER));
+        int usage = -Math.min(0, Math.floorDiv(steamBudget, GTValues.STEAM_PER_WATER));
         // still subtract, because usage will be a negative number
-        steamBudget += usage * GT_Values.STEAM_PER_WATER;
+        steamBudget += usage * GTValues.STEAM_PER_WATER;
         return usage;
     }
 
@@ -256,7 +252,7 @@ public class GT_MetaTileEntity_HeatExchanger extends
                 // 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);
                 startRecipeProcessing();
                 if (depleteInput(distilledStack)) // Consume the distilled water
                 {
@@ -265,14 +261,14 @@ public class GT_MetaTileEntity_HeatExchanger extends
                                                                                                      // superheated
                                                                                                      // steam
                     } else {
-                        addOutput(GT_ModHandler.getSteam(tGeneratedEU)); // Generate regular steam
+                        addOutput(GTModHandler.getSteam(tGeneratedEU)); // Generate regular steam
                     }
                     dryHeatCounter = 0;
                 } else {
                     if (dryHeatCounter < dryHeatMaximum) {
                         dryHeatCounter += 1;
                     } else {
-                        GT_Log.exp.println(this.mName + " was too hot and had no more Distilled Water!");
+                        GTLog.exp.println(this.mName + " was too hot and had no more Distilled Water!");
                         explodeMultiblock(); // Generate crater
                     }
                 }
@@ -284,7 +280,7 @@ public class GT_MetaTileEntity_HeatExchanger extends
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_HeatExchanger> getStructureDefinition() {
+    public IStructureDefinition<MTEHeatExchanger> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -304,9 +300,9 @@ public class GT_MetaTileEntity_HeatExchanger extends
         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;
@@ -316,10 +312,10 @@ public class GT_MetaTileEntity_HeatExchanger extends
         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;
@@ -342,7 +338,7 @@ public class GT_MetaTileEntity_HeatExchanger extends
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_HeatExchanger(this.mName);
+        return new MTEHeatExchanger(this.mName);
     }
 
     @Override
@@ -350,18 +346,18 @@ public class GT_MetaTileEntity_HeatExchanger extends
         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 ? -2L * mEUt : -mEUt)
+                + GTUtility.formatNumbers(superheated ? -2L * mEUt : -mEUt)
                 + EnumChatFormatting.RESET
                 + " EU/t",
             StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
@@ -383,7 +379,7 @@ public class GT_MetaTileEntity_HeatExchanger extends
                 + StatCollector.translateToLocal("GT5U.LHE.threshold")
                 + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(superheated_threshold)
+                + GTUtility.formatNumbers(superheated_threshold)
                 + EnumChatFormatting.RESET };
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEImplosionCompressor.java
index a1968b05d4..a9c96266da 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEImplosionCompressor.java
@@ -12,8 +12,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import com.gtnewhorizon.structurelib.structure.IStructureElement;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
@@ -21,31 +21,30 @@ 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_CubicMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTECubicMultiBlockBase;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_ImplosionCompressor
-    extends GT_MetaTileEntity_CubicMultiBlockBase<GT_MetaTileEntity_ImplosionCompressor> {
+public class MTEImplosionCompressor extends MTECubicMultiBlockBase<MTEImplosionCompressor> {
 
-    public GT_MetaTileEntity_ImplosionCompressor(int aID, String aName, String aNameRegional) {
+    public MTEImplosionCompressor(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_ImplosionCompressor(String aName) {
+    public MTEImplosionCompressor(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ImplosionCompressor(this.mName);
+        return new MTEImplosionCompressor(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("Implosion Compressor")
             .addInfo("Explosions are fun")
             .addInfo("Controller block for the Implosion Compressor")
@@ -122,8 +121,8 @@ public class GT_MetaTileEntity_ImplosionCompressor
     }
 
     @Override
-    protected IStructureElement<GT_MetaTileEntity_CubicMultiBlockBase<?>> getCasingElement() {
-        return ofChain(ofBlock(GregTech_API.sBlockCasings2, 0), ofBlock(GregTech_API.sBlockCasings3, 4));
+    protected IStructureElement<MTECubicMultiBlockBase<?>> getCasingElement() {
+        return ofChain(ofBlock(GregTechAPI.sBlockCasings2, 0), ofBlock(GregTechAPI.sBlockCasings3, 4));
     }
 
     @Override
@@ -143,7 +142,7 @@ public class GT_MetaTileEntity_ImplosionCompressor
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond;
+        return GTMod.gregtechproxy.mPollutionImplosionCompressorPerSecond;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java
index a3e65ce057..20b3ce4b32 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java
@@ -1,14 +1,14 @@
 package gregtech.common.tileentities.machines.multi;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.enums.GT_HatchElement.*;
-import static gregtech.api.enums.GT_Values.AuthorFourIsTheNumber;
+import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber;
+import static gregtech.api.enums.HatchElement.*;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_EMS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_EMS_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_EMS_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_EMS_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -33,16 +33,16 @@ 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.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_ExtendedPowerMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MagHatch;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatchMagnet;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
@@ -50,18 +50,17 @@ 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_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Casings10;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.blocks.BlockCasings10;
+import gregtech.common.items.MetaGeneratedItem01;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_IndustrialElectromagneticSeparator>
-    implements ISurvivalConstructable {
+public class MTEIndustrialElectromagneticSeparator
+    extends MTEExtendedPowerMultiBlockBase<MTEIndustrialElectromagneticSeparator> implements ISurvivalConstructable {
 
     public enum MagnetTiers {
 
@@ -105,15 +104,15 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
     }
 
     final int MIN_CASING = 64;
-    private GT_MetaTileEntity_MagHatch mMagHatch = null;
+    private MTEHatchMagnet mMagHatch = null;
     private MagnetTiers magnetTier = null;
 
     private static final int MACHINEMODE_SEPARATOR = 0;
     private static final int MACHINEMODE_POLARIZER = 1;
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_IndustrialElectromagneticSeparator> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_IndustrialElectromagneticSeparator>builder()
+    private static final IStructureDefinition<MTEIndustrialElectromagneticSeparator> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEIndustrialElectromagneticSeparator>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             (new String[][] { { "  CCC  ", "       ", "       ", "       ", "       ", "  B~B  " },
@@ -127,36 +126,35 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
         .addElement(
             'B',
             ofChain(
-                buildHatchAdder(GT_MetaTileEntity_IndustrialElectromagneticSeparator.class)
+                buildHatchAdder(MTEIndustrialElectromagneticSeparator.class)
                     .atLeast(InputBus, OutputBus, Maintenance, Energy.or(ExoticEnergy))
-                    .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(0))
+                    .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(0))
                     .dot(1)
                     .buildAndChain(
                         onElementPass(
-                            GT_MetaTileEntity_IndustrialElectromagneticSeparator::onCasingAdded,
-                            ofBlock(GregTech_API.sBlockCasings10, 0)))))
+                            MTEIndustrialElectromagneticSeparator::onCasingAdded,
+                            ofBlock(GregTechAPI.sBlockCasings10, 0)))))
         .addElement('C', ofFrame(Materials.NeodymiumMagnetic))
         .addElement(
             'E',
-            buildHatchAdder(GT_MetaTileEntity_IndustrialElectromagneticSeparator.class)
-                .adder(GT_MetaTileEntity_IndustrialElectromagneticSeparator::addMagHatch)
-                .hatchClass(GT_MetaTileEntity_MagHatch.class)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(0))
+            buildHatchAdder(MTEIndustrialElectromagneticSeparator.class)
+                .adder(MTEIndustrialElectromagneticSeparator::addMagHatch)
+                .hatchClass(MTEHatchMagnet.class)
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(0))
                 .dot(2)
                 .build())
         .build();
 
-    public GT_MetaTileEntity_IndustrialElectromagneticSeparator(final int aID, final String aName,
-        final String aNameRegional) {
+    public MTEIndustrialElectromagneticSeparator(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_IndustrialElectromagneticSeparator(String aName) {
+    public MTEIndustrialElectromagneticSeparator(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_IndustrialElectromagneticSeparator> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialElectromagneticSeparator> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -167,7 +165,7 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_IndustrialElectromagneticSeparator(this.mName);
+        return new MTEIndustrialElectromagneticSeparator(this.mName);
     }
 
     @Override
@@ -178,7 +176,7 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
             if (aActive) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 0)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 0)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_EMS_ACTIVE)
                         .extFacing()
@@ -191,7 +189,7 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
             } else {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 0)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 0)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_EMS)
                         .extFacing()
@@ -204,14 +202,14 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
             }
         } else {
             rTexture = new ITexture[] { Textures.BlockIcons
-                .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 0)) };
+                .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 0)) };
         }
         return rTexture;
     }
 
     @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("Electromagnetic Separator/Polarizer")
             .addInfo("Controller Block for the Magnetic Flux Exhibitor")
             .addInfo("Use screwdriver to switch mode")
@@ -286,7 +284,7 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 findMagnet();
                 if (magnetTier != null) {
                     if (!mExoticEnergyHatches.isEmpty() && !magnetTier.supportsExotic)
@@ -346,8 +344,8 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
 
     @Override
     public void setMachineModeIcons() {
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_SEPARATOR);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_POLARIZER);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_SEPARATOR);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_POLARIZER);
     }
 
     @Override
@@ -422,7 +420,7 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
         // However, it does not work with multiamp. MuTEs can't come soon enough.
 
         if (mExoticEnergyHatches.isEmpty()) {
-            logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+            logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
             logic.setAvailableAmperage(1L);
         } else super.setProcessingLogicPower(logic);
     }
@@ -446,7 +444,7 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
     }
 
     public static boolean isValidElectromagnet(ItemStack aMagnet) {
-        return aMagnet != null && aMagnet.getItem() instanceof GT_MetaGenerated_Item_01
+        return aMagnet != null && aMagnet.getItem() instanceof MetaGeneratedItem01
             && aMagnet.getItemDamage() >= 32345
             && aMagnet.getItemDamage() <= 32349;
     }
@@ -454,10 +452,10 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
     private boolean addMagHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity != null) {
             final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_MagHatch) {
-                ((GT_MetaTileEntity_MagHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            if (aMetaTileEntity instanceof MTEHatchMagnet) {
+                ((MTEHatchMagnet) aMetaTileEntity).updateTexture(aBaseCasingIndex);
                 if (mMagHatch == null) {
-                    mMagHatch = (GT_MetaTileEntity_MagHatch) aMetaTileEntity;
+                    mMagHatch = (MTEHatchMagnet) aMetaTileEntity;
                     return true;
                 }
             }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialExtractor.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialExtractor.java
index e10b497b6b..74d55d8e50 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialExtractor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialExtractor.java
@@ -1,13 +1,13 @@
 package gregtech.common.tileentities.machines.multi;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.enums.GT_HatchElement.*;
-import static gregtech.api.enums.GT_Values.AuthorFourIsTheNumber;
+import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber;
+import static gregtech.api.enums.HatchElement.*;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_INDUSTRIAL_EXTRACTOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_INDUSTRIAL_EXTRACTOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_INDUSTRIAL_EXTRACTOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_INDUSTRIAL_EXTRACTOR_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.List;
 
@@ -29,29 +29,28 @@ 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.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.MTEExtendedPowerMultiBlockBase;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Casings4;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.blocks.BlockCasings4;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_IndustrialExtractor
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_IndustrialExtractor>
+public class MTEIndustrialExtractor extends MTEExtendedPowerMultiBlockBase<MTEIndustrialExtractor>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_IndustrialExtractor> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_IndustrialExtractor>builder()
+    private static final IStructureDefinition<MTEIndustrialExtractor> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEIndustrialExtractor>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             (new String[][] { { "  A  ", " BBB ", "AB~BA", " BBB " }, { "  A  ", " BBB ", "AB BA", " BBB " },
@@ -59,36 +58,33 @@ public class GT_MetaTileEntity_IndustrialExtractor
                 { "  A  ", "  A  ", "AAAAA", "     " } }))
         .addElement(
             'B',
-            buildHatchAdder(GT_MetaTileEntity_IndustrialExtractor.class)
-                .atLeast(InputBus, OutputBus, Maintenance, Energy)
-                .casingIndex(((GT_Block_Casings4) GregTech_API.sBlockCasings4).getTextureIndex(1))
+            buildHatchAdder(MTEIndustrialExtractor.class).atLeast(InputBus, OutputBus, Maintenance, Energy)
+                .casingIndex(((BlockCasings4) GregTechAPI.sBlockCasings4).getTextureIndex(1))
                 .dot(1)
                 .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_IndustrialExtractor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings4, 1))))
+                    onElementPass(MTEIndustrialExtractor::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings4, 1))))
         .addElement(
             'A',
             ofBlocksTiered(
-                GT_MetaTileEntity_IndustrialExtractor::getItemPipeTierFromMeta,
+                MTEIndustrialExtractor::getItemPipeTierFromMeta,
                 ImmutableList.of(
-                    Pair.of(GregTech_API.sBlockCasings11, 0),
-                    Pair.of(GregTech_API.sBlockCasings11, 1),
-                    Pair.of(GregTech_API.sBlockCasings11, 2),
-                    Pair.of(GregTech_API.sBlockCasings11, 3),
-                    Pair.of(GregTech_API.sBlockCasings11, 4),
-                    Pair.of(GregTech_API.sBlockCasings11, 5),
-                    Pair.of(GregTech_API.sBlockCasings11, 6),
-                    Pair.of(GregTech_API.sBlockCasings11, 7)),
+                    Pair.of(GregTechAPI.sBlockCasings11, 0),
+                    Pair.of(GregTechAPI.sBlockCasings11, 1),
+                    Pair.of(GregTechAPI.sBlockCasings11, 2),
+                    Pair.of(GregTechAPI.sBlockCasings11, 3),
+                    Pair.of(GregTechAPI.sBlockCasings11, 4),
+                    Pair.of(GregTechAPI.sBlockCasings11, 5),
+                    Pair.of(GregTechAPI.sBlockCasings11, 6),
+                    Pair.of(GregTechAPI.sBlockCasings11, 7)),
                 -2,
-                GT_MetaTileEntity_IndustrialExtractor::setItemPipeTier,
-                GT_MetaTileEntity_IndustrialExtractor::getItemPipeTier))
+                MTEIndustrialExtractor::setItemPipeTier,
+                MTEIndustrialExtractor::getItemPipeTier))
         .build();
 
     private int itemPipeTier = 0;
 
     private static Integer getItemPipeTierFromMeta(Block block, Integer metaID) {
-        if (block != GregTech_API.sBlockCasings11) return -1;
+        if (block != GregTechAPI.sBlockCasings11) return -1;
         if (metaID < 0 || metaID > 7) return -1;
         return metaID + 1;
     }
@@ -101,16 +97,16 @@ public class GT_MetaTileEntity_IndustrialExtractor
         return itemPipeTier;
     }
 
-    public GT_MetaTileEntity_IndustrialExtractor(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialExtractor(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_IndustrialExtractor(String aName) {
+    public MTEIndustrialExtractor(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_IndustrialExtractor> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialExtractor> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -121,7 +117,7 @@ public class GT_MetaTileEntity_IndustrialExtractor
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_IndustrialExtractor(this.mName);
+        return new MTEIndustrialExtractor(this.mName);
     }
 
     @Override
@@ -132,7 +128,7 @@ public class GT_MetaTileEntity_IndustrialExtractor
             if (aActive) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 1)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings4, 1)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_INDUSTRIAL_EXTRACTOR_ACTIVE)
                         .extFacing()
@@ -145,7 +141,7 @@ public class GT_MetaTileEntity_IndustrialExtractor
             } else {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 1)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings4, 1)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_INDUSTRIAL_EXTRACTOR)
                         .extFacing()
@@ -158,14 +154,14 @@ public class GT_MetaTileEntity_IndustrialExtractor
             }
         } else {
             rTexture = new ITexture[] { Textures.BlockIcons
-                .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 1)) };
+                .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings4, 1)) };
         }
         return rTexture;
     }
 
     @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("Extractor")
             .addInfo("Controller Block for the Dissection Apparatus")
             .addInfo("200% faster than single block machines of the same voltage")
@@ -287,7 +283,7 @@ public class GT_MetaTileEntity_IndustrialExtractor
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+        logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
         logic.setAvailableAmperage(1L);
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java
index 50c55d11a5..e79244f881 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java
@@ -1,14 +1,14 @@
 package gregtech.common.tileentities.machines.multi;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.enums.GT_HatchElement.*;
-import static gregtech.api.enums.GT_Values.AuthorFourIsTheNumber;
+import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber;
+import static gregtech.api.enums.HatchElement.*;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ENGRAVER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ENGRAVER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ENGRAVER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ENGRAVER_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.HashMap;
 import java.util.List;
@@ -29,48 +29,47 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoTunnel;
 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.enums.GTVoltageIndex;
-import gregtech.api.enums.GT_Values;
+import bartworks.API.BorosilicateGlass;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
+import gregtech.api.enums.VoltageIndex;
 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.MTEExtendedPowerMultiBlockBase;
 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.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.LaserRenderingUtil;
-import gregtech.common.blocks.GT_Block_Casings10;
-import gregtech.common.tileentities.render.TileLaser;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.blocks.BlockCasings10;
+import gregtech.common.tileentities.render.TileEntityLaser;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
+import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoTunnel;
 
-public class GT_MetaTileEntity_IndustrialLaserEngraver
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_IndustrialLaserEngraver>
+public class MTEIndustrialLaserEngraver extends MTEExtendedPowerMultiBlockBase<MTEIndustrialLaserEngraver>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_IndustrialLaserEngraver> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_IndustrialLaserEngraver>builder()
+    private static final IStructureDefinition<MTEIndustrialLaserEngraver> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEIndustrialLaserEngraver>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             (new String[][] { { "  f  ", "     ", "     ", "     ", " a~a " },
@@ -78,14 +77,12 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
                 { "aaaaa", "a a a", "a a a", "a a a", "aaaaa" }, { "aaaaa", "aaaaa", "aaaaa", "aaaaa", "aaaaa" } }))
         .addElement(
             'a',
-            buildHatchAdder(GT_MetaTileEntity_IndustrialLaserEngraver.class)
+            buildHatchAdder(MTEIndustrialLaserEngraver.class)
                 .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Energy)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(1))
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(1))
                 .dot(1)
                 .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_IndustrialLaserEngraver::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings10, 1))))
+                    onElementPass(MTEIndustrialLaserEngraver::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings10, 1))))
         .addElement('f', ofFrame(Materials.TungstenSteel))
         .addElement(
             'g',
@@ -93,23 +90,20 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
                 .ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glassTier = t, te -> te.glassTier))
         .addElement(
             'r',
-            LaserRenderingUtil.ofBlockAdder(
-                GT_MetaTileEntity_IndustrialLaserEngraver::laserRendererAdder,
-                GregTech_API.sLaserRender,
-                0))
+            LaserRenderingUtil
+                .ofBlockAdder(MTEIndustrialLaserEngraver::laserRendererAdder, GregTechAPI.sLaserRender, 0))
         .addElement(
             's',
-            buildHatchAdder(GT_MetaTileEntity_IndustrialLaserEngraver.class)
-                .adder(GT_MetaTileEntity_IndustrialLaserEngraver::addLaserSource)
-                .hatchClass(GT_MetaTileEntity_Hatch_DynamoTunnel.class)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(1))
+            buildHatchAdder(MTEIndustrialLaserEngraver.class).adder(MTEIndustrialLaserEngraver::addLaserSource)
+                .hatchClass(MTEHatchDynamoTunnel.class)
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(1))
                 .dot(3)
                 .build())
         .build();
 
-    protected TileLaser renderer;
+    protected TileEntityLaser renderer;
     private byte glassTier = 0;
-    private GT_MetaTileEntity_Hatch_DynamoTunnel laserSource = null;
+    private MTEHatchDynamoTunnel laserSource = null;
     private int laserAmps = 0;
     private int laserTier = 0;
     private String tierName = "LV";
@@ -117,8 +111,8 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
     private boolean addLaserSource(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity != null) {
             final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoTunnel) {
-                laserSource = (GT_MetaTileEntity_Hatch_DynamoTunnel) aMetaTileEntity;
+            if (aMetaTileEntity instanceof MTEHatchDynamoTunnel) {
+                laserSource = (MTEHatchDynamoTunnel) aMetaTileEntity;
                 laserSource.updateTexture(aBaseCasingIndex);
                 // Snap the laser source toward the plate. Player can rotate it if they want after but this will look
                 // nicer
@@ -135,7 +129,7 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
                 // Cube root the amperage to get the parallels
                 laserAmps = (int) Math.cbrt(laserSource.maxAmperesOut());
                 laserTier = (int) laserSource.getOutputTier();
-                tierName = GT_Values.VN[laserTier];
+                tierName = GTValues.VN[laserTier];
                 return true;
             }
         }
@@ -143,28 +137,28 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
     }
 
     private boolean laserRendererAdder(Block block, int meta, World world, int x, int y, int z) {
-        if (block != GregTech_API.sLaserRender || world == null) {
+        if (block != GregTechAPI.sLaserRender || world == null) {
             return false;
         }
         TileEntity te = world.getTileEntity(x, y, z);
-        if (te instanceof TileLaser) {
-            renderer = (TileLaser) te;
+        if (te instanceof TileEntityLaser) {
+            renderer = (TileEntityLaser) te;
             renderer.setRotationFields(getDirection(), getRotation(), getFlip());
             return true;
         }
         return false;
     }
 
-    public GT_MetaTileEntity_IndustrialLaserEngraver(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialLaserEngraver(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_IndustrialLaserEngraver(String aName) {
+    public MTEIndustrialLaserEngraver(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_IndustrialLaserEngraver> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialLaserEngraver> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -175,7 +169,7 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_IndustrialLaserEngraver(this.mName);
+        return new MTEIndustrialLaserEngraver(this.mName);
     }
 
     @Override
@@ -186,7 +180,7 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
             if (aActive) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 1)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 1)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_ENGRAVER_ACTIVE)
                         .extFacing()
@@ -199,7 +193,7 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
             } else {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 1)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 1)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_ENGRAVER)
                         .extFacing()
@@ -212,7 +206,7 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
             }
         } else {
             rTexture = new ITexture[] { Textures.BlockIcons
-                .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 1)) };
+                .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 1)) };
         }
         return rTexture;
     }
@@ -234,9 +228,9 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
         if (aPlayer.isSneaking()) {
             batchMode = !batchMode;
             if (batchMode) {
-                GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn"));
+                GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn"));
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff"));
+                GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff"));
             }
             return true;
         } else {
@@ -262,8 +256,8 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
     }
 
     @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("Laser Engraver")
             .addInfo("Controller Block for the Hyper-Intensity Laser Engraver")
             .addInfo("200% faster than single block machines of the same voltage")
@@ -320,7 +314,7 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
         if (mCasingAmount < 45) return false;
         if (laserSource == null) return false;
         if (renderer == null) return false;
-        if (glassTier < GTVoltageIndex.UMV && laserSource.mTier > glassTier) return false;
+        if (glassTier < VoltageIndex.UMV && laserSource.mTier > glassTier) return false;
 
         return true;
     }
@@ -336,8 +330,8 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
-                if (laserTier < GTVoltageIndex.UXV && recipe.mEUt > GT_Values.V[laserTier]) {
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
+                if (laserTier < VoltageIndex.UXV && recipe.mEUt > GTValues.V[laserTier]) {
                     return SimpleCheckRecipeResult.ofFailure("laser_insufficient");
                 }
                 return CheckRecipeResultRegistry.SUCCESSFUL;
@@ -345,7 +339,7 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
 
             @NotNull
             @Override
-            protected CheckRecipeResult onRecipeStart(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult onRecipeStart(@NotNull GTRecipe recipe) {
                 Colors c = Colors.Red;
                 for (int i = 0; i < recipe.mInputs.length; i++) {
                     String uid = getUniqueIdentifier(recipe.mInputs[i]);
@@ -428,7 +422,7 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+        logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
         logic.setAvailableAmperage(1L);
     }
 
@@ -499,91 +493,87 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
 
         // Black lenses
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 1)), Colors.Black);
-        lensColors.put(
-            getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Forcillium, 1)),
-            Colors.Black);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 1)), Colors.Black);
+        lensColors
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcillium, 1)), Colors.Black);
         lensColors.put(
-            getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedEntropy, 1)),
+            getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedEntropy, 1)),
             Colors.Black);
 
         // White lenses
-        lensColors.put(
-            getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.NetherStar, 1)),
-            Colors.White);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 1)), Colors.White);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.NetherStar, 1)), Colors.White);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1)), Colors.White);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 1)), Colors.White);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1)), Colors.Cyan);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1)), Colors.White);
+        lensColors
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1)), Colors.Cyan);
         lensColors.put(
-            getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1)),
+            getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1)),
             Colors.White);
 
         // Green lenses
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Emerald, 1)), Colors.Green);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Emerald, 1)), Colors.Green);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Olivine, 1)), Colors.Green);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Olivine, 1)), Colors.Green);
         lensColors.put(
-            getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.GreenSapphire, 1)),
+            getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.GreenSapphire, 1)),
             Colors.Green);
         lensColors.put(
-            getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedEarth, 1)),
+            getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedEarth, 1)),
             Colors.Green);
 
         // Red lenses
-        lensColors.put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Ruby, 1)), Colors.Red);
-        lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Firestone, 1)), Colors.Red);
+        lensColors.put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Ruby, 1)), Colors.Red);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Jasper, 1)), Colors.Red);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Firestone, 1)), Colors.Red);
+        lensColors.put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Jasper, 1)), Colors.Red);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.FoolsRuby, 1)), Colors.Red);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.FoolsRuby, 1)), Colors.Red);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.GarnetRed, 1)), Colors.Red);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.GarnetRed, 1)), Colors.Red);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedFire, 1)), Colors.Red);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedFire, 1)), Colors.Red);
 
         // Blue lenses
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.BlueTopaz, 1)), Colors.Blue);
-        lensColors.put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Opal, 1)), Colors.Blue);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.BlueTopaz, 1)), Colors.Blue);
+        lensColors.put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Opal, 1)), Colors.Blue);
         lensColors.put(
-            getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedWater, 1)),
+            getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedWater, 1)),
             Colors.Blue);
 
         // Yellow lenses
         lensColors.put(
-            getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.GarnetYellow, 1)),
+            getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.GarnetYellow, 1)),
             Colors.Yellow);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Force, 1)), Colors.Yellow);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Force, 1)), Colors.Yellow);
         lensColors.put(
-            getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedAir, 1)),
+            getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedAir, 1)),
             Colors.Yellow);
 
         // Purple lenses
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Amethyst, 1)), Colors.Purple);
-        lensColors.put(
-            getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Tanzanite, 1)),
-            Colors.Purple);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Amethyst, 1)), Colors.Purple);
+        lensColors
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Tanzanite, 1)), Colors.Purple);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Sapphire, 1)), Colors.Purple);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Sapphire, 1)), Colors.Purple);
 
         // Cyan lenses
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderEye, 1)), Colors.Cyan);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.EnderEye, 1)), Colors.Cyan);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderPearl, 1)), Colors.Cyan);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.EnderPearl, 1)), Colors.Cyan);
 
         // Orange lenses
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Topaz, 1)), Colors.Orange);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Topaz, 1)), Colors.Orange);
         lensColors
-            .put(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Amber, 1)), Colors.Orange);
+            .put(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Amber, 1)), Colors.Orange);
 
         // Time to manually define a bunch of lenses based on id
         lensColors.put("gt.bwMetaGeneratedlens1", Colors.Yellow);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java
index 4dd9d6485e..25a54021fa 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java
@@ -2,20 +2,20 @@ package gregtech.common.tileentities.machines.multi;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 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.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_GLOW;
 import static gregtech.api.enums.TickTime.SECOND;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45,29 +45,28 @@ 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.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 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_ExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-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.GTModHandler;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_IntegratedOreFactory
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_IntegratedOreFactory>
+public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEIntegratedOreFactory>
     implements ISurvivalConstructable {
 
     private static final int CASING_INDEX1 = 183;
@@ -75,8 +74,8 @@ public class GT_MetaTileEntity_IntegratedOreFactory
     private static final int MAX_PARA = 1024;
     private static final long RECIPE_EUT = 30;
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_IntegratedOreFactory> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_IntegratedOreFactory>builder()
+    private static final IStructureDefinition<MTEIntegratedOreFactory> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEIntegratedOreFactory>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(
@@ -93,36 +92,36 @@ public class GT_MetaTileEntity_IntegratedOreFactory
                     { "iggggi     ", "gt  t is~si", "g xx  spppO", "g xx  spppO", "gt  t isssi", "iggggi     " },
                     { "iggggi     ", "gt  t isssi", "g xx  s   O", "g xx  s   O", "gt  t isssi", "iggggi     " },
                     { "EEEEEE     ", "EEEEEEEEEEE", "EEEEEEEEEEE", "EEEEEEEEEEE", "EEEEEEEEEEE", "EEEEEE     " } }))
-        .addElement('i', ofBlock(GregTech_API.sBlockCasings8, 7))
-        .addElement('s', ofBlock(GregTech_API.sBlockCasings4, 1))
+        .addElement('i', ofBlock(GregTechAPI.sBlockCasings8, 7))
+        .addElement('s', ofBlock(GregTechAPI.sBlockCasings4, 1))
         .addElement('g', Glasses.chainAllGlasses())
-        .addElement('x', ofBlock(GregTech_API.sBlockCasings2, 3))
-        .addElement('p', ofBlock(GregTech_API.sBlockCasings2, 15))
+        .addElement('x', ofBlock(GregTechAPI.sBlockCasings2, 3))
+        .addElement('p', ofBlock(GregTechAPI.sBlockCasings2, 15))
         .addElement('t', ofFrame(Materials.TungstenSteel))
         .addElement(
             'E',
-            buildHatchAdder(GT_MetaTileEntity_IntegratedOreFactory.class).atLeast(Energy, Maintenance)
+            buildHatchAdder(MTEIntegratedOreFactory.class).atLeast(Energy, Maintenance)
                 .casingIndex(CASING_INDEX1)
                 .dot(1)
-                .buildAndChain(GregTech_API.sBlockCasings8, 7))
+                .buildAndChain(GregTechAPI.sBlockCasings8, 7))
         .addElement(
             'I',
-            buildHatchAdder(GT_MetaTileEntity_IntegratedOreFactory.class).atLeast(InputBus)
+            buildHatchAdder(MTEIntegratedOreFactory.class).atLeast(InputBus)
                 .casingIndex(CASING_INDEX1)
                 .dot(2)
-                .buildAndChain(GregTech_API.sBlockCasings8, 7))
+                .buildAndChain(GregTechAPI.sBlockCasings8, 7))
         .addElement(
             'W',
-            buildHatchAdder(GT_MetaTileEntity_IntegratedOreFactory.class).atLeast(InputHatch, Muffler)
+            buildHatchAdder(MTEIntegratedOreFactory.class).atLeast(InputHatch, Muffler)
                 .casingIndex(CASING_INDEX2)
                 .dot(3)
-                .buildAndChain(GregTech_API.sBlockCasings4, 1))
+                .buildAndChain(GregTechAPI.sBlockCasings4, 1))
         .addElement(
             'O',
-            buildHatchAdder(GT_MetaTileEntity_IntegratedOreFactory.class).atLeast(OutputBus, OutputHatch)
+            buildHatchAdder(MTEIntegratedOreFactory.class).atLeast(OutputBus, OutputHatch)
                 .casingIndex(CASING_INDEX2)
                 .dot(4)
-                .buildAndChain(GregTech_API.sBlockCasings4, 1))
+                .buildAndChain(GregTechAPI.sBlockCasings4, 1))
         .build();
 
     private static final HashSet<Integer> isCrushedOre = new HashSet<>();
@@ -142,52 +141,52 @@ public class GT_MetaTileEntity_IntegratedOreFactory
             if (name == null || name.isEmpty()) continue;
             if (name.startsWith("crushedPurified")) {
                 for (ItemStack stack : OreDictionary.getOres(name)) {
-                    isCrushedPureOre.add(GT_Utility.stackToInt(stack));
+                    isCrushedPureOre.add(GTUtility.stackToInt(stack));
                 }
             } else if (name.startsWith("crushedCentrifuged")) {
                 for (ItemStack stack : OreDictionary.getOres(name)) {
-                    isThermal.add(GT_Utility.stackToInt(stack));
+                    isThermal.add(GTUtility.stackToInt(stack));
                 }
             } else if (name.startsWith("crushed")) {
                 for (ItemStack stack : OreDictionary.getOres(name)) {
-                    isCrushedOre.add(GT_Utility.stackToInt(stack));
+                    isCrushedOre.add(GTUtility.stackToInt(stack));
                 }
             } else if (name.startsWith("dustImpure")) {
                 for (ItemStack stack : OreDictionary.getOres(name)) {
-                    isImpureDust.add(GT_Utility.stackToInt(stack));
+                    isImpureDust.add(GTUtility.stackToInt(stack));
                 }
             } else if (name.startsWith("dustPure")) {
                 for (ItemStack stack : OreDictionary.getOres(name)) {
-                    isPureDust.add(GT_Utility.stackToInt(stack));
+                    isPureDust.add(GTUtility.stackToInt(stack));
                 }
             } else if (name.startsWith("ore")) {
                 for (ItemStack stack : OreDictionary.getOres(name)) {
-                    isOre.add(GT_Utility.stackToInt(stack));
+                    isOre.add(GTUtility.stackToInt(stack));
                 }
             } else if (name.startsWith("rawOre")) {
                 for (ItemStack stack : OreDictionary.getOres(name)) {
-                    isOre.add(GT_Utility.stackToInt(stack));
+                    isOre.add(GTUtility.stackToInt(stack));
                 }
             }
         }
     }
 
-    public GT_MetaTileEntity_IntegratedOreFactory(int aID, String aName, String aNameRegional) {
+    public MTEIntegratedOreFactory(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_IntegratedOreFactory(String aName) {
+    public MTEIntegratedOreFactory(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_IntegratedOreFactory> getStructureDefinition() {
+    public IStructureDefinition<MTEIntegratedOreFactory> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
     @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("Ore Processor")
             .addInfo("Controller Block for the Integrated Ore Factory")
             .addInfo("It is OP. I mean ore processor.")
@@ -260,7 +259,7 @@ public class GT_MetaTileEntity_IntegratedOreFactory
 
         List<ItemStack> tInput = getStoredInputs();
         List<FluidStack> tInputFluid = getStoredFluids();
-        long availableEUt = GT_Utility.roundUpVoltage(getMaxInputVoltage());
+        long availableEUt = GTUtility.roundUpVoltage(getMaxInputVoltage());
         if (availableEUt < RECIPE_EUT) {
             return CheckRecipeResultRegistry.insufficientPower(RECIPE_EUT);
         }
@@ -271,7 +270,7 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         int maxParallel = MAX_PARA;
         int originalMaxParallel = maxParallel;
 
-        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setEUt(availableEUt)
+        OverclockCalculator calculator = new OverclockCalculator().setEUt(availableEUt)
             .setRecipeEUt(RECIPE_EUT)
             .setDuration(getTime(sMode))
             .setParallel(originalMaxParallel);
@@ -279,12 +278,12 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         double tickTimeAfterOC = calculator.calculateDurationUnderOneTick();
 
         if (tickTimeAfterOC < 1) {
-            maxParallel = GT_Utility.safeInt((long) (maxParallel / tickTimeAfterOC), 0);
+            maxParallel = GTUtility.safeInt((long) (maxParallel / tickTimeAfterOC), 0);
         }
 
         int maxParallelBeforeBatchMode = maxParallel;
         if (isBatchModeEnabled()) {
-            maxParallel = GT_Utility.safeInt((long) maxParallel * getMaxBatchSize(), 0);
+            maxParallel = GTUtility.safeInt((long) maxParallel * getMaxBatchSize(), 0);
         }
 
         int currentParallel = (int) Math.min(maxParallel, availableEUt / RECIPE_EUT);
@@ -292,7 +291,7 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         int tLube = 0;
         int tWater = 0;
         for (FluidStack fluid : tInputFluid) {
-            if (fluid != null && fluid.equals(GT_ModHandler.getDistilledWater(1L))) {
+            if (fluid != null && fluid.equals(GTModHandler.getDistilledWater(1L))) {
                 tWater += fluid.amount;
             } else if (fluid != null && fluid.equals(Materials.Lubricant.getFluid(1L))) {
                 tLube += fluid.amount;
@@ -307,7 +306,7 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         // Calculate parallel by items
         int itemParallel = 0;
         for (ItemStack ore : tInput) {
-            int tID = GT_Utility.stackToInt(ore);
+            int tID = GTUtility.stackToInt(ore);
             if (tID == 0) continue;
             if (isPureDust.contains(tID) || isImpureDust.contains(tID)
                 || isCrushedPureOre.contains(tID)
@@ -341,14 +340,14 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         setCurrentParallelism(finalParallel);
 
         // Consume fluids
-        depleteInput(GT_ModHandler.getDistilledWater(finalParallel * 200L));
+        depleteInput(GTModHandler.getDistilledWater(finalParallel * 200L));
         depleteInput(Materials.Lubricant.getFluid(finalParallel * 2L));
 
         // Consume items and generate outputs
         List<ItemStack> tOres = new ArrayList<>();
         int remainingCost = finalParallel;
         for (ItemStack ore : tInput) {
-            int tID = GT_Utility.stackToInt(ore);
+            int tID = GTUtility.stackToInt(ore);
             if (tID == 0) continue;
             if (isPureDust.contains(tID) || isImpureDust.contains(tID)
                 || isCrushedPureOre.contains(tID)
@@ -356,11 +355,11 @@ public class GT_MetaTileEntity_IntegratedOreFactory
                 || isCrushedOre.contains(tID)
                 || isOre.contains(tID)) {
                 if (remainingCost >= ore.stackSize) {
-                    tOres.add(GT_Utility.copy(ore));
+                    tOres.add(GTUtility.copy(ore));
                     remainingCost -= ore.stackSize;
                     ore.stackSize = 0;
                 } else {
-                    tOres.add(GT_Utility.copyAmountUnsafe(remainingCost, ore));
+                    tOres.add(GTUtility.copyAmountUnsafe(remainingCost, ore));
                     ore.stackSize -= remainingCost;
                     break;
                 }
@@ -428,14 +427,14 @@ public class GT_MetaTileEntity_IntegratedOreFactory
     public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aPlayer.isSneaking()) {
             sVoidStone = !sVoidStone;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.void", sVoidStone));
             return;
         }
         sMode = (sMode + 1) % 5;
         List<String> des = getDisplayMode(sMode);
-        GT_Utility.sendChatToPlayer(aPlayer, String.join("", des));
+        GTUtility.sendChatToPlayer(aPlayer, String.join("", des));
     }
 
     @Override
@@ -459,10 +458,10 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         List<ItemStack> tProduct = new ArrayList<>();
         if (sMidProduct != null) {
             for (ItemStack aStack : sMidProduct) {
-                int tID = GT_Utility.stackToInt(aStack);
+                int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GT_Recipe tRecipe = RecipeMaps.maceratorRecipes
-                        .findRecipe(getBaseMetaTileEntity(), false, GT_Values.V[15], null, aStack);
+                    GTRecipe tRecipe = RecipeMaps.maceratorRecipes
+                        .findRecipe(getBaseMetaTileEntity(), false, GTValues.V[15], null, aStack);
                     if (tRecipe != null) {
                         tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize));
                     } else {
@@ -481,13 +480,13 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         List<ItemStack> tProduct = new ArrayList<>();
         if (sMidProduct != null) {
             for (ItemStack aStack : sMidProduct) {
-                int tID = GT_Utility.stackToInt(aStack);
+                int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GT_Recipe tRecipe = RecipeMaps.oreWasherRecipes.findRecipe(
+                    GTRecipe tRecipe = RecipeMaps.oreWasherRecipes.findRecipe(
                         getBaseMetaTileEntity(),
                         false,
-                        GT_Values.V[15],
-                        new FluidStack[] { GT_ModHandler.getDistilledWater(Integer.MAX_VALUE) },
+                        GTValues.V[15],
+                        new FluidStack[] { GTModHandler.getDistilledWater(Integer.MAX_VALUE) },
                         aStack);
                     if (tRecipe != null) {
                         tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize));
@@ -507,10 +506,10 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         List<ItemStack> tProduct = new ArrayList<>();
         if (sMidProduct != null) {
             for (ItemStack aStack : sMidProduct) {
-                int tID = GT_Utility.stackToInt(aStack);
+                int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GT_Recipe tRecipe = RecipeMaps.thermalCentrifugeRecipes
-                        .findRecipe(getBaseMetaTileEntity(), false, GT_Values.V[15], null, aStack);
+                    GTRecipe tRecipe = RecipeMaps.thermalCentrifugeRecipes
+                        .findRecipe(getBaseMetaTileEntity(), false, GTValues.V[15], null, aStack);
                     if (tRecipe != null) {
                         tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize));
                     } else {
@@ -529,10 +528,10 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         List<ItemStack> tProduct = new ArrayList<>();
         if (sMidProduct != null) {
             for (ItemStack aStack : sMidProduct) {
-                int tID = GT_Utility.stackToInt(aStack);
+                int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GT_Recipe tRecipe = RecipeMaps.centrifugeRecipes
-                        .findRecipe(getBaseMetaTileEntity(), false, GT_Values.V[15], null, aStack);
+                    GTRecipe tRecipe = RecipeMaps.centrifugeRecipes
+                        .findRecipe(getBaseMetaTileEntity(), false, GTValues.V[15], null, aStack);
                     if (tRecipe != null) {
                         tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize));
                     } else {
@@ -551,10 +550,10 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         List<ItemStack> tProduct = new ArrayList<>();
         if (sMidProduct != null) {
             for (ItemStack aStack : sMidProduct) {
-                int tID = GT_Utility.stackToInt(aStack);
+                int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GT_Recipe tRecipe = RecipeMaps.sifterRecipes
-                        .findRecipe(getBaseMetaTileEntity(), false, GT_Values.V[15], null, aStack);
+                    GTRecipe tRecipe = RecipeMaps.sifterRecipes
+                        .findRecipe(getBaseMetaTileEntity(), false, GTValues.V[15], null, aStack);
                     if (tRecipe != null) {
                         tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize));
                     } else {
@@ -573,12 +572,12 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         List<ItemStack> tProduct = new ArrayList<>();
         if (sMidProduct != null) {
             for (ItemStack aStack : sMidProduct) {
-                int tID = GT_Utility.stackToInt(aStack);
+                int tID = GTUtility.stackToInt(aStack);
                 if (checkTypes(tID, aTables)) {
-                    GT_Recipe tRecipe = RecipeMaps.chemicalBathRecipes.findRecipe(
+                    GTRecipe tRecipe = RecipeMaps.chemicalBathRecipes.findRecipe(
                         getBaseMetaTileEntity(),
                         false,
-                        GT_Values.V[15],
+                        GTValues.V[15],
                         getStoredFluids().toArray(new FluidStack[0]),
                         aStack);
                     if (tRecipe != null && tRecipe.getRepresentativeFluidInput(0) != null) {
@@ -589,7 +588,7 @@ public class GT_MetaTileEntity_IntegratedOreFactory
                         depleteInput(new FluidStack(tInputFluid.getFluid(), tWashed * tInputFluid.amount));
                         tProduct.addAll(getOutputStack(tRecipe, tWashed));
                         if (tWashed < aStack.stackSize) {
-                            tProduct.add(GT_Utility.copyAmountUnsafe(aStack.stackSize - tWashed, aStack));
+                            tProduct.add(GTUtility.copyAmountUnsafe(aStack.stackSize - tWashed, aStack));
                         }
                     } else {
                         tProduct.add(aStack);
@@ -613,7 +612,7 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         return tAmt;
     }
 
-    private List<ItemStack> getOutputStack(GT_Recipe aRecipe, int aTime) {
+    private List<ItemStack> getOutputStack(GTRecipe aRecipe, int aTime) {
         List<ItemStack> tOutput = new ArrayList<>();
         for (int i = 0; i < aRecipe.mOutputs.length; i++) {
             if (aRecipe.getOutput(i) == null) {
@@ -621,15 +620,14 @@ public class GT_MetaTileEntity_IntegratedOreFactory
             }
             int tChance = aRecipe.getOutputChance(i);
             if (tChance == 10000) {
-                tOutput.add(GT_Utility.copyAmountUnsafe(aTime * aRecipe.getOutput(i).stackSize, aRecipe.getOutput(i)));
+                tOutput.add(GTUtility.copyAmountUnsafe(aTime * aRecipe.getOutput(i).stackSize, aRecipe.getOutput(i)));
             } else {
                 // Use Normal Distribution
                 double u = aTime * (tChance / 10000D);
                 double e = aTime * (tChance / 10000D) * (1 - (tChance / 10000D));
                 Random random = new Random();
                 int tAmount = (int) Math.ceil(Math.sqrt(e) * random.nextGaussian() + u);
-                tOutput
-                    .add(GT_Utility.copyAmountUnsafe(tAmount * aRecipe.getOutput(i).stackSize, aRecipe.getOutput(i)));
+                tOutput.add(GTUtility.copyAmountUnsafe(tAmount * aRecipe.getOutput(i).stackSize, aRecipe.getOutput(i)));
             }
         }
         return tOutput.stream()
@@ -640,9 +638,9 @@ public class GT_MetaTileEntity_IntegratedOreFactory
     private void doCompress(List<ItemStack> aList) {
         HashMap<Integer, Integer> rProduct = new HashMap<>();
         for (ItemStack stack : aList) {
-            int tID = GT_Utility.stackToInt(stack);
+            int tID = GTUtility.stackToInt(stack);
             if (sVoidStone) {
-                if (GT_Utility.areStacksEqual(Materials.Stone.getDust(1), stack)) {
+                if (GTUtility.areStacksEqual(Materials.Stone.getDust(1), stack)) {
                     continue;
                 }
             }
@@ -657,8 +655,8 @@ public class GT_MetaTileEntity_IntegratedOreFactory
         sMidProduct = new ItemStack[rProduct.size()];
         int cnt = 0;
         for (Integer id : rProduct.keySet()) {
-            ItemStack stack = GT_Utility.intToStack(id);
-            sMidProduct[cnt] = GT_Utility.copyAmountUnsafe(rProduct.get(id), stack);
+            ItemStack stack = GTUtility.intToStack(id);
+            sMidProduct[cnt] = GTUtility.copyAmountUnsafe(rProduct.get(id), stack);
             cnt++;
         }
     }
@@ -691,7 +689,7 @@ public class GT_MetaTileEntity_IntegratedOreFactory
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_IntegratedOreFactory(mName);
+        return new MTEIntegratedOreFactory(mName);
     }
 
     private void setCurrentParallelism(int parallelism) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoiler.java
index ae740447c8..4d4025d7d4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoiler.java
@@ -4,19 +4,19 @@ 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.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.OutputHatch;
-import static gregtech.api.enums.GT_Values.STEAM_PER_WATER;
+import static gregtech.api.enums.GTValues.STEAM_PER_WATER;
+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.enums.ItemList.Circuit_Integrated;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.ArrayList;
 
@@ -34,36 +34,36 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
 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.maps.LargeBoilerFuelBackend;
 import gregtech.api.render.TextureFactory;
-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_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public abstract class GT_MetaTileEntity_LargeBoiler
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeBoiler> implements ISurvivalConstructable {
+public abstract class MTELargeBoiler extends MTEEnhancedMultiBlockBase<MTELargeBoiler>
+    implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeBoiler>> STRUCTURE_DEFINITION = new ClassValue<>() {
+    private static final ClassValue<IStructureDefinition<MTELargeBoiler>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
-        protected IStructureDefinition<GT_MetaTileEntity_LargeBoiler> computeValue(Class<?> type) {
-            return StructureDefinition.<GT_MetaTileEntity_LargeBoiler>builder()
+        protected IStructureDefinition<MTELargeBoiler> computeValue(Class<?> type) {
+            return StructureDefinition.<MTELargeBoiler>builder()
                 .addShape(
                     STRUCTURE_PIECE_MAIN,
                     transpose(
@@ -73,23 +73,22 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                 .addElement(
                     'c',
                     lazy(
-                        t -> buildHatchAdder(GT_MetaTileEntity_LargeBoiler.class).atLeast(OutputHatch)
+                        t -> buildHatchAdder(MTELargeBoiler.class).atLeast(OutputHatch)
                             .casingIndex(t.getCasingTextureIndex())
                             .dot(2)
                             .buildAndChain(
                                 onElementPass(
-                                    GT_MetaTileEntity_LargeBoiler::onCasingAdded,
+                                    MTELargeBoiler::onCasingAdded,
                                     ofBlock(t.getCasingBlock(), t.getCasingMeta())))))
                 .addElement(
                     'f',
                     lazy(
-                        t -> buildHatchAdder(GT_MetaTileEntity_LargeBoiler.class)
-                            .atLeast(Maintenance, InputHatch, InputBus, Muffler)
+                        t -> buildHatchAdder(MTELargeBoiler.class).atLeast(Maintenance, InputHatch, InputBus, Muffler)
                             .casingIndex(t.getFireboxTextureIndex())
                             .dot(1)
                             .buildAndChain(
                                 onElementPass(
-                                    GT_MetaTileEntity_LargeBoiler::onFireboxAdded,
+                                    MTELargeBoiler::onFireboxAdded,
                                     ofBlock(t.getFireboxBlock(), t.getFireboxMeta())))))
                 .build();
         }
@@ -104,17 +103,17 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     private int mFireboxAmount;
     protected int pollutionPerSecond = 1; // placeholder for the child classes
 
-    public GT_MetaTileEntity_LargeBoiler(int aID, String aName, String aNameRegional) {
+    public MTELargeBoiler(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_LargeBoiler(String aName) {
+    public MTELargeBoiler(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("Boiler")
             .addInfo("Controller block for the Large " + getCasingMaterial() + " Boiler");
@@ -195,7 +194,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler
         return Math.max(
             0,
             (int) (pollutionPerSecond
-                * (1 - GT_Mod.gregtechproxy.mPollutionReleasedByThrottle * getIntegratedCircuitConfig())));
+                * (1 - GTMod.gregtechproxy.mPollutionReleasedByThrottle * getIntegratedCircuitConfig())));
     }
 
     @Override
@@ -274,8 +273,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler
 
         this.mSuperEfficencyIncrease = 0;
         if (!isSuperheated()) {
-            for (GT_Recipe tRecipe : RecipeMaps.dieselFuels.getAllRecipes()) {
-                FluidStack tFluid = GT_Utility.getFluidForFilledItem(tRecipe.getRepresentativeInput(0), true);
+            for (GTRecipe tRecipe : RecipeMaps.dieselFuels.getAllRecipes()) {
+                FluidStack tFluid = GTUtility.getFluidForFilledItem(tRecipe.getRepresentativeInput(0), true);
                 if (tFluid != null && tRecipe.mSpecialValue > 1) {
                     tFluid.amount = 1000;
                     if (depleteInput(tFluid)) {
@@ -286,8 +285,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                     }
                 }
             }
-            for (GT_Recipe tRecipe : RecipeMaps.denseLiquidFuels.getAllRecipes()) {
-                FluidStack tFluid = GT_Utility.getFluidForFilledItem(tRecipe.getRepresentativeInput(0), true);
+            for (GTRecipe tRecipe : RecipeMaps.denseLiquidFuels.getAllRecipes()) {
+                FluidStack tFluid = GTUtility.getFluidForFilledItem(tRecipe.getRepresentativeInput(0), true);
                 if (tFluid != null) {
                     tFluid.amount = 1000;
                     if (depleteInput(tFluid)) {
@@ -305,16 +304,16 @@ public abstract class GT_MetaTileEntity_LargeBoiler
         if (!tInputList.isEmpty()) {
             if (isSuperheated()) {
                 for (ItemStack tInput : tInputList) {
-                    if (tInput != GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Lava, 1)) {
-                        if (GT_Utility.getFluidForFilledItem(tInput, true) == null
-                            && (this.mMaxProgresstime = GT_ModHandler.getFuelValue(tInput) / 80) > 0) {
-                            this.excessFuel += GT_ModHandler.getFuelValue(tInput) % 80;
+                    if (tInput != GTOreDictUnificator.get(OrePrefixes.bucket, Materials.Lava, 1)) {
+                        if (GTUtility.getFluidForFilledItem(tInput, true) == null
+                            && (this.mMaxProgresstime = GTModHandler.getFuelValue(tInput) / 80) > 0) {
+                            this.excessFuel += GTModHandler.getFuelValue(tInput) % 80;
                             this.mMaxProgresstime += this.excessFuel / 80;
                             this.excessFuel %= 80;
                             this.mMaxProgresstime = adjustBurnTimeForConfig(runtimeBoost(this.mMaxProgresstime));
                             this.mEUt = adjustEUtForConfig(getEUt());
                             this.mEfficiencyIncrease = this.mMaxProgresstime * getEfficiencyIncrease();
-                            this.mOutputItems = new ItemStack[] { GT_Utility.getContainerItem(tInput, true) };
+                            this.mOutputItems = new ItemStack[] { GTUtility.getContainerItem(tInput, true) };
                             tInput.stackSize -= 1;
                             updateSlots();
                             if (this.mEfficiencyIncrease > 5000) {
@@ -327,20 +326,20 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                 }
             } else {
                 for (ItemStack tInput : tInputList) {
-                    if (tInput != GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Lava, 1)) {
+                    if (tInput != GTOreDictUnificator.get(OrePrefixes.bucket, Materials.Lava, 1)) {
                         // Solid fuels with burn values below getEUt are ignored (mostly items like sticks), and also
                         // those with very high fuel values that would cause an overflow error.
-                        if (GT_Utility.getFluidForFilledItem(tInput, true) == null
-                            && (this.mMaxProgresstime = GT_ModHandler.getFuelValue(tInput) / 80) > 0
-                            && (GT_ModHandler.getFuelValue(tInput) * 2 / this.getEUt()) > 1
-                            && GT_ModHandler.getFuelValue(tInput) < 100000000) {
-                            this.excessFuel += GT_ModHandler.getFuelValue(tInput) % 80;
+                        if (GTUtility.getFluidForFilledItem(tInput, true) == null
+                            && (this.mMaxProgresstime = GTModHandler.getFuelValue(tInput) / 80) > 0
+                            && (GTModHandler.getFuelValue(tInput) * 2 / this.getEUt()) > 1
+                            && GTModHandler.getFuelValue(tInput) < 100000000) {
+                            this.excessFuel += GTModHandler.getFuelValue(tInput) % 80;
                             this.mMaxProgresstime += this.excessFuel / 80;
                             this.excessFuel %= 80;
                             this.mMaxProgresstime = adjustBurnTimeForConfig(runtimeBoost(this.mMaxProgresstime));
                             this.mEUt = adjustEUtForConfig(getEUt());
                             this.mEfficiencyIncrease = this.mMaxProgresstime * getEfficiencyIncrease();
-                            this.mOutputItems = new ItemStack[] { GT_Utility.getContainerItem(tInput, true) };
+                            this.mOutputItems = new ItemStack[] { GTUtility.getContainerItem(tInput, true) };
                             tInput.stackSize -= 1;
                             updateSlots();
                             if (this.mEfficiencyIncrease > 5000) {
@@ -383,21 +382,21 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                     // Consumes only one third of the water if producing Superheated Steam, to maintain water in the
                     // chain.
                     if (depleteInput(Materials.Water.getFluid(amount / superToNormalSteam))
-                        || depleteInput(GT_ModHandler.getDistilledWater(amount / superToNormalSteam))) {
+                        || depleteInput(GTModHandler.getDistilledWater(amount / superToNormalSteam))) {
                         // Outputs Superheated Steam instead of Steam, at one third of the amount (equivalent in power
                         // output to the normal Steam amount).
                         addOutput(
                             FluidRegistry.getFluidStack("ic2superheatedsteam", tGeneratedEU / superToNormalSteam));
                     } else {
-                        GT_Log.exp.println("Boiler " + this.mName + " had no Water!");
+                        GTLog.exp.println("Boiler " + this.mName + " had no Water!");
                         explodeMultiblock();
                     }
                 } else {
                     if (depleteInput(Materials.Water.getFluid(amount))
-                        || depleteInput(GT_ModHandler.getDistilledWater(amount))) {
-                        addOutput(GT_ModHandler.getSteam(tGeneratedEU));
+                        || depleteInput(GTModHandler.getDistilledWater(amount))) {
+                        addOutput(GTModHandler.getSteam(tGeneratedEU));
                     } else {
-                        GT_Log.exp.println("Boiler " + this.mName + " had no Water!");
+                        GTLog.exp.println("Boiler " + this.mName + " had no Water!");
                         explodeMultiblock();
                     }
                 }
@@ -428,7 +427,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         if (mProgresstime > 0 && firstRun) {
             firstRun = false;
-            GT_Mod.achievements.issueAchievement(
+            GTMod.achievements.issueAchievement(
                 aBaseMetaTileEntity.getWorld()
                     .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()),
                 "extremepressure");
@@ -437,7 +436,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_LargeBoiler> getStructureDefinition() {
+    public IStructureDefinition<MTELargeBoiler> getStructureDefinition() {
         return STRUCTURE_DEFINITION.get(getClass());
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerBronze.java
index 2effcf7966..5d0032df6a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerBronze.java
@@ -2,26 +2,26 @@ package gregtech.common.tileentities.machines.multi;
 
 import net.minecraft.block.Block;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public class GT_MetaTileEntity_LargeBoiler_Bronze extends GT_MetaTileEntity_LargeBoiler {
+public class MTELargeBoilerBronze extends MTELargeBoiler {
 
-    public GT_MetaTileEntity_LargeBoiler_Bronze(int aID, String aName, String aNameRegional) {
+    public MTELargeBoilerBronze(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
-        pollutionPerSecond = GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond;
+        pollutionPerSecond = GTMod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond;
     }
 
-    public GT_MetaTileEntity_LargeBoiler_Bronze(String aName) {
+    public MTELargeBoilerBronze(String aName) {
         super(aName);
-        pollutionPerSecond = GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond;
+        pollutionPerSecond = GTMod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond;
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeBoiler_Bronze(this.mName);
+        return new MTELargeBoilerBronze(this.mName);
     }
 
     @Override
@@ -36,7 +36,7 @@ public class GT_MetaTileEntity_LargeBoiler_Bronze extends GT_MetaTileEntity_Larg
 
     @Override
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings1;
+        return GregTechAPI.sBlockCasings1;
     }
 
     @Override
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_LargeBoiler_Bronze extends GT_MetaTileEntity_Larg
 
     @Override
     public Block getPipeBlock() {
-        return GregTech_API.sBlockCasings2;
+        return GregTechAPI.sBlockCasings2;
     }
 
     @Override
@@ -61,7 +61,7 @@ public class GT_MetaTileEntity_LargeBoiler_Bronze extends GT_MetaTileEntity_Larg
 
     @Override
     public Block getFireboxBlock() {
-        return GregTech_API.sBlockCasings3;
+        return GregTechAPI.sBlockCasings3;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerSteel.java
index c7bd766945..32f78c15ef 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerSteel.java
@@ -2,26 +2,26 @@ package gregtech.common.tileentities.machines.multi;
 
 import net.minecraft.block.Block;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public class GT_MetaTileEntity_LargeBoiler_Steel extends GT_MetaTileEntity_LargeBoiler {
+public class MTELargeBoilerSteel extends MTELargeBoiler {
 
-    public GT_MetaTileEntity_LargeBoiler_Steel(int aID, String aName, String aNameRegional) {
+    public MTELargeBoilerSteel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
-        pollutionPerSecond = GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond;
+        pollutionPerSecond = GTMod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond;
     }
 
-    public GT_MetaTileEntity_LargeBoiler_Steel(String aName) {
+    public MTELargeBoilerSteel(String aName) {
         super(aName);
-        pollutionPerSecond = GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond;
+        pollutionPerSecond = GTMod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond;
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeBoiler_Steel(this.mName);
+        return new MTELargeBoilerSteel(this.mName);
     }
 
     @Override
@@ -36,7 +36,7 @@ public class GT_MetaTileEntity_LargeBoiler_Steel extends GT_MetaTileEntity_Large
 
     @Override
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings2;
+        return GregTechAPI.sBlockCasings2;
     }
 
     @Override
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_LargeBoiler_Steel extends GT_MetaTileEntity_Large
 
     @Override
     public Block getPipeBlock() {
-        return GregTech_API.sBlockCasings2;
+        return GregTechAPI.sBlockCasings2;
     }
 
     @Override
@@ -61,7 +61,7 @@ public class GT_MetaTileEntity_LargeBoiler_Steel extends GT_MetaTileEntity_Large
 
     @Override
     public Block getFireboxBlock() {
-        return GregTech_API.sBlockCasings3;
+        return GregTechAPI.sBlockCasings3;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerTitanium.java
index 61f2756622..2893a72008 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerTitanium.java
@@ -2,26 +2,26 @@ package gregtech.common.tileentities.machines.multi;
 
 import net.minecraft.block.Block;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public class GT_MetaTileEntity_LargeBoiler_Titanium extends GT_MetaTileEntity_LargeBoiler {
+public class MTELargeBoilerTitanium extends MTELargeBoiler {
 
-    public GT_MetaTileEntity_LargeBoiler_Titanium(int aID, String aName, String aNameRegional) {
+    public MTELargeBoilerTitanium(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
-        pollutionPerSecond = GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond;
+        pollutionPerSecond = GTMod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond;
     }
 
-    public GT_MetaTileEntity_LargeBoiler_Titanium(String aName) {
+    public MTELargeBoilerTitanium(String aName) {
         super(aName);
-        pollutionPerSecond = GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond;
+        pollutionPerSecond = GTMod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond;
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeBoiler_Titanium(this.mName);
+        return new MTELargeBoilerTitanium(this.mName);
     }
 
     @Override
@@ -36,7 +36,7 @@ public class GT_MetaTileEntity_LargeBoiler_Titanium extends GT_MetaTileEntity_La
 
     @Override
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_LargeBoiler_Titanium extends GT_MetaTileEntity_La
 
     @Override
     public Block getPipeBlock() {
-        return GregTech_API.sBlockCasings2;
+        return GregTechAPI.sBlockCasings2;
     }
 
     @Override
@@ -61,7 +61,7 @@ public class GT_MetaTileEntity_LargeBoiler_Titanium extends GT_MetaTileEntity_La
 
     @Override
     public Block getFireboxBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerTungstenSteel.java
index f00ea287b2..e47c74d58a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoilerTungstenSteel.java
@@ -2,26 +2,26 @@ package gregtech.common.tileentities.machines.multi;
 
 import net.minecraft.block.Block;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public class GT_MetaTileEntity_LargeBoiler_TungstenSteel extends GT_MetaTileEntity_LargeBoiler {
+public class MTELargeBoilerTungstenSteel extends MTELargeBoiler {
 
-    public GT_MetaTileEntity_LargeBoiler_TungstenSteel(int aID, String aName, String aNameRegional) {
+    public MTELargeBoilerTungstenSteel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
-        pollutionPerSecond = GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond;
+        pollutionPerSecond = GTMod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond;
     }
 
-    public GT_MetaTileEntity_LargeBoiler_TungstenSteel(String aName) {
+    public MTELargeBoilerTungstenSteel(String aName) {
         super(aName);
-        pollutionPerSecond = GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond;
+        pollutionPerSecond = GTMod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond;
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeBoiler_TungstenSteel(this.mName);
+        return new MTELargeBoilerTungstenSteel(this.mName);
     }
 
     @Override
@@ -36,7 +36,7 @@ public class GT_MetaTileEntity_LargeBoiler_TungstenSteel extends GT_MetaTileEnti
 
     @Override
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_LargeBoiler_TungstenSteel extends GT_MetaTileEnti
 
     @Override
     public Block getPipeBlock() {
-        return GregTech_API.sBlockCasings2;
+        return GregTechAPI.sBlockCasings2;
     }
 
     @Override
@@ -61,7 +61,7 @@ public class GT_MetaTileEntity_LargeBoiler_TungstenSteel extends GT_MetaTileEnti
 
     @Override
     public Block getFireboxBlock() {
-        return GregTech_API.sBlockCasings3;
+        return GregTechAPI.sBlockCasings3;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeChemicalReactor.java
index 8e4b5ec650..a7e94c9ea5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeChemicalReactor.java
@@ -3,18 +3,18 @@ package gregtech.common.tileentities.machines.multi;
 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.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.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -38,72 +38,68 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import com.gtnewhorizon.structurelib.structure.StructureUtility;
 import com.gtnewhorizon.structurelib.util.ItemStackPredicate;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.interfaces.IHeatingCoil;
 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_EnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_LargeChemicalReactor extends
-    GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeChemicalReactor> implements ISurvivalConstructable {
+public class MTELargeChemicalReactor extends MTEEnhancedMultiBlockBase<MTELargeChemicalReactor>
+    implements ISurvivalConstructable {
 
     private static final int CASING_INDEX = 176;
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_LargeChemicalReactor> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_LargeChemicalReactor>builder()
+    private static final IStructureDefinition<MTELargeChemicalReactor> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTELargeChemicalReactor>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(new String[][] { { "ccc", "cxc", "ccc" }, { "c~c", "xPx", "cxc" }, { "ccc", "cxc", "ccc" }, }))
-        .addElement('P', ofBlock(GregTech_API.sBlockCasings8, 1))
+        .addElement('P', ofBlock(GregTechAPI.sBlockCasings8, 1))
         .addElement(
             'c',
-            buildHatchAdder(GT_MetaTileEntity_LargeChemicalReactor.class)
+            buildHatchAdder(MTELargeChemicalReactor.class)
                 .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy)
                 .casingIndex(CASING_INDEX)
                 .dot(1)
                 .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_LargeChemicalReactor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings8, 0))))
+                    onElementPass(MTELargeChemicalReactor::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings8, 0))))
         .addElement(
             'x',
-            buildHatchAdder(GT_MetaTileEntity_LargeChemicalReactor.class)
+            buildHatchAdder(MTELargeChemicalReactor.class)
                 .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy)
                 .casingIndex(CASING_INDEX)
                 .dot(1)
                 .buildAndChain(
                     CoilStructureElement.INSTANCE,
-                    onElementPass(
-                        GT_MetaTileEntity_LargeChemicalReactor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings8, 0))))
+                    onElementPass(MTELargeChemicalReactor::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings8, 0))))
         .build();
 
     private int mCasingAmount;
     private int mCoilAmount;
 
-    public GT_MetaTileEntity_LargeChemicalReactor(int aID, String aName, String aNameRegional) {
+    public MTELargeChemicalReactor(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_LargeChemicalReactor(String aName) {
+    public MTELargeChemicalReactor(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeChemicalReactor(this.mName);
+        return new MTELargeChemicalReactor(this.mName);
     }
 
     @Override
-    public GT_Multiblock_Tooltip_Builder createTooltip() {
-        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    public MultiblockTooltipBuilder createTooltip() {
+        final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Chemical Reactor")
             .addInfo("Controller block for the Large Chemical Reactor")
             .addInfo("Does not lose efficiency when overclocked")
@@ -172,7 +168,7 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_LargeChemicalReactor> getStructureDefinition() {
+    public IStructureDefinition<MTELargeChemicalReactor> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -223,12 +219,12 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends
         return true;
     }
 
-    private enum CoilStructureElement implements IStructureElement<GT_MetaTileEntity_LargeChemicalReactor> {
+    private enum CoilStructureElement implements IStructureElement<MTELargeChemicalReactor> {
 
         INSTANCE;
 
         @Override
-        public boolean check(GT_MetaTileEntity_LargeChemicalReactor t, World world, int x, int y, int z) {
+        public boolean check(MTELargeChemicalReactor t, World world, int x, int y, int z) {
             Block block = world.getBlock(x, y, z);
             if (block instanceof IHeatingCoil
                 && ((IHeatingCoil) block).getCoilHeat(world.getBlockMetadata(x, y, z)) != HeatingCoilLevel.None) {
@@ -239,45 +235,42 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends
         }
 
         @Override
-        public boolean spawnHint(GT_MetaTileEntity_LargeChemicalReactor t, World world, int x, int y, int z,
-            ItemStack trigger) {
-            StructureLibAPI.hintParticle(world, x, y, z, GregTech_API.sBlockCasings5, 0);
+        public boolean spawnHint(MTELargeChemicalReactor t, World world, int x, int y, int z, ItemStack trigger) {
+            StructureLibAPI.hintParticle(world, x, y, z, GregTechAPI.sBlockCasings5, 0);
             return true;
         }
 
         @Override
-        public boolean placeBlock(GT_MetaTileEntity_LargeChemicalReactor t, World world, int x, int y, int z,
-            ItemStack trigger) {
+        public boolean placeBlock(MTELargeChemicalReactor t, World world, int x, int y, int z, ItemStack trigger) {
             if (t.mCoilAmount > 0) return false;
-            boolean b = world.setBlock(x, y, z, GregTech_API.sBlockCasings5, 0, 3);
+            boolean b = world.setBlock(x, y, z, GregTechAPI.sBlockCasings5, 0, 3);
             if (b) t.mCoilAmount++;
             return b;
         }
 
         @Override
-        public PlaceResult survivalPlaceBlock(GT_MetaTileEntity_LargeChemicalReactor t, World world, int x, int y,
-            int z, ItemStack trigger, IItemSource s, EntityPlayerMP actor, Consumer<IChatComponent> chatter) {
+        public PlaceResult survivalPlaceBlock(MTELargeChemicalReactor t, World world, int x, int y, int z,
+            ItemStack trigger, IItemSource s, EntityPlayerMP actor, Consumer<IChatComponent> chatter) {
             return survivalPlaceBlock(t, world, x, y, z, trigger, AutoPlaceEnvironment.fromLegacy(s, actor, chatter));
         }
 
         @Override
-        public BlocksToPlace getBlocksToPlace(
-            GT_MetaTileEntity_LargeChemicalReactor gt_metaTileEntity_largeChemicalReactor, World world, int x, int y,
-            int z, ItemStack trigger, AutoPlaceEnvironment env) {
+        public BlocksToPlace getBlocksToPlace(MTELargeChemicalReactor gt_metaTileEntity_largeChemicalReactor,
+            World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) {
             return BlocksToPlace.create(
                 IntStream.range(0, 8)
-                    .mapToObj(i -> new ItemStack(GregTech_API.sBlockCasings5, 1, i))
+                    .mapToObj(i -> new ItemStack(GregTechAPI.sBlockCasings5, 1, i))
                     .collect(Collectors.toList()));
         }
 
         @Override
-        public PlaceResult survivalPlaceBlock(GT_MetaTileEntity_LargeChemicalReactor t, World world, int x, int y,
-            int z, ItemStack trigger, AutoPlaceEnvironment env) {
+        public PlaceResult survivalPlaceBlock(MTELargeChemicalReactor t, World world, int x, int y, int z,
+            ItemStack trigger, AutoPlaceEnvironment env) {
             if (t.mCoilAmount > 0) return PlaceResult.SKIP;
             if (check(t, world, x, y, z)) return PlaceResult.SKIP;
             if (!StructureLibAPI.isBlockTriviallyReplaceable(world, x, y, z, env.getActor())) return PlaceResult.REJECT;
             ItemStack result = env.getSource()
-                .takeOne(ItemStackPredicate.from(GregTech_API.sBlockCasings5), true);
+                .takeOne(ItemStackPredicate.from(GregTechAPI.sBlockCasings5), true);
             if (result == null) return PlaceResult.REJECT;
             PlaceResult ret = StructureUtility.survivalPlaceBlock(
                 result,
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeFluidExtractor.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java
index c1a5bc3458..c19b8a061d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeFluidExtractor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java
@@ -1,21 +1,21 @@
 package gregtech.common.tileentities.machines.multi;
 
-import static com.github.bartimaeusnek.bartworks.util.BW_Util.ofGlassTiered;
+import static bartworks.util.BWUtil.ofGlassTiered;
 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 com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel;
-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.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.VN;
+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.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.getCasingTextureForId;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofCoil;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
-import static gregtech.api.util.GT_StructureUtility.ofSolenoidCoil;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.ofSolenoidCoil;
 import static net.minecraft.util.EnumChatFormatting.RESET;
 import static net.minecraft.util.EnumChatFormatting.YELLOW;
 
@@ -37,22 +37,21 @@ import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.HeatingCoilLevel;
 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.logic.ProcessingLogic;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_LargeFluidExtractor
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_LargeFluidExtractor>
+public class MTELargeFluidExtractor extends MTEExtendedPowerMultiBlockBase<MTELargeFluidExtractor>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
@@ -68,8 +67,8 @@ public class GT_MetaTileEntity_LargeFluidExtractor
     private static final double HEATING_COIL_EU_MULTIPLIER = 0.9;
 
     // spotless:off
-    private static final IStructureDefinition<GT_MetaTileEntity_LargeFluidExtractor> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_LargeFluidExtractor>builder()
+    private static final IStructureDefinition<MTELargeFluidExtractor> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTELargeFluidExtractor>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(
@@ -85,14 +84,14 @@ public class GT_MetaTileEntity_LargeFluidExtractor
                     {"cc~cc", "ccccc", "ccccc", "ccccc", "ccccc"},
                 }))
         .addElement('c',
-            buildHatchAdder(GT_MetaTileEntity_LargeFluidExtractor.class)
+            buildHatchAdder(MTELargeFluidExtractor.class)
                 .atLeast(InputBus, OutputBus, OutputHatch, Energy, Maintenance)
                 .casingIndex(CASING_INDEX) // Robust Tungstensteel Machine Casing
                 .dot(1)
                 .buildAndChain(
                     onElementPass(
-                        GT_MetaTileEntity_LargeFluidExtractor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings4, 0))) // Robust Tungstensteel Machine Casing
+                        MTELargeFluidExtractor::onCasingAdded,
+                        ofBlock(GregTechAPI.sBlockCasings4, 0))) // Robust Tungstensteel Machine Casing
         )
         .addElement(
             'g',
@@ -100,8 +99,8 @@ public class GT_MetaTileEntity_LargeFluidExtractor
                 "glass",
                 ofGlassTiered(
                     (byte) 1, (byte) 127, (byte) 0,
-                    GT_MetaTileEntity_LargeFluidExtractor::setGlassTier,
-                    GT_MetaTileEntity_LargeFluidExtractor::getGlassTier,
+                    MTELargeFluidExtractor::setGlassTier,
+                    MTELargeFluidExtractor::getGlassTier,
                     2))
         )
         .addElement(
@@ -109,16 +108,16 @@ public class GT_MetaTileEntity_LargeFluidExtractor
             withChannel(
                 "coil",
                 ofCoil(
-                    GT_MetaTileEntity_LargeFluidExtractor::setCoilLevel,
-                    GT_MetaTileEntity_LargeFluidExtractor::getCoilLevel))
+                    MTELargeFluidExtractor::setCoilLevel,
+                    MTELargeFluidExtractor::getCoilLevel))
         )
         .addElement(
             's',
             withChannel(
                 "solenoid",
                 ofSolenoidCoil(
-                    GT_MetaTileEntity_LargeFluidExtractor::setSolenoidLevel,
-                    GT_MetaTileEntity_LargeFluidExtractor::getSolenoidLevel))
+                    MTELargeFluidExtractor::setSolenoidLevel,
+                    MTELargeFluidExtractor::getSolenoidLevel))
         )
         .addElement(
             'f',
@@ -135,16 +134,16 @@ public class GT_MetaTileEntity_LargeFluidExtractor
     private int mCasingAmount;
     private boolean mStructureBadGlassTier = false, mStructureBadCasingCount = false;
 
-    public GT_MetaTileEntity_LargeFluidExtractor(final int aID, final String aName, final String aNameRegional) {
+    public MTELargeFluidExtractor(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_LargeFluidExtractor(String aName) {
+    public MTELargeFluidExtractor(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_LargeFluidExtractor> getStructureDefinition() {
+    public IStructureDefinition<MTELargeFluidExtractor> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -215,7 +214,7 @@ public class GT_MetaTileEntity_LargeFluidExtractor
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeFluidExtractor(this.mName);
+        return new MTELargeFluidExtractor(this.mName);
     }
 
     private void onCasingAdded() {
@@ -266,8 +265,8 @@ public class GT_MetaTileEntity_LargeFluidExtractor
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    protected MultiblockTooltipBuilder createTooltip() {
+        MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
 
         // spotless:off
         tt.addMachineType("Fluid Extractor")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java
index 54ad5939f8..15dc5def03 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java
@@ -3,18 +3,18 @@ package gregtech.common.tileentities.machines.multi;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 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.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
+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.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.TURBINE_NEW;
 import static gregtech.api.enums.Textures.BlockIcons.TURBINE_NEW_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.TURBINE_NEW_EMPTY;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 
@@ -43,27 +43,27 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.LightingHelper;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.render.GT_RenderUtil;
+import gregtech.common.items.MetaGeneratedTool01;
+import gregtech.common.render.GTRenderUtil;
 
-public abstract class GT_MetaTileEntity_LargeTurbine
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeTurbine> implements ISurvivalConstructable {
+public abstract class MTELargeTurbine extends MTEEnhancedMultiBlockBase<MTELargeTurbine>
+    implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbine>> STRUCTURE_DEFINITION = new ClassValue<>() {
+    private static final ClassValue<IStructureDefinition<MTELargeTurbine>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
-        protected IStructureDefinition<GT_MetaTileEntity_LargeTurbine> computeValue(Class<?> type) {
-            return StructureDefinition.<GT_MetaTileEntity_LargeTurbine>builder()
+        protected IStructureDefinition<MTELargeTurbine> computeValue(Class<?> type) {
+            return StructureDefinition.<MTELargeTurbine>builder()
                 .addShape(
                     STRUCTURE_PIECE_MAIN,
                     transpose(
@@ -77,7 +77,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine
                 .addElement(
                     'h',
                     lazy(
-                        t -> buildHatchAdder(GT_MetaTileEntity_LargeTurbine.class)
+                        t -> buildHatchAdder(MTELargeTurbine.class)
                             .atLeast(Maintenance, InputHatch, OutputHatch, OutputBus, InputBus, Muffler)
                             .casingIndex(t.getCasingTextureIndex())
                             .dot(2)
@@ -101,11 +101,11 @@ public abstract class GT_MetaTileEntity_LargeTurbine
     // so we use a separate field for this
     protected boolean mFormed;
 
-    public GT_MetaTileEntity_LargeTurbine(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbine(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_LargeTurbine(String aName) {
+    public MTELargeTurbine(String aName) {
         super(aName);
     }
 
@@ -115,7 +115,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_LargeTurbine> getStructureDefinition() {
+    public IStructureDefinition<MTELargeTurbine> getStructureDefinition() {
         return STRUCTURE_DEFINITION.get(getClass());
     }
 
@@ -206,7 +206,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine
                         aZ + tDirection.offsetZ));
                 tLighting.setupLighting(tBlock, tX, tY, tZ, tFacing)
                     .setupColor(tFacing, Dyes._NULL.mRGBa);
-                GT_RenderUtil.renderBlockIcon(
+                GTRenderUtil.renderBlockIcon(
                     aRenderer,
                     tBlock,
                     tX + tDirection.offsetX * 0.01,
@@ -259,10 +259,9 @@ public abstract class GT_MetaTileEntity_LargeTurbine
     @NotNull
     public CheckRecipeResult checkProcessing() {
         ItemStack controllerSlot = getControllerSlot();
-        if ((counter & 7) == 0
-            && (controllerSlot == null || !(controllerSlot.getItem() instanceof GT_MetaGenerated_Tool)
-                || controllerSlot.getItemDamage() < 170
-                || controllerSlot.getItemDamage() > 179)) {
+        if ((counter & 7) == 0 && (controllerSlot == null || !(controllerSlot.getItem() instanceof MetaGeneratedTool)
+            || controllerSlot.getItemDamage() < 170
+            || controllerSlot.getItemDamage() > 179)) {
             stopMachine(ShutDownReasonRegistry.NO_TURBINE);
             return CheckRecipeResultRegistry.NO_TURBINE_FOUND;
         }
@@ -276,22 +275,21 @@ public abstract class GT_MetaTileEntity_LargeTurbine
                 || this.getBaseMetaTileEntity()
                     .hasInventoryBeenModified()) {
                 counter = 0;
-                baseEff = GT_Utility.safeInt(
-                    (long) ((5F
-                        + ((GT_MetaGenerated_Tool) controllerSlot.getItem()).getToolCombatDamage(controllerSlot))
+                baseEff = GTUtility.safeInt(
+                    (long) ((5F + ((MetaGeneratedTool) controllerSlot.getItem()).getToolCombatDamage(controllerSlot))
                         * 1000F));
-                optFlow = GT_Utility.safeInt(
+                optFlow = GTUtility.safeInt(
                     (long) Math.max(
                         Float.MIN_NORMAL,
-                        ((GT_MetaGenerated_Tool) controllerSlot.getItem()).getToolStats(controllerSlot)
-                            .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(controllerSlot).mToolSpeed
+                        ((MetaGeneratedTool) controllerSlot.getItem()).getToolStats(controllerSlot)
+                            .getSpeedMultiplier() * MetaGeneratedTool.getPrimaryMaterial(controllerSlot).mToolSpeed
                             * 50));
 
                 overflowMultiplier = getOverflowMultiplier(controllerSlot);
 
-                flowMultipliers[0] = GT_MetaGenerated_Tool.getPrimaryMaterial(controllerSlot).mSteamMultiplier;
-                flowMultipliers[1] = GT_MetaGenerated_Tool.getPrimaryMaterial(controllerSlot).mGasMultiplier;
-                flowMultipliers[2] = GT_MetaGenerated_Tool.getPrimaryMaterial(controllerSlot).mPlasmaMultiplier;
+                flowMultipliers[0] = MetaGeneratedTool.getPrimaryMaterial(controllerSlot).mSteamMultiplier;
+                flowMultipliers[1] = MetaGeneratedTool.getPrimaryMaterial(controllerSlot).mGasMultiplier;
+                flowMultipliers[2] = MetaGeneratedTool.getPrimaryMaterial(controllerSlot).mPlasmaMultiplier;
 
                 if (optFlow <= 0 || baseEff <= 0) {
                     stopMachine(ShutDownReasonRegistry.NONE); // in case the turbine got removed
@@ -311,7 +309,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine
         // 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
             int change = maxChangeAllowed * (difference > 0 ? 1 : -1); // Make the change positive or negative.
@@ -339,7 +337,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine
     // Gets the maximum output that the turbine currently can handle. Going above this will cause the turbine to explode
     public long getMaximumOutput() {
         long aTotal = 0;
-        for (GT_MetaTileEntity_Hatch_Dynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
+        for (MTEHatchDynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
             long aVoltage = aDynamo.maxEUOutput();
             aTotal = aDynamo.maxAmperesOut() * aVoltage;
         }
@@ -348,7 +346,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine
 
     public int getOverflowMultiplier(ItemStack aStack) {
         int aOverflowMultiplier = 0;
-        int toolQualityLevel = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality;
+        int toolQualityLevel = MetaGeneratedTool.getPrimaryMaterial(aStack).mToolQuality;
         if (toolQualityLevel >= 6) {
             aOverflowMultiplier = 3;
         } else if (toolQualityLevel >= 3) {
@@ -366,10 +364,10 @@ public abstract class GT_MetaTileEntity_LargeTurbine
 
     @Override
     public int getMaxEfficiency(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) {
+        if (GTUtility.isStackInvalid(aStack)) {
             return 0;
         }
-        if (aStack.getItem() instanceof GT_MetaGenerated_Tool_01) {
+        if (aStack.getItem() instanceof MetaGeneratedTool01) {
             return 10000;
         }
         return 0;
@@ -383,7 +381,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
         }
 
@@ -399,15 +397,15 @@ public abstract class GT_MetaTileEntity_LargeTurbine
                 + EnumChatFormatting.RESET;
         int tDura = 0;
 
-        if (mInventory[1] != null && mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) {
-            tDura = GT_Utility.safeInt(
-                (long) (100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(mInventory[1])
-                    * (GT_MetaGenerated_Tool.getToolDamage(mInventory[1])) + 1));
+        if (mInventory[1] != null && mInventory[1].getItem() instanceof MetaGeneratedTool01) {
+            tDura = GTUtility.safeInt(
+                (long) (100.0f / MetaGeneratedTool.getToolMaxDamage(mInventory[1])
+                    * (MetaGeneratedTool.getToolDamage(mInventory[1])) + 1));
         }
 
         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()
@@ -417,7 +415,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine
             // 8 Lines available for information panels
             tRunning + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(((long) mEUt * mEfficiency) / 10000)
+                + GTUtility.formatNumbers(((long) mEUt * mEfficiency) / 10000)
                 + EnumChatFormatting.RESET
                 + " EU/t", /* 1 */
             tMaintainance, /* 2 */
@@ -428,16 +426,16 @@ public abstract class GT_MetaTileEntity_LargeTurbine
                 + "%", /* 2 */
             StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(storedEnergy)
+                + GTUtility.formatNumbers(storedEnergy)
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + /* 3 */ EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxEnergy)
+                + GTUtility.formatNumbers(maxEnergy)
                 + EnumChatFormatting.RESET
                 + " EU",
             StatCollector.translateToLocal("GT5U.turbine.flow") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(GT_Utility.safeInt((long) realOptFlow))
+                + GTUtility.formatNumbers(GTUtility.safeInt((long) realOptFlow))
                 + EnumChatFormatting.RESET
                 + " L/t"
                 + /* 4 */ EnumChatFormatting.YELLOW
@@ -447,7 +445,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine
                 + ")", /* 5 */
             StatCollector.translateToLocal("GT5U.turbine.fuel") + ": "
                 + EnumChatFormatting.GOLD
-                + GT_Utility.formatNumbers(storedFluid)
+                + GTUtility.formatNumbers(storedFluid)
                 + EnumChatFormatting.RESET
                 + "L", /* 6 */
             StatCollector.translateToLocal(
@@ -463,7 +461,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine
             .contains("Steam"))
             ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.safeInt((long) realOptFlow)
+                + GTUtility.safeInt((long) realOptFlow)
                 + EnumChatFormatting.RESET
                 + " L/t";
         return ret;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java
index 71dc1c4d15..268bbf5da4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java
@@ -13,25 +13,25 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-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;
 
-public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeTurbine {
+public class MTELargeTurbineGas extends MTELargeTurbine {
 
-    public GT_MetaTileEntity_LargeTurbine_Gas(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbineGas(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_LargeTurbine_Gas(String aName) {
+    public MTELargeTurbineGas(String aName) {
         super(aName);
     }
 
@@ -52,8 +52,8 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
     }
 
     @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 Turbine")
             .addInfo("Controller block for the Large Gas Turbine")
             .addInfo("Needs a Turbine, place inside controller")
@@ -74,7 +74,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
 
     public int getFuelValue(FluidStack aLiquid) {
         if (aLiquid == null) return 0;
-        GT_Recipe tFuel = RecipeMaps.gasTurbineFuels.getBackend()
+        GTRecipe tFuel = RecipeMaps.gasTurbineFuels.getBackend()
             .findFuel(aLiquid);
         if (tFuel != null) return tFuel.mSpecialValue;
         return 0;
@@ -82,7 +82,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeTurbine_Gas(mName);
+        return new MTELargeTurbineGas(mName);
     }
 
     @Override
@@ -102,7 +102,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
 
     @Override
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -122,7 +122,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond;
+        return GTMod.gregtechproxy.mPollutionLargeGasTurbinePerSecond;
     }
 
     @Override
@@ -143,10 +143,10 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
                 // 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 * flowMultipliers[1] / fuelValue));
+            actualOptimalFlow = GTUtility.safeInt((long) (aOptFlow * flowMultipliers[1] / fuelValue));
             this.realOptFlow = actualOptimalFlow;
 
             // Allowed to use up to 450% optimal flow rate, depending on the value of overflowMultiplier.
@@ -158,7 +158,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
             // - 300% if it is 2
             // - 450% if it is 3
             // Variable required outside of loop for multi-hatch scenarios.
-            int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow * (1.5f * overflowMultiplier)));
+            int remainingFlow = GTUtility.safeInt((long) (actualOptimalFlow * (1.5f * overflowMultiplier)));
             int flow = 0;
             int totalFlow = 0;
 
@@ -173,13 +173,13 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
                 }
             }
             if (totalFlow <= 0) return 0;
-            tEU = GT_Utility.safeInt((long) totalFlow * fuelValue);
+            tEU = GTUtility.safeInt((long) totalFlow * fuelValue);
 
             if (totalFlow != actualOptimalFlow) {
                 float efficiency = getOverflowEfficiency(totalFlow, actualOptimalFlow, overflowMultiplier);
                 tEU *= efficiency;
             }
-            tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L);
+            tEU = GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L);
 
             // EU/t output cap to properly tier the LGT against the Advanced LGT, will be implemented in a future dev
             // update
@@ -192,7 +192,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
             // Raising the maximum allowed flow rate to account for the efficiency changes beyond the optimal flow
             // When the max fuel consumption rate was increased, turbines could explode on world load
             if (tEU > getMaximumOutput()) {
-                tEU = GT_Utility.safeInt(getMaximumOutput());
+                tEU = GTUtility.safeInt(getMaximumOutput());
             }
             return tEU;
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java
index 4926655476..5b983ddc1b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java
@@ -13,25 +13,25 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-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;
 
-public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntity_LargeTurbine {
+public class MTELargeTurbineGasAdvanced extends MTELargeTurbine {
 
-    public GT_MetaTileEntity_LargeTurbine_GasAdvanced(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbineGasAdvanced(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_LargeTurbine_GasAdvanced(String aName) {
+    public MTELargeTurbineGasAdvanced(String aName) {
         super(aName);
     }
 
@@ -52,8 +52,8 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit
     }
 
     @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 Turbine")
             .addInfo("Warning: This is an experimental multiblock, subject to changes ")
             .addInfo("Controller block for the Large Advanced Gas Turbine")
@@ -75,7 +75,7 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit
 
     public int getFuelValue(FluidStack aLiquid) {
         if (aLiquid == null) return 0;
-        GT_Recipe tFuel = RecipeMaps.gasTurbineFuels.getBackend()
+        GTRecipe tFuel = RecipeMaps.gasTurbineFuels.getBackend()
             .findFuel(aLiquid);
         if (tFuel != null) return tFuel.mSpecialValue;
         return 0;
@@ -83,7 +83,7 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeTurbine_GasAdvanced(mName);
+        return new MTELargeTurbineGasAdvanced(mName);
     }
 
     @Override
@@ -103,7 +103,7 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit
 
     @Override
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings8;
+        return GregTechAPI.sBlockCasings8;
     }
 
     @Override
@@ -123,7 +123,7 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond;
+        return GTMod.gregtechproxy.mPollutionLargeGasTurbinePerSecond;
     }
 
     @Override
@@ -148,10 +148,10 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit
                 // 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 * flowMultipliers[1] / fuelValue));
+            actualOptimalFlow = GTUtility.safeInt((long) (aOptFlow * flowMultipliers[1] / fuelValue));
             this.realOptFlow = actualOptimalFlow;
 
             // Allowed to use up to 450% optimal flow rate, depending on the value of overflowMultiplier.
@@ -163,7 +163,7 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit
             // - 300% if it is 2
             // - 450% if it is 3
             // Variable required outside of loop for multi-hatch scenarios.
-            int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow * (1.5f * overflowMultiplier)));
+            int remainingFlow = GTUtility.safeInt((long) (actualOptimalFlow * (1.5f * overflowMultiplier)));
             int flow = 0;
             int totalFlow = 0;
 
@@ -178,20 +178,20 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit
                 }
             }
             if (totalFlow <= 0) return 0;
-            tEU = GT_Utility.safeInt((long) totalFlow * fuelValue);
+            tEU = GTUtility.safeInt((long) totalFlow * fuelValue);
 
             if (totalFlow != actualOptimalFlow) {
                 float efficiency = getOverflowEfficiency(totalFlow, actualOptimalFlow, overflowMultiplier);
                 tEU *= efficiency;
             }
-            tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L);
+            tEU = GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L);
 
             // If next output is above the maximum the dynamo can handle, set it to the maximum instead of exploding the
             // turbine
             // Raising the maximum allowed flow rate to account for the efficiency changes beyond the optimal flow
             // When the max fuel consumption rate was increased, turbines could explode on world load
             if (tEU > getMaximumOutput()) {
-                tEU = GT_Utility.safeInt(getMaximumOutput());
+                tEU = GTUtility.safeInt(getMaximumOutput());
             }
             return tEU;
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java
index d61e75eac3..e0f3669d39 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java
@@ -6,7 +6,7 @@ import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_NEW_EMPTY5;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
-import static gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Steam.calculateLooseFlow;
+import static gregtech.common.tileentities.machines.multi.MTELargeTurbineSteam.calculateLooseFlow;
 
 import java.util.ArrayList;
 
@@ -17,26 +17,26 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 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_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_LargeTurbine {
+public class MTELargeTurbineHPSteam extends MTELargeTurbine {
 
     public boolean achievement = false;
     private boolean looseFit = false;
 
-    public GT_MetaTileEntity_LargeTurbine_HPSteam(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbineHPSteam(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_LargeTurbine_HPSteam(String aName) {
+    public MTELargeTurbineHPSteam(String aName) {
         super(aName);
     }
 
@@ -57,8 +57,8 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
     }
 
     @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("Steam Turbine")
             .addInfo("Controller block for the Large High Pressure Steam Turbine")
             .addInfo("Needs a Turbine, place inside controller")
@@ -79,12 +79,12 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeTurbine_HPSteam(mName);
+        return new MTELargeTurbineHPSteam(mName);
     }
 
     @Override
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -107,8 +107,8 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
         float[] flowMultipliers) {
         if (looseFit) {
             float[] calculatedFlow = calculateLooseFlow(aOptFlow, aBaseEff);
-            aOptFlow = GT_Utility.safeInt((long) calculatedFlow[0]);
-            aBaseEff = GT_Utility.safeInt((long) calculatedFlow[1]);
+            aOptFlow = GTUtility.safeInt((long) calculatedFlow[0]);
+            aBaseEff = GTUtility.safeInt((long) calculatedFlow[1]);
         }
         int tEU = 0;
         int totalFlow = 0; // Byproducts are based on actual flow
@@ -124,12 +124,12 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
         // - 300% if it is 3
         // Variable required outside of loop for multi-hatch scenarios.
         this.realOptFlow = aOptFlow * flowMultipliers[0];
-        int remainingFlow = GT_Utility.safeInt((long) (realOptFlow * (0.5f * overflowMultiplier + 1.5)));
+        int remainingFlow = GTUtility.safeInt((long) (realOptFlow * (0.5f * overflowMultiplier + 1.5)));
 
         storedFluid = 0;
         for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) {
             final FluidStack aFluidStack = aFluids.get(i);
-            if (GT_ModHandler.isSuperHeatedSteam(aFluidStack)) {
+            if (GTModHandler.isSuperHeatedSteam(aFluidStack)) {
                 flow = Math.min(aFluidStack.amount, remainingFlow); // try to use up to the max flow defined just above
                 depleteInput(new FluidStack(aFluidStack, flow)); // deplete that amount
                 this.storedFluid += aFluidStack.amount;
@@ -137,7 +137,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
                 totalFlow += flow; // track total input used
                 if (!achievement) {
                     try {
-                        GT_Mod.achievements.issueAchievement(
+                        GTMod.achievements.issueAchievement(
                             this.getBaseMetaTileEntity()
                                 .getWorld()
                                 .getPlayerEntityByName(
@@ -147,22 +147,22 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
                     } catch (Exception ignored) {}
                     achievement = true;
                 }
-            } else if (GT_ModHandler.isAnySteam(aFluidStack)) {
+            } else if (GTModHandler.isAnySteam(aFluidStack)) {
                 depleteInput(new FluidStack(aFluidStack, aFluidStack.amount));
             }
         }
         if (totalFlow <= 0) return 0;
         tEU = totalFlow;
-        addOutput(GT_ModHandler.getSteam(totalFlow));
-        if (totalFlow == (GT_Utility.safeInt((long) realOptFlow))) {
-            tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L);
+        addOutput(GTModHandler.getSteam(totalFlow));
+        if (totalFlow == (GTUtility.safeInt((long) realOptFlow))) {
+            tEU = GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L);
         } else {
             float efficiency = getOverflowEfficiency(
                 totalFlow,
-                (GT_Utility.safeInt((long) realOptFlow)),
+                (GTUtility.safeInt((long) realOptFlow)),
                 overflowMultiplier);
             tEU *= efficiency;
-            tEU = Math.max(1, GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L));
+            tEU = Math.max(1, GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L));
         }
 
         // If next output is above the maximum the dynamo can handle, set it to the maximum instead of exploding the
@@ -170,7 +170,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
         // Raising the maximum allowed flow rate to account for the efficiency changes beyond the optimal flow rate can
         // explode turbines on world load
         if (tEU > getMaximumOutput()) {
-            tEU = GT_Utility.safeInt(getMaximumOutput());
+            tEU = GTUtility.safeInt(getMaximumOutput());
         }
 
         return tEU;
@@ -200,10 +200,10 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
     public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (side == getBaseMetaTileEntity().getFrontFacing()) {
             looseFit ^= true;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
-                looseFit ? GT_Utility.trans("500", "Fitting: Loose - More Flow")
-                    : GT_Utility.trans("501", "Fitting: Tight - More Efficiency"));
+                looseFit ? GTUtility.trans("500", "Fitting: Loose - More Flow")
+                    : GTUtility.trans("501", "Fitting: Tight - More Efficiency"));
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java
index 2ecc79cd3b..667d52a4cd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java
@@ -5,7 +5,7 @@ import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_NEW_ACTIVE5;
 import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_NEW_EMPTY5;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 
@@ -19,31 +19,31 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.jetbrains.annotations.NotNull;
 
-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.items.GT_MetaGenerated_Tool;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 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.render.TextureFactory;
-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.api.util.shutdown.ShutDownReasonRegistry;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.common.items.MetaGeneratedTool01;
 
-public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_LargeTurbine {
+public class MTELargeTurbinePlasma extends MTELargeTurbine {
 
-    public GT_MetaTileEntity_LargeTurbine_Plasma(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbinePlasma(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_LargeTurbine_Plasma(String aName) {
+    public MTELargeTurbinePlasma(String aName) {
         super(aName);
     }
 
@@ -64,8 +64,8 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
     }
 
     @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("Plasma Turbine")
             .addInfo("Controller block for the Large Plasma Generator")
             .addInfo("Needs a Turbine, place inside controller")
@@ -84,7 +84,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
 
     public int getFuelValue(FluidStack aLiquid) {
         if (aLiquid == null) return 0;
-        GT_Recipe tFuel = RecipeMaps.plasmaFuels.getBackend()
+        GTRecipe tFuel = RecipeMaps.plasmaFuels.getBackend()
             .findFuel(aLiquid);
         if (tFuel != null) return tFuel.mSpecialValue;
         return 0;
@@ -92,7 +92,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeTurbine_Plasma(mName);
+        return new MTELargeTurbinePlasma(mName);
     }
 
     @Override
@@ -112,7 +112,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
 
     @Override
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -142,7 +142,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
             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 * flowMultipliers[2] / (double) fuelValue));
             this.realOptFlow = actualOptimalFlow; // For scanner info
 
@@ -155,7 +155,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
             // - 400% if it is 2
             // - 550% if it is 3
             // Variable required outside of loop for multi-hatch scenarios.
-            int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow * (1.5f * overflowMultiplier + 1)));
+            int remainingFlow = GTUtility.safeInt((long) (actualOptimalFlow * (1.5f * overflowMultiplier + 1)));
             int flow = 0;
             int totalFlow = 0;
 
@@ -182,7 +182,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
                 }
             }
             if (totalFlow <= 0) return 0;
-            tEU = GT_Utility.safeInt((long) ((fuelValue / 20D) * (double) totalFlow));
+            tEU = GTUtility.safeInt((long) ((fuelValue / 20D) * (double) totalFlow));
 
             // GT_FML_LOGGER.info(totalFlow+" : "+fuelValue+" : "+aOptFlow+" : "+actualOptimalFlow+" : "+tEU);
 
@@ -190,14 +190,14 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
                 float efficiency = getOverflowEfficiency(totalFlow, actualOptimalFlow, overflowMultiplier);
                 tEU = (int) (tEU * efficiency);
             }
-            tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU));
+            tEU = GTUtility.safeInt((long) (aBaseEff / 10000D * tEU));
 
             // If next output is above the maximum the dynamo can handle, set it to the maximum instead of exploding the
             // turbine
             // Raising the maximum allowed flow rate to account for the efficiency changes beyond the optimal flow rate
             // can explode turbines on world load
             if (tEU > getMaximumOutput()) {
-                tEU = GT_Utility.safeInt(getMaximumOutput());
+                tEU = GTUtility.safeInt(getMaximumOutput());
             }
 
             return tEU;
@@ -228,10 +228,9 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
     @NotNull
     public CheckRecipeResult checkProcessing() {
         ItemStack controllerSlot = getControllerSlot();
-        if ((counter & 7) == 0
-            && (controllerSlot == null || !(controllerSlot.getItem() instanceof GT_MetaGenerated_Tool)
-                || controllerSlot.getItemDamage() < 170
-                || controllerSlot.getItemDamage() > 179)) {
+        if ((counter & 7) == 0 && (controllerSlot == null || !(controllerSlot.getItem() instanceof MetaGeneratedTool)
+            || controllerSlot.getItemDamage() < 170
+            || controllerSlot.getItemDamage() > 179)) {
             stopMachine(ShutDownReasonRegistry.NO_TURBINE);
             return CheckRecipeResultRegistry.NO_TURBINE_FOUND;
         }
@@ -244,21 +243,20 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
                 || this.getBaseMetaTileEntity()
                     .hasInventoryBeenModified()) {
                 counter = 0;
-                baseEff = GT_Utility.safeInt(
-                    (long) ((5F
-                        + ((GT_MetaGenerated_Tool) controllerSlot.getItem()).getToolCombatDamage(controllerSlot))
+                baseEff = GTUtility.safeInt(
+                    (long) ((5F + ((MetaGeneratedTool) controllerSlot.getItem()).getToolCombatDamage(controllerSlot))
                         * 1000F));
-                optFlow = GT_Utility.safeInt(
+                optFlow = GTUtility.safeInt(
                     (long) Math.max(
                         Float.MIN_NORMAL,
-                        ((GT_MetaGenerated_Tool) controllerSlot.getItem()).getToolStats(controllerSlot)
-                            .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(controllerSlot).mToolSpeed
+                        ((MetaGeneratedTool) controllerSlot.getItem()).getToolStats(controllerSlot)
+                            .getSpeedMultiplier() * MetaGeneratedTool.getPrimaryMaterial(controllerSlot).mToolSpeed
                             * 50));
                 overflowMultiplier = getOverflowMultiplier(controllerSlot);
 
-                flowMultipliers[0] = GT_MetaGenerated_Tool.getPrimaryMaterial(controllerSlot).mSteamMultiplier;
-                flowMultipliers[1] = GT_MetaGenerated_Tool.getPrimaryMaterial(controllerSlot).mGasMultiplier;
-                flowMultipliers[2] = GT_MetaGenerated_Tool.getPrimaryMaterial(controllerSlot).mPlasmaMultiplier;
+                flowMultipliers[0] = MetaGeneratedTool.getPrimaryMaterial(controllerSlot).mSteamMultiplier;
+                flowMultipliers[1] = MetaGeneratedTool.getPrimaryMaterial(controllerSlot).mGasMultiplier;
+                flowMultipliers[2] = MetaGeneratedTool.getPrimaryMaterial(controllerSlot).mPlasmaMultiplier;
 
                 if (optFlow <= 0 || baseEff <= 0) {
                     stopMachine(ShutDownReasonRegistry.NONE); // in case the turbine got removed
@@ -279,7 +277,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
         // 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(200, GT_Utility.safeInt((long) Math.abs(difference) / 5));
+        int maxChangeAllowed = Math.max(200, GTUtility.safeInt((long) Math.abs(difference) / 5));
 
         if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed change
             int change = maxChangeAllowed * (difference > 0 ? 1 : -1); // Make the change positive or negative.
@@ -303,7 +301,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
         }
 
@@ -319,15 +317,15 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
                 + EnumChatFormatting.RESET;
         int tDura = 0;
 
-        if (mInventory[1] != null && mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) {
-            tDura = GT_Utility.safeInt(
-                (long) (100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(mInventory[1])
-                    * (GT_MetaGenerated_Tool.getToolDamage(mInventory[1])) + 1));
+        if (mInventory[1] != null && mInventory[1].getItem() instanceof MetaGeneratedTool01) {
+            tDura = GTUtility.safeInt(
+                (long) (100.0f / MetaGeneratedTool.getToolMaxDamage(mInventory[1])
+                    * (MetaGeneratedTool.getToolDamage(mInventory[1])) + 1));
         }
 
         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()
@@ -337,7 +335,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
             // 8 Lines available for information panels
             tRunning + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(((long) mEUt * mEfficiency) / 10000)
+                + GTUtility.formatNumbers(((long) mEUt * mEfficiency) / 10000)
                 + EnumChatFormatting.RESET
                 + " EU/t", /* 1 */
             tMaintainance, /* 2 */
@@ -348,16 +346,16 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
                 + "%", /* 2 */
             StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(storedEnergy)
+                + GTUtility.formatNumbers(storedEnergy)
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + /* 3 */ EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxEnergy)
+                + GTUtility.formatNumbers(maxEnergy)
                 + EnumChatFormatting.RESET
                 + " EU",
             StatCollector.translateToLocal("GT5U.turbine.flow") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(GT_Utility.safeInt((long) realOptFlow))
+                + GTUtility.formatNumbers(GTUtility.safeInt((long) realOptFlow))
                 + EnumChatFormatting.RESET
                 + " L/s"
                 + /* 4 */ EnumChatFormatting.YELLOW
@@ -367,7 +365,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
                 + ")", /* 5 */
             StatCollector.translateToLocal("GT5U.turbine.fuel") + ": "
                 + EnumChatFormatting.GOLD
-                + GT_Utility.formatNumbers(storedFluid)
+                + GTUtility.formatNumbers(storedFluid)
                 + EnumChatFormatting.RESET
                 + "L", /* 6 */
             StatCollector.translateToLocal(
@@ -383,7 +381,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
             .contains("Steam"))
             ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.safeInt((long) realOptFlow)
+                + GTUtility.safeInt((long) realOptFlow)
                 + EnumChatFormatting.RESET
                 + " L/s";
         return ret;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java
index 849d0af462..b017862fa8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.multi;
 
-import static gregtech.api.enums.GT_Values.STEAM_PER_WATER;
+import static gregtech.api.enums.GTValues.STEAM_PER_WATER;
 import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_NEW5;
 import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_NEW_ACTIVE5;
 import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_NEW_EMPTY5;
@@ -17,27 +17,27 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 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_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_LargeTurbine {
+public class MTELargeTurbineSteam extends MTELargeTurbine {
 
     private int excessWater;
     private boolean achievement = false;
     private boolean looseFit = false;
 
-    public GT_MetaTileEntity_LargeTurbine_Steam(int aID, String aName, String aNameRegional) {
+    public MTELargeTurbineSteam(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_LargeTurbine_Steam(String aName) {
+    public MTELargeTurbineSteam(String aName) {
         super(aName);
     }
 
@@ -58,8 +58,8 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
     }
 
     @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("Steam Turbine")
             .addInfo("Controller block for the Large Steam Turbine")
             .addInfo("Needs a Turbine, place inside controller")
@@ -80,12 +80,12 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LargeTurbine_Steam(mName);
+        return new MTELargeTurbineSteam(mName);
     }
 
     @Override
     public Block getCasingBlock() {
-        return GregTech_API.sBlockCasings4;
+        return GregTechAPI.sBlockCasings4;
     }
 
     @Override
@@ -115,8 +115,8 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
         float[] flowMultipliers) {
         if (looseFit) {
             float[] calculatedFlow = calculateLooseFlow(aOptFlow, aBaseEff);
-            aOptFlow = GT_Utility.safeInt((long) calculatedFlow[0]);
-            aBaseEff = GT_Utility.safeInt((long) calculatedFlow[1]);
+            aOptFlow = GTUtility.safeInt((long) calculatedFlow[0]);
+            aBaseEff = GTUtility.safeInt((long) calculatedFlow[1]);
         }
         int tEU = 0;
         int totalFlow = 0; // Byproducts are based on actual flow
@@ -132,20 +132,20 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
         // - 250% if it is 3
         // Variable required outside of loop for multi-hatch scenarios.
         this.realOptFlow = aOptFlow * flowMultipliers[0];
-        int remainingFlow = GT_Utility.safeInt((long) (realOptFlow * (0.5f * overflowMultiplier + 1)));
+        int remainingFlow = GTUtility.safeInt((long) (realOptFlow * (0.5f * overflowMultiplier + 1)));
 
         storedFluid = 0;
         for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { // loop through each hatch; extract inputs and
                                                                         // track totals.
             final FluidStack aFluidStack = aFluids.get(i);
-            if (GT_ModHandler.isAnySteam(aFluidStack)) {
+            if (GTModHandler.isAnySteam(aFluidStack)) {
                 flow = Math.min(aFluidStack.amount, remainingFlow); // try to use up to the max flow defined just above
                 depleteInput(new FluidStack(aFluidStack, flow)); // deplete that amount
                 this.storedFluid += aFluidStack.amount;
                 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(
@@ -154,23 +154,23 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
                         "muchsteam");
                     achievement = true;
                 }
-            } else if (GT_ModHandler.isSuperHeatedSteam(aFluidStack)) {
+            } else if (GTModHandler.isSuperHeatedSteam(aFluidStack)) {
                 depleteInput(new FluidStack(aFluidStack, aFluidStack.amount));
             }
         }
         if (totalFlow <= 0) return 0;
         tEU = totalFlow;
         int waterToOutput = condenseSteam(totalFlow);
-        addOutput(GT_ModHandler.getDistilledWater(waterToOutput));
-        if (totalFlow == (GT_Utility.safeInt((long) realOptFlow))) {
-            tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 20000L);
+        addOutput(GTModHandler.getDistilledWater(waterToOutput));
+        if (totalFlow == (GTUtility.safeInt((long) realOptFlow))) {
+            tEU = GTUtility.safeInt((long) tEU * (long) aBaseEff / 20000L);
         } else {
             float efficiency = getOverflowEfficiency(
                 totalFlow,
-                (GT_Utility.safeInt((long) realOptFlow)),
+                (GTUtility.safeInt((long) realOptFlow)),
                 overflowMultiplier);
             tEU *= efficiency;
-            tEU = Math.max(1, GT_Utility.safeInt((long) tEU * (long) aBaseEff / 20000L));
+            tEU = Math.max(1, GTUtility.safeInt((long) tEU * (long) aBaseEff / 20000L));
         }
 
         // If next output is above the maximum the dynamo can handle, set it to the maximum instead of exploding the
@@ -178,7 +178,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
         // Raising the maximum allowed flow rate to account for the efficiency changes beyond the optimal flow rate can
         // explode turbines on world load
         if (tEU > getMaximumOutput()) {
-            tEU = GT_Utility.safeInt(getMaximumOutput());
+            tEU = GTUtility.safeInt(getMaximumOutput());
         }
 
         return tEU;
@@ -241,10 +241,10 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
     public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (side == getBaseMetaTileEntity().getFrontFacing()) {
             looseFit ^= true;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
-                looseFit ? GT_Utility.trans("500", "Fitting: Loose - More Flow")
-                    : GT_Utility.trans("501", "Fitting: Tight - More Efficiency"));
+                looseFit ? GTUtility.trans("500", "Fitting: Loose - More Flow")
+                    : GTUtility.trans("501", "Fitting: Tight - More Efficiency"));
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiAutoclave.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java
index fdb34b6d25..5d10d55277 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiAutoclave.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java
@@ -5,21 +5,21 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksT
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel;
-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.GT_Values.AuthorVolence;
+import static gregtech.api.enums.GTValues.AuthorVolence;
+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.Textures.BlockIcons.OVERLAY_FRONT_MULTI_AUTOCLAVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_AUTOCLAVE_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofCoil;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.text.DecimalFormat;
 import java.util.List;
@@ -44,7 +44,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.HeatingCoilLevel;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
@@ -52,26 +52,26 @@ 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.MTEExtendedPowerMultiBlockBase;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Casings10;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.blocks.BlockCasings10;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_MultiAutoclave extends
-    GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_MultiAutoclave> implements ISurvivalConstructable {
+public class MTEMultiAutoclave extends MTEExtendedPowerMultiBlockBase<MTEMultiAutoclave>
+    implements ISurvivalConstructable {
 
-    public GT_MetaTileEntity_MultiAutoclave(final int aID, final String aName, final String aNameRegional) {
+    public MTEMultiAutoclave(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_MultiAutoclave(String aName) {
+    public MTEMultiAutoclave(String aName) {
         super(aName);
     }
 
@@ -83,7 +83,7 @@ public class GT_MetaTileEntity_MultiAutoclave extends
     protected int fluidPipeTier = 0;
 
     private static Integer getItemPipeTierFromMeta(Block block, Integer metaID) {
-        if (block != GregTech_API.sBlockCasings11) return -1;
+        if (block != GregTechAPI.sBlockCasings11) return -1;
         if (metaID < 0 || metaID > 7) return -1;
         return metaID + 1;
     }
@@ -97,7 +97,7 @@ public class GT_MetaTileEntity_MultiAutoclave extends
     }
 
     private static Integer getFluidTierFromMeta(Block block, Integer metaID) {
-        if (block != GregTech_API.sBlockCasings2) return -1;
+        if (block != GregTechAPI.sBlockCasings2) return -1;
         if (metaID < 12 || metaID > 15) return -1;
         return metaID - 11;
     }
@@ -123,8 +123,8 @@ public class GT_MetaTileEntity_MultiAutoclave extends
             .getTier() + 1;
     }
 
-    private static final IStructureDefinition<GT_MetaTileEntity_MultiAutoclave> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_MultiAutoclave>builder()
+    private static final IStructureDefinition<MTEMultiAutoclave> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEMultiAutoclave>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(
@@ -145,59 +145,53 @@ public class GT_MetaTileEntity_MultiAutoclave extends
                         "A AAA A" } }))
         .addElement(
             'A',
-            buildHatchAdder(GT_MetaTileEntity_MultiAutoclave.class)
+            buildHatchAdder(MTEMultiAutoclave.class)
                 .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Muffler, Energy)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(3))
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(3))
                 .dot(1)
                 .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_MultiAutoclave::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings10, 3))))
+                    onElementPass(MTEMultiAutoclave::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings10, 3))))
         .addElement('B', Glasses.chainAllGlasses()) // Steel Casings
         .addElement('C', ofFrame(Materials.Polytetrafluoroethylene)) // PTFE Frame
         .addElement(
             'D',
             ofBlocksTiered(
-                GT_MetaTileEntity_MultiAutoclave::getFluidTierFromMeta,
+                MTEMultiAutoclave::getFluidTierFromMeta,
                 ImmutableList.of(
-                    Pair.of(GregTech_API.sBlockCasings2, 12),
-                    Pair.of(GregTech_API.sBlockCasings2, 13),
-                    Pair.of(GregTech_API.sBlockCasings2, 14),
-                    Pair.of(GregTech_API.sBlockCasings2, 15)),
+                    Pair.of(GregTechAPI.sBlockCasings2, 12),
+                    Pair.of(GregTechAPI.sBlockCasings2, 13),
+                    Pair.of(GregTechAPI.sBlockCasings2, 14),
+                    Pair.of(GregTechAPI.sBlockCasings2, 15)),
                 -2,
-                GT_MetaTileEntity_MultiAutoclave::setFluidPipeTier,
-                GT_MetaTileEntity_MultiAutoclave::getFluidPipeTier))
+                MTEMultiAutoclave::setFluidPipeTier,
+                MTEMultiAutoclave::getFluidPipeTier))
         .addElement(
             'E',
             ofBlocksTiered(
-                GT_MetaTileEntity_MultiAutoclave::getItemPipeTierFromMeta,
+                MTEMultiAutoclave::getItemPipeTierFromMeta,
                 ImmutableList.of(
-                    Pair.of(GregTech_API.sBlockCasings11, 0),
-                    Pair.of(GregTech_API.sBlockCasings11, 1),
-                    Pair.of(GregTech_API.sBlockCasings11, 2),
-                    Pair.of(GregTech_API.sBlockCasings11, 3),
-                    Pair.of(GregTech_API.sBlockCasings11, 4),
-                    Pair.of(GregTech_API.sBlockCasings11, 5),
-                    Pair.of(GregTech_API.sBlockCasings11, 6),
-                    Pair.of(GregTech_API.sBlockCasings11, 7)),
+                    Pair.of(GregTechAPI.sBlockCasings11, 0),
+                    Pair.of(GregTechAPI.sBlockCasings11, 1),
+                    Pair.of(GregTechAPI.sBlockCasings11, 2),
+                    Pair.of(GregTechAPI.sBlockCasings11, 3),
+                    Pair.of(GregTechAPI.sBlockCasings11, 4),
+                    Pair.of(GregTechAPI.sBlockCasings11, 5),
+                    Pair.of(GregTechAPI.sBlockCasings11, 6),
+                    Pair.of(GregTechAPI.sBlockCasings11, 7)),
                 -2,
-                GT_MetaTileEntity_MultiAutoclave::setItemPipeTier,
-                GT_MetaTileEntity_MultiAutoclave::getItemPipeTier))
-        .addElement(
-            'F',
-            withChannel(
-                "coil",
-                ofCoil(GT_MetaTileEntity_MultiAutoclave::setCoilLevel, GT_MetaTileEntity_MultiAutoclave::getCoilLevel)))
+                MTEMultiAutoclave::setItemPipeTier,
+                MTEMultiAutoclave::getItemPipeTier))
+        .addElement('F', withChannel("coil", ofCoil(MTEMultiAutoclave::setCoilLevel, MTEMultiAutoclave::getCoilLevel)))
         .build();
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_MultiAutoclave> getStructureDefinition() {
+    public IStructureDefinition<MTEMultiAutoclave> 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("Autoclave")
             .addInfo("Controller Block for the Industrial Autoclave.")
             .addInfo("Gains 12 parallels per item pipe casing tier.")
@@ -252,7 +246,7 @@ public class GT_MetaTileEntity_MultiAutoclave extends
             if (aActive) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 3)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 3)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_AUTOCLAVE_ACTIVE)
                         .extFacing()
@@ -265,7 +259,7 @@ public class GT_MetaTileEntity_MultiAutoclave extends
             } else {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 3)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 3)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_AUTOCLAVE)
                         .extFacing()
@@ -278,7 +272,7 @@ public class GT_MetaTileEntity_MultiAutoclave extends
             }
         } else {
             rTexture = new ITexture[] { Textures.BlockIcons
-                .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 3)) };
+                .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 3)) };
         }
         return rTexture;
     }
@@ -302,7 +296,7 @@ public class GT_MetaTileEntity_MultiAutoclave extends
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_MultiAutoclave(this.mName);
+        return new MTEMultiAutoclave(this.mName);
     }
 
     public float euModifier(int fluidPipeTier) {
@@ -419,7 +413,7 @@ public class GT_MetaTileEntity_MultiAutoclave extends
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+        logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
         logic.setAvailableAmperage(1L);
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java
index a622f8db2c..3af4b17e29 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java
@@ -1,13 +1,13 @@
 package gregtech.common.tileentities.machines.multi;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.enums.GT_HatchElement.*;
-import static gregtech.api.enums.GT_Values.AuthorFourIsTheNumber;
+import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber;
+import static gregtech.api.enums.HatchElement.*;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_CANNER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_CANNER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_CANNER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_CANNER_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -30,33 +30,32 @@ 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.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_ExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Casings2;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.blocks.BlockCasings2;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_MultiCanner extends
-    GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_MultiCanner> implements ISurvivalConstructable {
+public class MTEMultiCanner extends MTEExtendedPowerMultiBlockBase<MTEMultiCanner> implements ISurvivalConstructable {
 
     private static final int MACHINEMODE_CANNER = 0;
     private static final int MACHINEMODE_FLUIDCANNER = 1;
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_MultiCanner> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_MultiCanner>builder()
+    private static final IStructureDefinition<MTEMultiCanner> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEMultiCanner>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             (transpose(
@@ -67,27 +66,24 @@ public class GT_MetaTileEntity_MultiCanner extends
                     { "  AAA  ", " AAAAA ", "AAAAAAA", "AAAAAAA", "AAAAAAA", " AAAAA ", "  AAA  " } })))
         .addElement(
             'A',
-            buildHatchAdder(GT_MetaTileEntity_MultiCanner.class)
+            buildHatchAdder(MTEMultiCanner.class)
                 .atLeast(InputBus, OutputBus, Maintenance, Energy, InputHatch, OutputHatch)
-                .casingIndex(((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0))
+                .casingIndex(((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0))
                 .dot(1)
-                .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_MultiCanner::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings2, 0))))
-        .addElement('B', ofBlock(GregTech_API.sBlockCasings2, 13))
+                .buildAndChain(onElementPass(MTEMultiCanner::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings2, 0))))
+        .addElement('B', ofBlock(GregTechAPI.sBlockCasings2, 13))
         .build();
 
-    public GT_MetaTileEntity_MultiCanner(final int aID, final String aName, final String aNameRegional) {
+    public MTEMultiCanner(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_MultiCanner(String aName) {
+    public MTEMultiCanner(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_MultiCanner> getStructureDefinition() {
+    public IStructureDefinition<MTEMultiCanner> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -98,7 +94,7 @@ public class GT_MetaTileEntity_MultiCanner extends
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_MultiCanner(this.mName);
+        return new MTEMultiCanner(this.mName);
     }
 
     @Override
@@ -109,7 +105,7 @@ public class GT_MetaTileEntity_MultiCanner extends
             if (aActive) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings2, 0)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings2, 0)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_CANNER_ACTIVE)
                         .extFacing()
@@ -122,7 +118,7 @@ public class GT_MetaTileEntity_MultiCanner extends
             } else {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings2, 0)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings2, 0)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_CANNER)
                         .extFacing()
@@ -135,14 +131,14 @@ public class GT_MetaTileEntity_MultiCanner extends
             }
         } else {
             rTexture = new ITexture[] { Textures.BlockIcons
-                .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings2, 0)) };
+                .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings2, 0)) };
         }
         return rTexture;
     }
 
     @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("Canner/Fluid Canner")
             .addInfo("Controller Block for the TurboCan Pro")
             .addInfo("Use screwdriver to switch mode")
@@ -201,7 +197,7 @@ public class GT_MetaTileEntity_MultiCanner extends
     }
 
     public int getMaxParallelRecipes() {
-        return (8 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (8 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -243,8 +239,8 @@ public class GT_MetaTileEntity_MultiCanner extends
 
     @Override
     public void setMachineModeIcons() {
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_PACKAGER);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_FLUID);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_PACKAGER);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_FLUID);
     }
 
     @Override
@@ -308,7 +304,7 @@ public class GT_MetaTileEntity_MultiCanner extends
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+        logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
         logic.setAvailableAmperage(1L);
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java
index 5d611b270d..a11ef41dbd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java
@@ -3,18 +3,18 @@ package gregtech.common.tileentities.machines.multi;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 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.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.VN;
+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.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 
@@ -30,27 +30,26 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 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.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
 
-public class GT_MetaTileEntity_MultiFurnace
-    extends GT_MetaTileEntity_AbstractMultiFurnace<GT_MetaTileEntity_MultiFurnace> implements ISurvivalConstructable {
+public class MTEMultiFurnace extends MTEAbstractMultiFurnace<MTEMultiFurnace> implements ISurvivalConstructable {
 
     private int mLevel = 0;
     private int mCostDiscount = 1;
@@ -59,44 +58,41 @@ public class GT_MetaTileEntity_MultiFurnace
     private static final int RECIPE_DURATION = 512;
     private static final int CASING_INDEX = 11;
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_MultiFurnace> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_MultiFurnace>builder()
+    private static final IStructureDefinition<MTEMultiFurnace> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEMultiFurnace>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(new String[][] { { "ccc", "cmc", "ccc" }, { "CCC", "C-C", "CCC" }, { "b~b", "bbb", "bbb" } }))
-        .addElement('c', ofBlock(GregTech_API.sBlockCasings1, CASING_INDEX))
+        .addElement('c', ofBlock(GregTechAPI.sBlockCasings1, CASING_INDEX))
         .addElement('m', Muffler.newAny(CASING_INDEX, 2))
-        .addElement(
-            'C',
-            GT_StructureUtility
-                .ofCoil(GT_MetaTileEntity_MultiFurnace::setCoilLevel, GT_MetaTileEntity_MultiFurnace::getCoilLevel))
+        .addElement('C', GTStructureUtility.ofCoil(MTEMultiFurnace::setCoilLevel, MTEMultiFurnace::getCoilLevel))
         .addElement(
             'b',
             ofChain(
-                GT_StructureUtility.<GT_MetaTileEntity_MultiFurnace>buildHatchAdder()
+                GTStructureUtility.<MTEMultiFurnace>buildHatchAdder()
                     .atLeast(Maintenance, InputBus, OutputBus, Energy)
                     .casingIndex(CASING_INDEX)
                     .dot(1)
                     .build(),
-                ofBlock(GregTech_API.sBlockCasings1, CASING_INDEX)))
+                ofBlock(GregTechAPI.sBlockCasings1, CASING_INDEX)))
         .build();
 
-    public GT_MetaTileEntity_MultiFurnace(int aID, String aName, String aNameRegional) {
+    public MTEMultiFurnace(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_MultiFurnace(String aName) {
+    public MTEMultiFurnace(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_MultiFurnace(this.mName);
+        return new MTEMultiFurnace(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("Furnace")
             .addInfo("Controller Block for the Multi Smelter")
             .addInfo("Smelts up to 8-8192 items at once")
@@ -147,7 +143,7 @@ public class GT_MetaTileEntity_MultiFurnace
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond;
+        return GTMod.gregtechproxy.mPollutionMultiSmelterPerSecond;
     }
 
     @Override
@@ -159,7 +155,7 @@ public class GT_MetaTileEntity_MultiFurnace
         long inputVoltage = getMaxInputVoltage();
 
         int fakeOriginalMaxParallel = 1;
-        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setEUt(inputVoltage)
+        OverclockCalculator calculator = new OverclockCalculator().setEUt(inputVoltage)
             .setRecipeEUt(RECIPE_EUT)
             .setDuration(RECIPE_DURATION)
             .setParallel(fakeOriginalMaxParallel);
@@ -168,18 +164,18 @@ public class GT_MetaTileEntity_MultiFurnace
         int originalMaxParallel = maxParallel;
         double tickTimeAfterOC = calculator.calculateDurationUnderOneTick();
         if (tickTimeAfterOC < 1) {
-            maxParallel = GT_Utility.safeInt((long) (maxParallel / tickTimeAfterOC), 0);
+            maxParallel = GTUtility.safeInt((long) (maxParallel / tickTimeAfterOC), 0);
         }
 
         int maxParallelBeforeBatchMode = maxParallel;
         if (isBatchModeEnabled()) {
-            maxParallel = GT_Utility.safeInt((long) maxParallel * getMaxBatchSize(), 0);
+            maxParallel = GTUtility.safeInt((long) maxParallel * getMaxBatchSize(), 0);
         }
 
         // Calculate parallel
         int currentParallel = 0;
         for (ItemStack item : tInputList) {
-            ItemStack smeltedOutput = GT_ModHandler.getSmeltingOutput(item, false, null);
+            ItemStack smeltedOutput = GTModHandler.getSmeltingOutput(item, false, null);
             if (smeltedOutput != null) {
                 if (item.stackSize <= (maxParallel - currentParallel)) {
                     currentParallel += item.stackSize;
@@ -210,7 +206,7 @@ public class GT_MetaTileEntity_MultiFurnace
         ArrayList<ItemStack> smeltedOutputs = new ArrayList<>();
         int remainingCost = finalParallel;
         for (ItemStack item : tInputList) {
-            ItemStack smeltedOutput = GT_ModHandler.getSmeltingOutput(item, false, null);
+            ItemStack smeltedOutput = GTModHandler.getSmeltingOutput(item, false, null);
             if (smeltedOutput != null) {
                 if (remainingCost >= item.stackSize) {
                     remainingCost -= item.stackSize;
@@ -239,7 +235,7 @@ public class GT_MetaTileEntity_MultiFurnace
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_MultiFurnace> getStructureDefinition() {
+    public IStructureDefinition<MTEMultiFurnace> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -278,21 +274,21 @@ public class GT_MetaTileEntity_MultiFurnace
             if ((xPos == tX) && (zPos == tZ)) continue;
             tUsedMeta = aBaseMetaTileEntity.getMetaID(xPos, tY + 1, zPos);
             if (tUsedMeta >= 12 && tUsedMeta <= 14
-                && aBaseMetaTileEntity.getBlock(xPos, tY + 1, zPos) == GregTech_API.sBlockCasings1)
+                && aBaseMetaTileEntity.getBlock(xPos, tY + 1, zPos) == GregTechAPI.sBlockCasings1)
                 aBaseMetaTileEntity.getWorld()
-                    .setBlock(xPos, tY + 1, zPos, GregTech_API.sBlockCasings5, tUsedMeta - 12, 3);
+                    .setBlock(xPos, tY + 1, zPos, GregTechAPI.sBlockCasings5, tUsedMeta - 12, 3);
         }
     }
 
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (final GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches))
+        for (final MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches))
             mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
 
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (final GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
+        for (final MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -302,36 +298,36 @@ public class GT_MetaTileEntity_MultiFurnace
         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.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(getMaxInputVoltage())
+                + GTUtility.formatNumbers(getMaxInputVoltage())
                 + EnumChatFormatting.RESET
                 + " EU/t(*2A) "
                 + StatCollector.translateToLocal("GT5U.machines.tier")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + VN[GT_Utility.getTier(getMaxInputVoltage())]
+                + VN[GTUtility.getTier(getMaxInputVoltage())]
                 + EnumChatFormatting.RESET,
             StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
                 + EnumChatFormatting.RED
@@ -350,7 +346,7 @@ public class GT_MetaTileEntity_MultiFurnace
                 + EnumChatFormatting.RESET
                 + " Discount: (EU/t) / "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mCostDiscount)
+                + GTUtility.formatNumbers(mCostDiscount)
                 + EnumChatFormatting.RESET,
             StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": "
                 + EnumChatFormatting.GREEN
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiLathe.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java
index dc15d89c70..e0c8e35444 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiLathe.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.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.Maintenance;
-import static gregtech.api.enums.GT_HatchElement.Muffler;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_Values.AuthorVolence;
+import static gregtech.api.enums.GTValues.AuthorVolence;
+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.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_LATHE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_LATHE_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_LATHE_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_LATHE_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.text.DecimalFormat;
 import java.util.List;
@@ -37,32 +37,31 @@ 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.ITexture;
 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_EnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Casings2;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.blocks.BlockCasings2;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_MultiLathe>
-    implements ISurvivalConstructable {
+public class MTEMultiLathe extends MTEEnhancedMultiBlockBase<MTEMultiLathe> implements ISurvivalConstructable {
 
-    public GT_MetaTileEntity_MultiLathe(final int aID, final String aName, final String aNameRegional) {
+    public MTEMultiLathe(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_MultiLathe(String aName) {
+    public MTEMultiLathe(String aName) {
         super(aName);
     }
 
@@ -102,7 +101,7 @@ public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMult
 
     // get tier from block meta
     private static Integer getTierFromMeta(Block block, Integer metaID) {
-        if (block != GregTech_API.sBlockCasings11) return -1;
+        if (block != GregTechAPI.sBlockCasings11) return -1;
         if (metaID < 3 || metaID > 7) return -1;
         return (metaID - 2);
     }
@@ -115,8 +114,8 @@ public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMult
         return pipeTier;
     }
 
-    private static final IStructureDefinition<GT_MetaTileEntity_MultiLathe> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_MultiLathe>builder()
+    private static final IStructureDefinition<MTEMultiLathe> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEMultiLathe>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(new String[][] { { "       " }, { "       " }, { "       " }, { "       " }, { "AAA~AAA" } }))
@@ -134,42 +133,35 @@ public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMult
                     { "DCCCCBD", "DCCCCBD", "DCCCCBD", "       " }, { "AAAAAAA", "AAAAAAA", "AAAAAAA", "AAAAAAA" } })))
         .addElement(
             'A',
-            buildHatchAdder(GT_MetaTileEntity_MultiLathe.class).atLeast(Maintenance, Muffler, Energy)
-                .casingIndex(((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0))
+            buildHatchAdder(MTEMultiLathe.class).atLeast(Maintenance, Muffler, Energy)
+                .casingIndex(((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0))
                 .dot(1)
-                .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_MultiLathe::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings2, 0))))
-        .addElement('B', ofBlock(GregTech_API.sBlockCasings3, 10)) // Steel Casings
+                .buildAndChain(onElementPass(MTEMultiLathe::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings2, 0))))
+        .addElement('B', ofBlock(GregTechAPI.sBlockCasings3, 10)) // Steel Casings
         .addElement('C', Glasses.chainAllGlasses()) // Glass
         .addElement(
             'D',
-            buildHatchAdder(GT_MetaTileEntity_MultiLathe.class)
-                .atLeast(InputBus, OutputBus, Maintenance, Muffler, Energy)
-                .casingIndex(((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0))
+            buildHatchAdder(MTEMultiLathe.class).atLeast(InputBus, OutputBus, Maintenance, Muffler, Energy)
+                .casingIndex(((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0))
                 .dot(1)
-                .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_MultiLathe::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings2, 0))))
+                .buildAndChain(onElementPass(MTEMultiLathe::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings2, 0))))
         .addElement(
             'F',
             ofBlocksTiered(
-                GT_MetaTileEntity_MultiLathe::getTierFromMeta,
+                MTEMultiLathe::getTierFromMeta,
                 ImmutableList.of(
-                    Pair.of(GregTech_API.sBlockCasings11, 3),
-                    Pair.of(GregTech_API.sBlockCasings11, 4),
-                    Pair.of(GregTech_API.sBlockCasings11, 5),
-                    Pair.of(GregTech_API.sBlockCasings11, 6),
-                    Pair.of(GregTech_API.sBlockCasings11, 7)),
+                    Pair.of(GregTechAPI.sBlockCasings11, 3),
+                    Pair.of(GregTechAPI.sBlockCasings11, 4),
+                    Pair.of(GregTechAPI.sBlockCasings11, 5),
+                    Pair.of(GregTechAPI.sBlockCasings11, 6),
+                    Pair.of(GregTechAPI.sBlockCasings11, 7)),
                 -2,
-                GT_MetaTileEntity_MultiLathe::setPipeTier,
-                GT_MetaTileEntity_MultiLathe::getPipeTier))
+                MTEMultiLathe::setPipeTier,
+                MTEMultiLathe::getPipeTier))
         .build();
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_MultiLathe> getStructureDefinition() {
+    public IStructureDefinition<MTEMultiLathe> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -180,7 +172,7 @@ public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMult
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_MultiLathe(this.mName);
+        return new MTEMultiLathe(this.mName);
     }
 
     @Override
@@ -191,7 +183,7 @@ public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMult
             if (aActive) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings2, 0)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings2, 0)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_LATHE_ACTIVE)
                         .extFacing()
@@ -204,7 +196,7 @@ public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMult
             } else {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings2, 0)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings2, 0)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_LATHE)
                         .extFacing()
@@ -217,14 +209,14 @@ public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMult
             }
         } else {
             rTexture = new ITexture[] { Textures.BlockIcons
-                .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings2, 0)) };
+                .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings2, 0)) };
         }
         return rTexture;
     }
 
     @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("Lathe")
             .addInfo("Controller Block for the Industrial Precision Lathe")
             .addInfo("Gains 2 parallels per voltage tier,")
@@ -287,13 +279,13 @@ public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMult
     @Override
     protected ProcessingLogic createProcessingLogic() {
         return new ProcessingLogic()
-            .setSpeedBonus(1F / (getPipeData().speedBoost + GT_Utility.getTier(this.getMaxInputVoltage()) / 4F))
+            .setSpeedBonus(1F / (getPipeData().speedBoost + GTUtility.getTier(this.getMaxInputVoltage()) / 4F))
             .setEuModifier(0.8F)
             .setMaxParallelSupplier(this::getMaxParallelRecipes);
     }
 
     public int getMaxParallelRecipes() {
-        return getPipeData().maxParallel + (GT_Utility.getTier(this.getMaxInputVoltage()) * 2);
+        return getPipeData().maxParallel + (GTUtility.getTier(this.getMaxInputVoltage()) * 2);
     }
 
     @Override
@@ -303,7 +295,7 @@ public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMult
         tag.setInteger("itemPipeTier", Math.max(0, pipeTier));
         tag.setFloat(
             "speedBonus",
-            Math.max(0, 100 / (1F / (getPipeData().speedBoost + GT_Utility.getTier(this.getMaxInputVoltage()) / 4F))));
+            Math.max(0, 100 / (1F / (getPipeData().speedBoost + GTUtility.getTier(this.getMaxInputVoltage()) / 4F))));
         tag.setFloat("getMaxParallelRecipes", Math.max(0, getMaxParallelRecipes()));
     }
 
@@ -371,7 +363,7 @@ public class GT_MetaTileEntity_MultiLathe extends GT_MetaTileEntity_EnhancedMult
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+        logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
         logic.setAvailableAmperage(1L);
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java
index adceabd70c..b6dc31e943 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java
@@ -2,19 +2,19 @@ package gregtech.common.tileentities.machines.multi;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-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_Values.AuthorBlueWeabo;
+import static gregtech.api.enums.GTValues.AuthorBlueWeabo;
+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.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import javax.annotation.Nonnull;
 
@@ -34,7 +34,7 @@ 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.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.Textures.BlockIcons;
@@ -42,26 +42,25 @@ 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.MTEExtendedPowerMultiBlockBase;
 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.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.common.blocks.GT_Block_Casings8;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.OverclockCalculator;
+import gregtech.common.blocks.BlockCasings8;
 
-public class GT_MetaTileEntity_NanoForge extends
-    GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_NanoForge> implements ISurvivalConstructable {
+public class MTENanoForge extends MTEExtendedPowerMultiBlockBase<MTENanoForge> implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
     private static final String STRUCTURE_PIECE_TIER2 = "tier2";
     private static final String STRUCTURE_PIECE_TIER3 = "tier3";
-    private static final IStructureDefinition<GT_MetaTileEntity_NanoForge> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_NanoForge>builder()
+    private static final IStructureDefinition<MTENanoForge> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTENanoForge>builder()
         // spotless:off
                     .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][] {
                         {"         ","         ","    F    ","    C    ","    C    ","    C    ","    C    ","    F    ","         ","         "},
@@ -151,23 +150,23 @@ public class GT_MetaTileEntity_NanoForge extends
                     }))
                     //spotless:on
         .addElement('F', ofFrame(Materials.StellarAlloy))
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings8, 10))
-        .addElement('A', ofBlock(GregTech_API.sBlockCasings2, 5))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings8, 10))
+        .addElement('A', ofBlock(GregTechAPI.sBlockCasings2, 5))
         .addElement(
             'B',
-            buildHatchAdder(GT_MetaTileEntity_NanoForge.class)
+            buildHatchAdder(MTENanoForge.class)
                 .atLeast(InputHatch, OutputBus, InputBus, Maintenance, Energy.or(ExoticEnergy))
                 .dot(1)
-                .casingIndex(((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex(10))
-                .buildAndChain(GregTech_API.sBlockCasings8, 10))
+                .casingIndex(((BlockCasings8) GregTechAPI.sBlockCasings8).getTextureIndex(10))
+                .buildAndChain(GregTechAPI.sBlockCasings8, 10))
         .build();
     private byte mSpecialTier = 0;
 
-    public GT_MetaTileEntity_NanoForge(int aID, String aName, String aNameRegional) {
+    public MTENanoForge(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_NanoForge(String aName) {
+    public MTENanoForge(String aName) {
         super(aName);
     }
 
@@ -189,7 +188,7 @@ public class GT_MetaTileEntity_NanoForge extends
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_NanoForge(this.mName);
+        return new MTENanoForge(this.mName);
     }
 
     @Override
@@ -197,7 +196,7 @@ public class GT_MetaTileEntity_NanoForge extends
         ForgeDirection facingDirection, int colorIndex, boolean active, boolean redstoneLevel) {
         if (sideDirection == facingDirection) {
             if (active) return new ITexture[] {
-                BlockIcons.getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 10)),
+                BlockIcons.getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings8, 10)),
                 TextureFactory.builder()
                     .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE)
                     .extFacing()
@@ -208,7 +207,7 @@ public class GT_MetaTileEntity_NanoForge extends
                     .glow()
                     .build() };
             return new ITexture[] {
-                BlockIcons.getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 10)),
+                BlockIcons.getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings8, 10)),
                 TextureFactory.builder()
                     .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE)
                     .extFacing()
@@ -220,11 +219,11 @@ public class GT_MetaTileEntity_NanoForge extends
                     .build() };
         }
         return new ITexture[] {
-            BlockIcons.getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 10)) };
+            BlockIcons.getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings8, 10)) };
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_NanoForge> getStructureDefinition() {
+    public IStructureDefinition<MTENanoForge> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -238,14 +237,14 @@ public class GT_MetaTileEntity_NanoForge extends
         return new ProcessingLogic() {
 
             @Override
-            protected @Nonnull CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected @Nonnull CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 return recipe.mSpecialValue <= mSpecialTier ? CheckRecipeResultRegistry.SUCCESSFUL
                     : CheckRecipeResultRegistry.NO_RECIPE;
             }
 
             @Nonnull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) {
+            protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) {
                 return super.createOverclockCalculator(recipe)
                     .setDurationDecreasePerOC(mSpecialTier > recipe.mSpecialValue ? 4.0 : 2.0);
             }
@@ -359,8 +358,8 @@ public class GT_MetaTileEntity_NanoForge 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("Nanite Fabricator")
             .addInfo("Controller block for the Nano Forge")
             .addInfo("Requires insane amounts of power to create nanites. Each tier")
@@ -445,7 +444,7 @@ public class GT_MetaTileEntity_NanoForge extends
     @Override
     public final void onScrewdriverRightClick(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/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilCracker.java
index 9ca671aa49..2aac2b5a2e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilCracker.java
@@ -8,9 +8,9 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_A
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
-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.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,99 +29,89 @@ 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.enums.GT_HatchElement;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.HatchElement;
 import gregtech.api.enums.HeatingCoilLevel;
 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_EnhancedMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchMultiInput;
+import gregtech.api.metatileentity.implementations.MTEHatchOutput;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.maps.OilCrackerBackend;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Input_ME;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.tileentities.machines.IRecipeProcessingAwareHatch;
+import gregtech.common.tileentities.machines.MTEHatchInputME;
 
-public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_OilCracker>
-    implements ISurvivalConstructable {
+public class MTEOilCracker extends MTEEnhancedMultiBlockBase<MTEOilCracker> implements ISurvivalConstructable {
 
     private static final byte CASING_INDEX = 49;
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_OilCracker> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_OilCracker>builder()
+    private static final IStructureDefinition<MTEOilCracker> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEOilCracker>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(
                 new String[][] { { "lcmcr", "lcmcr", "lcmcr" }, { "lc~cr", "l---r", "lcmcr" },
                     { "lcmcr", "lcmcr", "lcmcr" }, }))
-        .addElement('c', ofCoil(GT_MetaTileEntity_OilCracker::setCoilLevel, GT_MetaTileEntity_OilCracker::getCoilLevel))
+        .addElement('c', ofCoil(MTEOilCracker::setCoilLevel, MTEOilCracker::getCoilLevel))
         .addElement(
             'l',
-            buildHatchAdder(GT_MetaTileEntity_OilCracker.class)
+            buildHatchAdder(MTEOilCracker.class)
                 .atLeast(
-                    GT_HatchElement.InputHatch.withAdder(GT_MetaTileEntity_OilCracker::addLeftHatchToMachineList),
-                    GT_HatchElement.Energy,
-                    GT_HatchElement.Maintenance)
+                    HatchElement.InputHatch.withAdder(MTEOilCracker::addLeftHatchToMachineList),
+                    HatchElement.Energy,
+                    HatchElement.Maintenance)
                 .dot(2)
                 .casingIndex(CASING_INDEX)
-                .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_OilCracker::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings4, 1))))
+                .buildAndChain(onElementPass(MTEOilCracker::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings4, 1))))
         .addElement(
             'r',
-            buildHatchAdder(GT_MetaTileEntity_OilCracker.class)
+            buildHatchAdder(MTEOilCracker.class)
                 .atLeast(
-                    GT_HatchElement.OutputHatch.withAdder(GT_MetaTileEntity_OilCracker::addRightHatchToMachineList),
-                    GT_HatchElement.Energy,
-                    GT_HatchElement.Maintenance)
+                    HatchElement.OutputHatch.withAdder(MTEOilCracker::addRightHatchToMachineList),
+                    HatchElement.Energy,
+                    HatchElement.Maintenance)
                 .dot(3)
                 .casingIndex(CASING_INDEX)
-                .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_OilCracker::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings4, 1))))
+                .buildAndChain(onElementPass(MTEOilCracker::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings4, 1))))
         .addElement(
             'm',
-            buildHatchAdder(GT_MetaTileEntity_OilCracker.class)
+            buildHatchAdder(MTEOilCracker.class)
                 .atLeast(
-                    GT_HatchElement.InputHatch.withAdder(GT_MetaTileEntity_OilCracker::addMiddleInputToMachineList)
+                    HatchElement.InputHatch.withAdder(MTEOilCracker::addMiddleInputToMachineList)
                         .withCount(t -> t.mMiddleInputHatches.size()),
-                    GT_HatchElement.InputBus,
-                    GT_HatchElement.Energy,
-                    GT_HatchElement.Maintenance)
+                    HatchElement.InputBus,
+                    HatchElement.Energy,
+                    HatchElement.Maintenance)
                 .dot(1)
                 .casingIndex(CASING_INDEX)
-                .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_OilCracker::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings4, 1))))
+                .buildAndChain(onElementPass(MTEOilCracker::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings4, 1))))
         .build();
     private HeatingCoilLevel heatLevel;
-    protected final List<GT_MetaTileEntity_Hatch_Input> mMiddleInputHatches = new ArrayList<>();
+    protected final List<MTEHatchInput> mMiddleInputHatches = new ArrayList<>();
     // 0 -> left, 1 -> right, any other -> not found
     protected int mInputOnSide;
     protected int mOutputOnSide;
     protected int mCasingAmount;
 
-    public GT_MetaTileEntity_OilCracker(int aID, String aName, String aNameRegional) {
+    public MTEOilCracker(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_OilCracker(String aName) {
+    public MTEOilCracker(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("Cracker")
             .addInfo("Controller block for the Oil Cracking Unit")
             .addInfo("Thermally cracks heavy hydrocarbons into lighter fractions")
@@ -194,7 +184,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_OilCracker> getStructureDefinition() {
+    public IStructureDefinition<MTEOilCracker> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -210,7 +200,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tHatch) {
+        if (aMetaTileEntity instanceof MTEHatchInput tHatch) {
             tHatch.updateTexture(aBaseCasingIndex);
             tHatch.mRecipeMap = getRecipeMap();
             return mMiddleInputHatches.add(tHatch);
@@ -222,7 +212,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tHatch) {
+        if (aMetaTileEntity instanceof MTEHatchInput tHatch) {
             if (mInputOnSide == 1) return false;
             mInputOnSide = 0;
             mOutputOnSide = 1;
@@ -230,7 +220,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
             tHatch.mRecipeMap = getRecipeMap();
             return mInputHatches.add(tHatch);
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output tHatch) {
+        if (aMetaTileEntity instanceof MTEHatchOutput tHatch) {
             if (mOutputOnSide == 1) return false;
             mInputOnSide = 1;
             mOutputOnSide = 0;
@@ -244,7 +234,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tHatch) {
+        if (aMetaTileEntity instanceof MTEHatchInput tHatch) {
             if (mInputOnSide == 0) return false;
             mInputOnSide = 1;
             mOutputOnSide = 0;
@@ -252,7 +242,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
             tHatch.mRecipeMap = getRecipeMap();
             return mInputHatches.add(tHatch);
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output tHatch) {
+        if (aMetaTileEntity instanceof MTEHatchOutput tHatch) {
             if (mOutputOnSide == 0) return false;
             mInputOnSide = 0;
             mOutputOnSide = 1;
@@ -303,7 +293,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_OilCracker(this.mName);
+        return new MTEOilCracker(this.mName);
     }
 
     private void replaceDeprecatedCoils(IGregTechTileEntity aBaseMetaTileEntity) {
@@ -319,10 +309,10 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
                     final byte tUsedMeta = aBaseMetaTileEntity.getMetaID(xPos, yPos, zPos);
                     if (tUsedMeta < 12) continue;
                     if (tUsedMeta > 14) continue;
-                    if (aBaseMetaTileEntity.getBlock(xPos, yPos, zPos) != GregTech_API.sBlockCasings1) continue;
+                    if (aBaseMetaTileEntity.getBlock(xPos, yPos, zPos) != GregTechAPI.sBlockCasings1) continue;
 
                     aBaseMetaTileEntity.getWorld()
-                        .setBlock(xPos, yPos, zPos, GregTech_API.sBlockCasings5, tUsedMeta - 12, 3);
+                        .setBlock(xPos, yPos, zPos, GregTechAPI.sBlockCasings5, tUsedMeta - 12, 3);
                 }
     }
 
@@ -330,17 +320,17 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
     public ArrayList<FluidStack> getStoredFluids() {
         final ArrayList<FluidStack> rList = new ArrayList<>();
         Map<Fluid, FluidStack> inputsFromME = new HashMap<>();
-        for (final GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
+        for (final MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
             tHatch.mRecipeMap = getRecipeMap();
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) {
+            if (tHatch instanceof MTEHatchInputME meHatch) {
                 for (FluidStack tFluid : meHatch.getStoredFluids()) {
                     if (tFluid != null && !getRecipeMap().getBackend()
                         .isValidCatalystFluid(tFluid)) {
                         inputsFromME.put(tFluid.getFluid(), tFluid);
                     }
                 }
-            } else if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) {
-                for (final FluidStack tFluid : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) {
+            } else if (tHatch instanceof MTEHatchMultiInput) {
+                for (final FluidStack tFluid : ((MTEHatchMultiInput) tHatch).getStoredFluid()) {
                     if (tFluid != null && !getRecipeMap().getBackend()
                         .isValidCatalystFluid(tFluid)) {
                         rList.add(tFluid);
@@ -353,17 +343,17 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
                 }
             }
         }
-        for (final GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mMiddleInputHatches)) {
+        for (final MTEHatchInput tHatch : filterValidMTEs(mMiddleInputHatches)) {
             tHatch.mRecipeMap = getRecipeMap();
-            if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) {
+            if (tHatch instanceof MTEHatchInputME meHatch) {
                 for (FluidStack tFluid : meHatch.getStoredFluids()) {
                     if (tFluid != null && getRecipeMap().getBackend()
                         .isValidCatalystFluid(tFluid)) {
                         inputsFromME.put(tFluid.getFluid(), tFluid);
                     }
                 }
-            } else if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) {
-                for (final FluidStack tFluid : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) {
+            } else if (tHatch instanceof MTEHatchMultiInput) {
+                for (final FluidStack tFluid : ((MTEHatchMultiInput) tHatch).getStoredFluid()) {
                     if (tFluid != null && getRecipeMap().getBackend()
                         .isValidCatalystFluid(tFluid)) {
                         rList.add(tFluid);
@@ -403,7 +393,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
 
     @Override
     protected void startRecipeProcessing() {
-        for (GT_MetaTileEntity_Hatch_Input hatch : filterValidMTEs(mMiddleInputHatches)) {
+        for (MTEHatchInput hatch : filterValidMTEs(mMiddleInputHatches)) {
             if (hatch instanceof IRecipeProcessingAwareHatch aware) {
                 aware.startRecipeProcessing();
             }
@@ -414,7 +404,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
     @Override
     protected void endRecipeProcessing() {
         super.endRecipeProcessing();
-        for (GT_MetaTileEntity_Hatch_Input hatch : filterValidMTEs(mMiddleInputHatches)) {
+        for (MTEHatchInput hatch : filterValidMTEs(mMiddleInputHatches)) {
             if (hatch instanceof IRecipeProcessingAwareHatch aware) {
                 setResultIfFailure(aware.endRecipeProcessing(this));
             }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill1.java
index 1e37dcbac9..7656bf16eb 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill1.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill1.java
@@ -4,26 +4,26 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_OilDrill1 extends GT_MetaTileEntity_OilDrillBase {
+public class MTEOilDrill1 extends MTEOilDrillBase {
 
-    public GT_MetaTileEntity_OilDrill1(int aID, String aName, String aNameRegional) {
+    public MTEOilDrill1(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_OilDrill1(String aName) {
+    public MTEOilDrill1(String aName) {
         super(aName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         return createTooltip("I");
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_OilDrill1(mName);
+        return new MTEOilDrill1(mName);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill2.java
index 10a64a6b1d..96818f4af6 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill2.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill2.java
@@ -1,31 +1,31 @@
 package gregtech.common.tileentities.machines.multi;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_OilDrill2 extends GT_MetaTileEntity_OilDrillBase {
+public class MTEOilDrill2 extends MTEOilDrillBase {
 
-    public GT_MetaTileEntity_OilDrill2(int aID, String aName, String aNameRegional) {
+    public MTEOilDrill2(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_OilDrill2(String aName) {
+    public MTEOilDrill2(String aName) {
         super(aName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         return createTooltip("II");
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_OilDrill2(mName);
+        return new MTEOilDrill2(mName);
     }
 
     @Override
@@ -40,7 +40,7 @@ public class GT_MetaTileEntity_OilDrill2 extends GT_MetaTileEntity_OilDrillBase
 
     @Override
     protected int getCasingTextureIndex() {
-        return GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 1);
+        return GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings4, 1);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill3.java
index bcbe42d794..e6a08c3f73 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill3.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill3.java
@@ -1,31 +1,31 @@
 package gregtech.common.tileentities.machines.multi;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_OilDrill3 extends GT_MetaTileEntity_OilDrillBase {
+public class MTEOilDrill3 extends MTEOilDrillBase {
 
-    public GT_MetaTileEntity_OilDrill3(int aID, String aName, String aNameRegional) {
+    public MTEOilDrill3(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_OilDrill3(String aName) {
+    public MTEOilDrill3(String aName) {
         super(aName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         return createTooltip("III");
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_OilDrill3(mName);
+        return new MTEOilDrill3(mName);
     }
 
     @Override
@@ -40,7 +40,7 @@ public class GT_MetaTileEntity_OilDrill3 extends GT_MetaTileEntity_OilDrillBase
 
     @Override
     protected int getCasingTextureIndex() {
-        return GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 2);
+        return GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings4, 2);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill4.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill4.java
index 802e9f1c5c..b90c78d103 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill4.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrill4.java
@@ -1,31 +1,31 @@
 package gregtech.common.tileentities.machines.multi;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_OilDrill4 extends GT_MetaTileEntity_OilDrillBase {
+public class MTEOilDrill4 extends MTEOilDrillBase {
 
-    public GT_MetaTileEntity_OilDrill4(int aID, String aName, String aNameRegional) {
+    public MTEOilDrill4(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_OilDrill4(String aName) {
+    public MTEOilDrill4(String aName) {
         super(aName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         return createTooltip("IV");
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_OilDrill4(mName);
+        return new MTEOilDrill4(mName);
     }
 
     @Override
@@ -40,7 +40,7 @@ public class GT_MetaTileEntity_OilDrill4 extends GT_MetaTileEntity_OilDrillBase
 
     @Override
     protected int getCasingTextureIndex() {
-        return GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 0);
+        return GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings4, 0);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java
index 075b4e19a1..b40e7e2d29 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java
@@ -1,18 +1,18 @@
 package gregtech.common.tileentities.machines.multi;
 
-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.OutputHatch;
-import static gregtech.api.enums.GT_Values.VN;
-import static gregtech.api.enums.GT_Values.debugDriller;
+import static gregtech.api.enums.GTValues.VN;
+import static gregtech.api.enums.GTValues.debugDriller;
+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.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_DRILL;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_DRILL_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_DRILL_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_DRILL_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.getCasingTextureForId;
-import static gregtech.common.GT_UndergroundOil.undergroundOil;
-import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation;
+import static gregtech.common.UndergroundOil.undergroundOil;
+import static gregtech.common.UndergroundOil.undergroundOilReadInformation;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -48,16 +48,16 @@ import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetricsExporter;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_ChunkManager;
+import gregtech.api.objects.GTChunkManager;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.ValidationResult;
 import gregtech.api.util.ValidationType;
 
-public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_DrillerBase implements IMetricsExporter {
+public abstract class MTEOilDrillBase extends MTEDrillerBase implements IMetricsExporter {
 
     private final ArrayList<Chunk> mOilFieldChunks = new ArrayList<>();
     private int mOilId = 0;
@@ -65,11 +65,11 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
 
     private int chunkRangeConfig = getRangeInChunks();
 
-    public GT_MetaTileEntity_OilDrillBase(int aID, String aName, String aNameRegional) {
+    public MTEOilDrillBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_OilDrillBase(String aName) {
+    public MTEOilDrillBase(String aName) {
         super(aName);
     }
 
@@ -113,11 +113,11 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
         if (aNBT.hasKey("chunkRangeConfig")) chunkRangeConfig = aNBT.getInteger("chunkRangeConfig");
     }
 
-    protected GT_Multiblock_Tooltip_Builder createTooltip(String tierSuffix) {
+    protected MultiblockTooltipBuilder createTooltip(String tierSuffix) {
         String casings = getCasingBlockItem().get(0)
             .getDisplayName();
 
-        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+        final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Pump")
             .addInfo("Controller Block for the Oil/Gas/Fluid Drilling Rig " + (tierSuffix != null ? tierSuffix : ""))
             .addInfo("Works on " + getRangeInChunks() + "x" + getRangeInChunks() + " chunks")
@@ -157,7 +157,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
             if (chunkRangeConfig > getRangeInChunks()) chunkRangeConfig = 1;
         }
         if (oldChunkRange != chunkRangeConfig) mOilFieldChunks.clear();
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             StatCollector.translateToLocal("GT5U.machines.workareaset") + " "
                 + chunkRangeConfig
@@ -172,7 +172,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
     }
 
     @Override
-    protected List<IHatchElement<? super GT_MetaTileEntity_DrillerBase>> getAllowedHatches() {
+    protected List<IHatchElement<? super MTEDrillerBase>> getAllowedHatches() {
         return ImmutableList.of(InputBus, OutputHatch, Maintenance, Energy);
     }
 
@@ -180,7 +180,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
     protected void setElectricityStats() {
         this.mEfficiency = getCurrentEfficiency(null);
         this.mEfficiencyIncrease = 10000;
-        int tier = Math.max(0, GT_Utility.getTier(getMaxInputVoltage()));
+        int tier = Math.max(0, GTUtility.getTier(getMaxInputVoltage()));
         this.mEUt = -7 << (tier << 1); // (1/4) A of current tier when at bottom (7/8) A of current tier while mining
         this.mMaxProgresstime = Math.max(
             1,
@@ -189,7 +189,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
     }
 
     protected float computeSpeed() {
-        return .5F + (GT_Utility.getTier(getMaxInputVoltage()) - getMinTier()) * .25F;
+        return .5F + (GTUtility.getTier(getMaxInputVoltage()) - getMinTier()) * .25F;
     }
 
     @Override
@@ -210,7 +210,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
         if (reachingVoidOrBedrock() && tryFillChunkList()) {
             if (mWorkChunkNeedsReload) {
                 mCurrentChunk = new ChunkCoordIntPair(xDrill >> 4, zDrill >> 4);
-                GT_ChunkManager.requestChunkLoad((TileEntity) getBaseMetaTileEntity(), null);
+                GTChunkManager.requestChunkLoad((TileEntity) getBaseMetaTileEntity(), null);
                 mWorkChunkNeedsReload = false;
             }
             float speed = computeSpeed();
@@ -227,7 +227,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
                 return true;
             }
         }
-        GT_ChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity());
+        GTChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity());
         workState = STATE_UPWARD;
         setShutdownReason(StatCollector.translateToLocal("GT5U.gui.text.drill_exhausted"));
         return true;
@@ -241,7 +241,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
             mOilId = tFluid.getFluidID();
         }
         if (debugDriller) {
-            GT_Log.out.println(" Driller on  fluid = " + mOilId);
+            GTLog.out.println(" Driller on  fluid = " + mOilId);
         }
 
         tOil = new FluidStack(FluidRegistry.getFluid(mOilId), 0);
@@ -255,7 +255,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
             // Fucking morons.
             int zChunk = Math.floorDiv(tChunk.zPosition, range) * range;
             if (debugDriller) {
-                GT_Log.out.println(
+                GTLog.out.println(
                     "tChunk.xPosition = " + tChunk.xPosition
                         + " tChunk.zPosition = "
                         + tChunk.zPosition
@@ -267,27 +267,27 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
             for (int i = 0; i < range; i++) {
                 for (int j = 0; j < range; j++) {
                     if (debugDriller) {
-                        GT_Log.out.println(" getChunkX = " + (xChunk + i) + " getChunkZ = " + (zChunk + j));
+                        GTLog.out.println(" getChunkX = " + (xChunk + i) + " getChunkZ = " + (zChunk + j));
                     }
                     tChunk = getBaseMetaTileEntity().getWorld()
                         .getChunkFromChunkCoords(xChunk + i, zChunk + j);
                     tFluid = undergroundOilReadInformation(tChunk);
                     if (debugDriller) {
-                        GT_Log.out.println(
+                        GTLog.out.println(
                             " Fluid in chunk = " + tFluid.getFluid()
                                 .getID());
                     }
                     if (tOil.isFluidEqual(tFluid) && tFluid.amount > 0) {
                         mOilFieldChunks.add(tChunk);
                         if (debugDriller) {
-                            GT_Log.out.println(" Matching fluid, quantity = " + tFluid.amount);
+                            GTLog.out.println(" Matching fluid, quantity = " + tFluid.amount);
                         }
                     }
                 }
             }
         }
         if (debugDriller) {
-            GT_Log.out.println("mOilFieldChunks.size = " + mOilFieldChunks.size());
+            GTLog.out.println("mOilFieldChunks.size = " + mOilFieldChunks.size());
         }
         return !mOilFieldChunks.isEmpty();
     }
@@ -302,7 +302,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
     protected ValidationResult<FluidStack> tryPumpOil(float speed) {
         if (mOilId <= 0) return null;
         if (debugDriller) {
-            GT_Log.out.println(" pump speed = " + speed);
+            GTLog.out.println(" pump speed = " + speed);
         }
 
         // Even though it works fine without this check,
@@ -335,14 +335,14 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
         for (Chunk tChunk : mOilFieldChunks) {
             FluidStack pumped = undergroundOil(tChunk, simulate ? -speed : speed);
             if (debugDriller) {
-                GT_Log.out.println(
+                GTLog.out.println(
                     " chunkX = " + tChunk.getChunkCoordIntPair().chunkXPos
                         + " chunkZ = "
                         + tChunk.getChunkCoordIntPair().chunkZPos);
                 if (pumped != null) {
-                    GT_Log.out.println("     Fluid pumped = " + pumped.amount);
+                    GTLog.out.println("     Fluid pumped = " + pumped.amount);
                 } else {
-                    GT_Log.out.println("     No fluid pumped ");
+                    GTLog.out.println("     No fluid pumped ");
                 }
             }
             if (pumped == null || pumped.amount < 1) {
@@ -372,9 +372,9 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
                     + EnumChatFormatting.RESET,
                 StatCollector.translateToLocal("GT5U.machines.workarea") + ": "
                     + EnumChatFormatting.GREEN
-                    + GT_Utility.formatNumbers(chunkRangeConfig)
+                    + GTUtility.formatNumbers(chunkRangeConfig)
                     + " x "
-                    + GT_Utility.formatNumbers(chunkRangeConfig)
+                    + GTUtility.formatNumbers(chunkRangeConfig)
                     + EnumChatFormatting.RESET
                     + " "
                     + StatCollector.translateToLocal("GT5U.machines.chunks"),
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillInfinite.java
index 056577e8e8..25870cc798 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillInfinite.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.multi;
 
-import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.VN;
 
 import net.minecraftforge.fluids.FluidStack;
 
@@ -8,25 +8,25 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_OilDrillInfinite extends GT_MetaTileEntity_OilDrillBase {
+public class MTEOilDrillInfinite extends MTEOilDrillBase {
 
-    public GT_MetaTileEntity_OilDrillInfinite(int aID, String aName, String aNameRegional) {
+    public MTEOilDrillInfinite(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_OilDrillInfinite(String aName) {
+    public MTEOilDrillInfinite(String aName) {
         super(aName);
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         String casings = getCasingBlockItem().get(0)
             .getDisplayName();
 
-        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+        final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Pump")
             .addInfo("Controller Block for the Infinite Oil/Gas/Fluid Drilling Rig ")
             .addInfo("Works on " + getRangeInChunks() + "x" + getRangeInChunks() + " chunks")
@@ -46,7 +46,7 @@ public class GT_MetaTileEntity_OilDrillInfinite extends GT_MetaTileEntity_OilDri
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_OilDrillInfinite(mName);
+        return new MTEOilDrillInfinite(mName);
     }
 
     @Override
@@ -77,7 +77,7 @@ public class GT_MetaTileEntity_OilDrillInfinite extends GT_MetaTileEntity_OilDri
 
     @Override
     protected float computeSpeed() {
-        return .5F + (GT_Utility.getTier(getMaxInputVoltage()) - getMinTier() + 5) * .25F;
+        return .5F + (GTUtility.getTier(getMaxInputVoltage()) - getMinTier() + 5) * .25F;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant1.java
index 50edf8928a..3585bce702 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant1.java
@@ -4,28 +4,28 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_OreDrillingPlant1 extends GT_MetaTileEntity_OreDrillingPlantBase {
+public class MTEOreDrillingPlant1 extends MTEOreDrillingPlantBase {
 
-    public GT_MetaTileEntity_OreDrillingPlant1(int aID, String aName, String aNameRegional) {
+    public MTEOreDrillingPlant1(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         mTier = 1;
     }
 
-    public GT_MetaTileEntity_OreDrillingPlant1(String aName) {
+    public MTEOreDrillingPlant1(String aName) {
         super(aName);
         mTier = 1;
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         return createTooltip("I");
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_OreDrillingPlant1(mName);
+        return new MTEOreDrillingPlant1(mName);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant2.java
index 6a80c96d26..94542a4923 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant2.java
@@ -4,28 +4,28 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_OreDrillingPlant2 extends GT_MetaTileEntity_OreDrillingPlantBase {
+public class MTEOreDrillingPlant2 extends MTEOreDrillingPlantBase {
 
-    public GT_MetaTileEntity_OreDrillingPlant2(int aID, String aName, String aNameRegional) {
+    public MTEOreDrillingPlant2(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         mTier = 2;
     }
 
-    public GT_MetaTileEntity_OreDrillingPlant2(String aName) {
+    public MTEOreDrillingPlant2(String aName) {
         super(aName);
         mTier = 2;
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         return createTooltip("II");
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_OreDrillingPlant2(mName);
+        return new MTEOreDrillingPlant2(mName);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant3.java
index 2bb25b2254..ea89a15594 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant3.java
@@ -4,28 +4,28 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_OreDrillingPlant3 extends GT_MetaTileEntity_OreDrillingPlantBase {
+public class MTEOreDrillingPlant3 extends MTEOreDrillingPlantBase {
 
-    public GT_MetaTileEntity_OreDrillingPlant3(int aID, String aName, String aNameRegional) {
+    public MTEOreDrillingPlant3(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         mTier = 3;
     }
 
-    public GT_MetaTileEntity_OreDrillingPlant3(String aName) {
+    public MTEOreDrillingPlant3(String aName) {
         super(aName);
         mTier = 3;
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         return createTooltip("III");
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_OreDrillingPlant3(mName);
+        return new MTEOreDrillingPlant3(mName);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant4.java
index 7ba26b9500..44bc71519b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlant4.java
@@ -4,28 +4,28 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_OreDrillingPlant4 extends GT_MetaTileEntity_OreDrillingPlantBase {
+public class MTEOreDrillingPlant4 extends MTEOreDrillingPlantBase {
 
-    public GT_MetaTileEntity_OreDrillingPlant4(int aID, String aName, String aNameRegional) {
+    public MTEOreDrillingPlant4(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
         mTier = 4;
     }
 
-    public GT_MetaTileEntity_OreDrillingPlant4(String aName) {
+    public MTEOreDrillingPlant4(String aName) {
         super(aName);
         mTier = 4;
     }
 
     @Override
-    protected GT_Multiblock_Tooltip_Builder createTooltip() {
+    protected MultiblockTooltipBuilder createTooltip() {
         return createTooltip("IV");
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_OreDrillingPlant4(mName);
+        return new MTEOreDrillingPlant4(mName);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java
index b60bac4f84..47504c574e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java
@@ -1,12 +1,12 @@
 package gregtech.common.tileentities.machines.multi;
 
-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.OutputBus;
-import static gregtech.api.enums.GT_Values.TIER_COLORS;
-import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.TIER_COLORS;
+import static gregtech.api.enums.GTValues.VN;
+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.OutputBus;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
 
 import java.util.ArrayList;
@@ -45,24 +45,23 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.gui.modularui.GT_UITextures;
-import gregtech.api.gui.widgets.GT_LockedWhileActiveButton;
+import gregtech.api.gui.modularui.GTUITextures;
+import gregtech.api.gui.widgets.LockedWhileActiveButton;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.metatileentity.IMetricsExporter;
-import gregtech.api.objects.GT_ChunkManager;
+import gregtech.api.objects.GTChunkManager;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
-import gregtech.crossmod.visualprospecting.GT_VisualProspecting_Database;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.blocks.BlockOresAbstract;
+import gregtech.common.blocks.TileEntityOres;
+import gregtech.crossmod.visualprospecting.VisualProspectingDatabase;
 
-public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTileEntity_DrillerBase
-    implements IMetricsExporter {
+public abstract class MTEOreDrillingPlantBase extends MTEDrillerBase implements IMetricsExporter {
 
     private final List<ChunkPosition> oreBlockPositions = new ArrayList<>();
     protected int mTier = 1;
@@ -84,11 +83,11 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
     /** Contains the name of the currently mined vein. Used for driving metrics cover output. */
     private String veinName = null;
 
-    GT_MetaTileEntity_OreDrillingPlantBase(int aID, String aName, String aNameRegional) {
+    MTEOreDrillingPlantBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    GT_MetaTileEntity_OreDrillingPlantBase(String aName) {
+    MTEOreDrillingPlantBase(String aName) {
         super(aName);
     }
 
@@ -134,7 +133,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         }
 
         if (mCurrentChunk != null && mChunkLoadingEnabled) {
-            GT_ChunkManager.releaseChunk((TileEntity) getBaseMetaTileEntity(), mCurrentChunk);
+            GTChunkManager.releaseChunk((TileEntity) getBaseMetaTileEntity(), mCurrentChunk);
         }
 
         oreBlockPositions.clear();
@@ -146,13 +145,13 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ);
 
         if (getBaseMetaTileEntity().isActive()) {
-            GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.machines.workarea_fail"));
+            GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.machines.workarea_fail"));
         } else {
             adjustChunkRadius(!aPlayer.isSneaking());
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 StatCollector.translateToLocal("GT5U.machines.workareaset") + " "
-                    + GT_Utility.formatNumbers((long) chunkRadiusConfig << 4)
+                    + GTUtility.formatNumbers((long) chunkRadiusConfig << 4)
                     + " "
                     + StatCollector.translateToLocal("GT5U.machines.radius"));
         }
@@ -162,7 +161,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
     public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
         float aX, float aY, float aZ) {
         replaceWithCobblestone = !replaceWithCobblestone;
-        GT_Utility.sendChatToPlayer(aPlayer, "Replace with cobblestone " + replaceWithCobblestone);
+        GTUtility.sendChatToPlayer(aPlayer, "Replace with cobblestone " + replaceWithCobblestone);
         return true;
     }
 
@@ -172,7 +171,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         if (yHead != oldYHead) oreBlockPositions.clear();
 
         if (mWorkChunkNeedsReload && mChunkLoadingEnabled) { // ask to load machine itself
-            GT_ChunkManager.requestChunkLoad((TileEntity) getBaseMetaTileEntity(), null);
+            GTChunkManager.requestChunkLoad((TileEntity) getBaseMetaTileEntity(), null);
             mWorkChunkNeedsReload = false;
         }
         fillMineListIfEmpty(xDrill, yDrill, zDrill, xPipe, zPipe, yHead);
@@ -231,12 +230,12 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         Block oreBlock = null;
         int oreBlockMetadata = 0;
 
-        while ((oreBlock == null || !GT_Utility.isOre(oreBlock, oreBlockMetadata)) && !oreBlockPositions.isEmpty()) {
+        while ((oreBlock == null || !GTUtility.isOre(oreBlock, oreBlockMetadata)) && !oreBlockPositions.isEmpty()) {
             oreBlockPos = oreBlockPositions.remove(0);
             x = oreBlockPos.chunkPosX;
             y = oreBlockPos.chunkPosY;
             z = oreBlockPos.chunkPosZ;
-            if (GT_Utility.eraseBlockByFakePlayer(getFakePlayer(getBaseMetaTileEntity()), x, y, z, true))
+            if (GTUtility.eraseBlockByFakePlayer(getFakePlayer(getBaseMetaTileEntity()), x, y, z, true))
                 oreBlock = getBaseMetaTileEntity().getBlock(x, y, z);
             oreBlockMetadata = getBaseMetaTileEntity().getWorld()
                 .getBlockMetadata(x, y, z);
@@ -247,15 +246,15 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
             setRuntimeFailureReason(CheckRecipeResultRegistry.NO_DRILLING_FLUID);
             return false;
         }
-        if (oreBlock != null && GT_Utility.isOre(oreBlock, oreBlockMetadata)) {
+        if (oreBlock != null && GTUtility.isOre(oreBlock, oreBlockMetadata)) {
             short metaData = 0;
             TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntity(x, y, z);
-            if (tTileEntity instanceof GT_TileEntity_Ores) {
-                metaData = ((GT_TileEntity_Ores) tTileEntity).mMetaData;
+            if (tTileEntity instanceof TileEntityOres) {
+                metaData = ((TileEntityOres) tTileEntity).mMetaData;
             }
 
             Collection<ItemStack> oreBlockDrops = getBlockDrops(oreBlock, x, y, z);
-            ItemStack cobble = GT_Utility.getCobbleForOre(oreBlock, metaData);
+            ItemStack cobble = GTUtility.getCobbleForOre(oreBlock, metaData);
             if (!simulate) {
                 if (replaceWithCobblestone) {
                     getBaseMetaTileEntity().getWorld()
@@ -295,14 +294,14 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         }
 
         if (mWorkChunkNeedsReload) {
-            GT_ChunkManager.requestChunkLoad((TileEntity) getBaseMetaTileEntity(), mCurrentChunk);
+            GTChunkManager.requestChunkLoad((TileEntity) getBaseMetaTileEntity(), mCurrentChunk);
             mWorkChunkNeedsReload = false;
             return true;
         }
         if (oreBlockPositions.isEmpty()) {
             fillChunkMineList(yHead, yDrill);
             if (oreBlockPositions.isEmpty()) {
-                GT_ChunkManager.releaseChunk((TileEntity) getBaseMetaTileEntity(), mCurrentChunk);
+                GTChunkManager.releaseChunk((TileEntity) getBaseMetaTileEntity(), mCurrentChunk);
                 if (!moveToNextChunk(xDrill >> 4, zDrill >> 4)) {
                     workState = STATE_UPWARD;
                     updateVeinNameFromVP();
@@ -317,7 +316,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         mCurrentChunk = getTopLeftChunkCoords();
         updateVeinNameFromVP();
         if (mChunkLoadingEnabled) {
-            GT_ChunkManager.requestChunkLoad((TileEntity) getBaseMetaTileEntity(), mCurrentChunk);
+            GTChunkManager.requestChunkLoad((TileEntity) getBaseMetaTileEntity(), mCurrentChunk);
             mWorkChunkNeedsReload = false;
         }
     }
@@ -399,7 +398,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
             result = super.workingUpward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead);
         } else {
             result = tryProcessOreList();
-            if (oreBlockPositions.isEmpty()) GT_ChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity());
+            if (oreBlockPositions.isEmpty()) GTChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity());
         }
 
         if (!result) {
@@ -413,7 +412,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
     protected void onAbort() {
         oreBlockPositions.clear();
         if (mCurrentChunk != null) {
-            GT_ChunkManager.releaseChunk((TileEntity) getBaseMetaTileEntity(), mCurrentChunk);
+            GTChunkManager.releaseChunk((TileEntity) getBaseMetaTileEntity(), mCurrentChunk);
         }
         mCurrentChunk = null;
         updateVeinNameFromVP();
@@ -452,7 +451,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         mCurrentChunk = new ChunkCoordIntPair(nextChunkX, nextChunkZ);
         updateVeinNameFromVP();
 
-        GT_ChunkManager
+        GTChunkManager
             .requestChunkLoad((TileEntity) getBaseMetaTileEntity(), new ChunkCoordIntPair(nextChunkX, nextChunkZ));
         return true;
     }
@@ -462,7 +461,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
     }
 
     private void updateVeinNameFromVP(@NotNull ChunkCoordIntPair coords) {
-        veinName = GT_VisualProspecting_Database
+        veinName = VisualProspectingDatabase
             .getVeinName(getBaseMetaTileEntity().getWorld().provider.dimensionId, coords)
             .orElse(null);
     }
@@ -475,7 +474,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
     }
 
     @Override
-    protected List<IHatchElement<? super GT_MetaTileEntity_DrillerBase>> getAllowedHatches() {
+    protected List<IHatchElement<? super MTEDrillerBase>> getAllowedHatches() {
         return ImmutableList.of(InputHatch, InputBus, OutputBus, Maintenance, Energy);
     }
 
@@ -483,7 +482,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
     protected void setElectricityStats() {
         this.mEfficiency = getCurrentEfficiency(null);
         this.mEfficiencyIncrease = 10000;
-        int tier = Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
+        int tier = Math.max(1, GTUtility.getTier(getMaxInputVoltage()));
         this.mEUt = -3 * (1 << (tier << 1));
         this.mMaxProgresstime = calculateMaxProgressTime(tier);
     }
@@ -502,7 +501,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
                 outputItems.add(multiplyStackSize(currentItem));
                 return;
             }
-            GT_Recipe tRecipe = RecipeMaps.maceratorRecipes
+            GTRecipe tRecipe = RecipeMaps.maceratorRecipes
                 .findRecipe(getBaseMetaTileEntity(), false, voltage, null, currentItem);
             if (tRecipe == null) {
                 outputItems.add(currentItem);
@@ -519,7 +518,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
     }
 
     private boolean doUseMaceratorRecipe(ItemStack currentItem) {
-        ItemData itemData = GT_OreDictUnificator.getItemData(currentItem);
+        ItemData itemData = GTOreDictUnificator.getItemData(currentItem);
         return itemData == null || itemData.mPrefix != OrePrefixes.crushed && itemData.mPrefix != OrePrefixes.dustImpure
             && itemData.mPrefix != OrePrefixes.dust
             && itemData.mPrefix != OrePrefixes.gem
@@ -540,14 +539,14 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         if (oreBlock.canSilkHarvest(getBaseMetaTileEntity().getWorld(), null, posX, posY, posZ, blockMeta)) {
             return Collections.singleton(new ItemStack(oreBlock, 1, blockMeta));
         }
-        if (oreBlock instanceof GT_Block_Ores_Abstract) {
+        if (oreBlock instanceof BlockOresAbstract) {
             TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntity(posX, posY, posZ);
-            if (tTileEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) tTileEntity).mMetaData >= 16000) {
-                // GT_Log.out.println("Running Small Ore");
+            if (tTileEntity instanceof TileEntityOres && ((TileEntityOres) tTileEntity).mMetaData >= 16000) {
+                // GTLog.out.println("Running Small Ore");
                 return oreBlock.getDrops(getBaseMetaTileEntity().getWorld(), posX, posY, posZ, blockMeta, mTier + 3);
             }
         }
-        // GT_Log.out.println("Running Normal Ore");
+        // GTLog.out.println("Running Normal Ore");
         return oreBlock.getDrops(getBaseMetaTileEntity().getWorld(), posX, posY, posZ, blockMeta, 0);
     }
 
@@ -588,11 +587,11 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         int blockMeta = getBaseMetaTileEntity().getMetaID(x, y, z);
         ChunkPosition blockPos = new ChunkPosition(x, y, z);
         if (!oreBlockPositions.contains(blockPos)) {
-            if (block instanceof GT_Block_Ores_Abstract) {
+            if (block instanceof BlockOresAbstract) {
                 TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntity(x, y, z);
-                if (tTileEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) tTileEntity).mNatural)
+                if (tTileEntity instanceof TileEntityOres && ((TileEntityOres) tTileEntity).mNatural)
                     oreBlockPositions.add(blockPos);
-            } else if (GT_Utility.isOre(block, blockMeta)) oreBlockPositions.add(blockPos);
+            } else if (GTUtility.isOre(block, blockMeta)) oreBlockPositions.add(blockPos);
         }
     }
 
@@ -600,25 +599,25 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
 
     protected abstract int getBaseProgressTime();
 
-    protected GT_Multiblock_Tooltip_Builder createTooltip(String tierSuffix) {
+    protected MultiblockTooltipBuilder createTooltip(String tierSuffix) {
         String casings = getCasingBlockItem().get(0)
             .getDisplayName();
 
-        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+        final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         final int baseCycleTime = calculateMaxProgressTime(getMinTier());
         tt.addMachineType("Miner")
             .addInfo("Controller Block for the Ore Drilling Plant " + (tierSuffix != null ? tierSuffix : ""))
             .addInfo("Use a Screwdriver to configure block radius")
-            .addInfo("Maximum radius is " + GT_Utility.formatNumbers((long) getRadiusInChunks() << 4) + " blocks")
+            .addInfo("Maximum radius is " + GTUtility.formatNumbers((long) getRadiusInChunks() << 4) + " blocks")
             .addInfo("Use Soldering iron to turn off chunk mode")
             .addInfo("Use Wire Cutter to toggle replacing mined blocks with cobblestone")
             .addInfo("In chunk mode, working area center is the chunk corner nearest to the drill")
             .addInfo("Gives ~3x as much crushed ore vs normal processing")
-            .addInfo("Fortune bonus of " + GT_Utility.formatNumbers(mTier + 3) + ". Only works on small ores")
+            .addInfo("Fortune bonus of " + GTUtility.formatNumbers(mTier + 3) + ". Only works on small ores")
             .addInfo("Minimum energy hatch tier: " + TIER_COLORS[getMinTier()] + VN[getMinTier()])
             .addInfo(
-                "Base cycle time: " + (baseCycleTime < 20 ? GT_Utility.formatNumbers(baseCycleTime) + " ticks"
-                    : GT_Utility.formatNumbers(baseCycleTime / 20) + " seconds"))
+                "Base cycle time: " + (baseCycleTime < 20 ? GTUtility.formatNumbers(baseCycleTime) + " ticks"
+                    : GTUtility.formatNumbers(baseCycleTime / 20) + " seconds"))
             .addSeparator()
             .beginStructureBlock(3, 7, 3, false)
             .addController("Front bottom")
@@ -690,10 +689,10 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
     @Override
     protected List<ButtonWidget> getAdditionalButtons(ModularWindow.Builder builder, UIBuildContext buildContext) {
         return ImmutableList.of(
-            (ButtonWidget) new GT_LockedWhileActiveButton(this.getBaseMetaTileEntity(), builder)
+            (ButtonWidget) new LockedWhileActiveButton(this.getBaseMetaTileEntity(), builder)
                 .setOnClick((clickData, widget) -> adjustChunkRadius(clickData.mouseButton == 0))
                 .setPlayClickSound(true)
-                .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_WORK_AREA)
+                .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_WORK_AREA)
                 .attachSyncer(
                     new FakeSyncWidget.IntegerSyncer(() -> chunkRadiusConfig, (val) -> chunkRadiusConfig = val),
                     builder,
@@ -702,20 +701,20 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
                     () -> ImmutableList.of(
                         StatCollector.translateToLocalFormatted(
                             "GT5U.gui.button.ore_drill_radius_1",
-                            GT_Utility.formatNumbers((long) chunkRadiusConfig << 4)),
+                            GTUtility.formatNumbers((long) chunkRadiusConfig << 4)),
                         StatCollector.translateToLocal("GT5U.gui.button.ore_drill_radius_2")))
                 .setTooltipShowUpDelay(TOOLTIP_DELAY)
                 .setSize(16, 16),
-            (ButtonWidget) new GT_LockedWhileActiveButton(this.getBaseMetaTileEntity(), builder)
+            (ButtonWidget) new LockedWhileActiveButton(this.getBaseMetaTileEntity(), builder)
                 .setOnClick((clickData, widget) -> replaceWithCobblestone = !replaceWithCobblestone)
                 .setPlayClickSound(true)
                 .setBackground(() -> {
                     if (replaceWithCobblestone) {
-                        return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED,
-                            GT_UITextures.OVERLAY_BUTTON_REPLACE_COBBLE_ON };
+                        return new IDrawable[] { GTUITextures.BUTTON_STANDARD_PRESSED,
+                            GTUITextures.OVERLAY_BUTTON_REPLACE_COBBLE_ON };
                     }
-                    return new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
-                        GT_UITextures.OVERLAY_BUTTON_REPLACE_COBBLE_OFF };
+                    return new IDrawable[] { GTUITextures.BUTTON_STANDARD,
+                        GTUITextures.OVERLAY_BUTTON_REPLACE_COBBLE_OFF };
                 })
                 .attachSyncer(
                     new FakeSyncWidget.BooleanSyncer(
@@ -739,7 +738,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
 
     @Override
     public String[] getInfoData() {
-        final String diameter = GT_Utility.formatNumbers(chunkRadiusConfig * 2L);
+        final String diameter = GTUtility.formatNumbers(chunkRadiusConfig * 2L);
         return new String[] {
             EnumChatFormatting.BLUE + StatCollector.translateToLocal("GT5U.machines.minermulti")
                 + EnumChatFormatting.RESET,
@@ -760,18 +759,18 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
                 case STATE_AT_BOTTOM -> ImmutableList.of(
                     StatCollector.translateToLocalFormatted(
                         "GT5U.gui.text.drill_ores_left_chunk",
-                        GT_Utility.formatNumbers(oreBlockPositions.size())),
+                        GTUtility.formatNumbers(oreBlockPositions.size())),
                     StatCollector.translateToLocalFormatted(
                         "GT5U.gui.text.drill_chunks_left",
-                        GT_Utility.formatNumbers(getChunkNumber()),
-                        GT_Utility.formatNumbers(getTotalChunkCount())),
+                        GTUtility.formatNumbers(getChunkNumber()),
+                        GTUtility.formatNumbers(getTotalChunkCount())),
                     veinName == null ? ""
                         : StatCollector.translateToLocalFormatted("GT5U.gui.text.drill_current_vein", veinName));
                 case STATE_DOWNWARD -> ImmutableList.of(
                     StatCollector.translateToLocalFormatted(
                         "GT5U.gui.text.drill_ores_left_layer",
                         getYHead(),
-                        GT_Utility.formatNumbers(oreBlockPositions.size())),
+                        GTUtility.formatNumbers(oreBlockPositions.size())),
                     veinName == null ? ""
                         : StatCollector.translateToLocalFormatted("GT5U.gui.text.drill_current_vein", veinName));
                 case STATE_UPWARD, STATE_ABORT -> ImmutableList
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java
index d07ad238a2..b2d20b9745 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java
@@ -2,21 +2,21 @@ package gregtech.common.tileentities.machines.multi;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-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_Values.AuthorBlueWeabo;
-import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.AuthorBlueWeabo;
+import static gregtech.api.enums.GTValues.VN;
+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.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -59,21 +59,21 @@ import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 
 import blockrenderer6343.client.world.ClientFakePlayer;
 import cpw.mods.fml.common.Loader;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.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.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_ExtendedPowerMultiBlockBase;
-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_Muffler;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeMap;
@@ -85,19 +85,18 @@ import gregtech.api.recipe.metadata.PCBFactoryTierKey;
 import gregtech.api.recipe.metadata.PCBFactoryUpgrade;
 import gregtech.api.recipe.metadata.PCBFactoryUpgradeKey;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-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.GTModHandler;
+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 gregtech.api.util.shutdown.ShutDownReasonRegistry;
-import gregtech.common.blocks.GT_Block_Casings8;
+import gregtech.common.blocks.BlockCasings8;
 
 @SuppressWarnings("SpellCheckingInspection")
-public class GT_MetaTileEntity_PCBFactory extends
-    GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_PCBFactory> implements ISurvivalConstructable {
+public class MTEPCBFactory extends MTEExtendedPowerMultiBlockBase<MTEPCBFactory> implements ISurvivalConstructable {
 
     private static final String tier1 = "tier1";
     private static final String tier2 = "tier2";
@@ -111,7 +110,7 @@ public class GT_MetaTileEntity_PCBFactory extends
     private final int[] mBioOffsets = new int[] { -5, -1 };
     private final int[] mOCTier1Offsets = new int[] { 2, -11 };
     private final int[] mOCTier2Offsets = new int[] { 2, -11 };
-    private GT_MetaTileEntity_Hatch_Input mCoolantInputHatch;
+    private MTEHatchInput mCoolantInputHatch;
     private static final int mBioRotateBitMap = 0b1000000;
     private static final int mOCTier2BitMap = 0b100000;
     private static final int mOCTier1BitMap = 0b10000;
@@ -120,8 +119,8 @@ public class GT_MetaTileEntity_PCBFactory extends
     private static final int mTier2BitMap = 0b10;
     private static final int mTier1BitMap = 0b1;
     private static final int COOLANT_CONSUMED_PER_SEC = 10;
-    private static final IStructureDefinition<GT_MetaTileEntity_PCBFactory> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PCBFactory>builder()
+    private static final IStructureDefinition<MTEPCBFactory> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPCBFactory>builder()
         .addShape(
             tier1,
             transpose(
@@ -227,49 +226,49 @@ public class GT_MetaTileEntity_PCBFactory extends
                         //spotless:on
                 }))
         .addElement('E', ofFrame(Materials.DamascusSteel))
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings8, 11))
-        .addElement('D', ofBlock(GregTech_API.sBlockReinforced, 2))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings8, 11))
+        .addElement('D', ofBlock(GregTechAPI.sBlockReinforced, 2))
         .addElement('A', Glasses.chainAllGlasses())
-        .addElement('B', ofBlock(GregTech_API.sBlockCasings3, 10))
+        .addElement('B', ofBlock(GregTechAPI.sBlockCasings3, 10))
         .addElement('F', ofFrame(Materials.VibrantAlloy))
         .addElement(
             'P',
-            buildHatchAdder(GT_MetaTileEntity_PCBFactory.class)
+            buildHatchAdder(MTEPCBFactory.class)
                 .atLeast(InputHatch, OutputBus, InputBus, Maintenance, Energy.or(ExoticEnergy))
                 .dot(1)
-                .casingIndex(((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex(11))
-                .buildAndChain(GregTech_API.sBlockCasings8, 11))
+                .casingIndex(((BlockCasings8) GregTechAPI.sBlockCasings8).getTextureIndex(11))
+                .buildAndChain(GregTechAPI.sBlockCasings8, 11))
         .addElement('H', ofFrame(Materials.Duranium))
-        .addElement('G', ofBlock(GregTech_API.sBlockCasings8, 12))
-        .addElement('I', ofBlock(GregTech_API.sBlockCasings8, 13))
-        .addElement('K', ofBlock(GregTech_API.sBlockCasings8, 10))
+        .addElement('G', ofBlock(GregTechAPI.sBlockCasings8, 12))
+        .addElement('I', ofBlock(GregTechAPI.sBlockCasings8, 13))
+        .addElement('K', ofBlock(GregTechAPI.sBlockCasings8, 10))
         .addElement(
             'J',
-            buildHatchAdder(GT_MetaTileEntity_PCBFactory.class)
+            buildHatchAdder(MTEPCBFactory.class)
                 .atLeast(InputHatch, OutputBus, InputBus, Maintenance, Energy.or(ExoticEnergy))
                 .dot(1)
-                .casingIndex(((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex(13))
-                .buildAndChain(GregTech_API.sBlockCasings8, 13))
-        .addElement('L', ofBlock(GregTech_API.sBlockCasings4, 1))
+                .casingIndex(((BlockCasings8) GregTechAPI.sBlockCasings8).getTextureIndex(13))
+                .buildAndChain(GregTechAPI.sBlockCasings8, 13))
+        .addElement('L', ofBlock(GregTechAPI.sBlockCasings4, 1))
         .addElement(
             'M',
-            buildHatchAdder(GT_MetaTileEntity_PCBFactory.class).hatchClass(GT_MetaTileEntity_Hatch_Input.class)
-                .adder(GT_MetaTileEntity_PCBFactory::addCoolantInputToMachineList)
-                .casingIndex(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 12))
+            buildHatchAdder(MTEPCBFactory.class).hatchClass(MTEHatchInput.class)
+                .adder(MTEPCBFactory::addCoolantInputToMachineList)
+                .casingIndex(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings8, 12))
                 .dot(2)
-                .buildAndChain(GregTech_API.sBlockCasings8, 12))
-        .addElement('N', ofBlock(GregTech_API.sBlockCasings2, 15))
-        .addElement('O', ofBlock(GregTech_API.sBlockCasings8, 4))
+                .buildAndChain(GregTechAPI.sBlockCasings8, 12))
+        .addElement('N', ofBlock(GregTechAPI.sBlockCasings2, 15))
+        .addElement('O', ofBlock(GregTechAPI.sBlockCasings8, 4))
         .addElement(
             'S',
-            buildHatchAdder(GT_MetaTileEntity_PCBFactory.class).hatchClass(GT_MetaTileEntity_Hatch_Input.class)
-                .adder(GT_MetaTileEntity_PCBFactory::addCoolantInputToMachineList)
-                .casingIndex(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 12))
+            buildHatchAdder(MTEPCBFactory.class).hatchClass(MTEHatchInput.class)
+                .adder(MTEPCBFactory::addCoolantInputToMachineList)
+                .casingIndex(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings8, 12))
                 .dot(2)
-                .buildAndChain(GregTech_API.sBlockCasings8, 12))
+                .buildAndChain(GregTechAPI.sBlockCasings8, 12))
         .addElement('R', ofFrame(Materials.Americium))
-        .addElement('Q', ofBlock(GregTech_API.sBlockCasings8, 14))
-        .addElement('T', ofBlock(GregTech_API.sBlockCasings1, 15))
+        .addElement('Q', ofBlock(GregTechAPI.sBlockCasings8, 14))
+        .addElement('T', ofBlock(GregTechAPI.sBlockCasings1, 15))
         .build();
 
     @Override
@@ -396,41 +395,40 @@ public class GT_MetaTileEntity_PCBFactory extends
         return built;
     }
 
-    public GT_MetaTileEntity_PCBFactory(int aID, String aName, String aNameRegional) {
+    public MTEPCBFactory(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_PCBFactory(String aName) {
+    public MTEPCBFactory(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PCBFactory(this.mName);
+        return new MTEPCBFactory(this.mName);
     }
 
     @Override
     public ITexture[] getTexture(IGregTechTileEntity baseMetaTileEntity, ForgeDirection sideDirection,
         ForgeDirection facingDirection, int colorIndex, boolean active, boolean redstoneLevel) {
         if (sideDirection == facingDirection) {
-            if (active)
-                return new ITexture[] {
-                    BlockIcons.getCasingTextureForId(
-                        getTier() < 3 ? GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 11)
-                            : GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 13)),
-                    TextureFactory.builder()
-                        .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE)
-                        .extFacing()
-                        .build(),
-                    TextureFactory.builder()
-                        .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW)
-                        .extFacing()
-                        .glow()
-                        .build() };
+            if (active) return new ITexture[] {
+                BlockIcons.getCasingTextureForId(
+                    getTier() < 3 ? GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings8, 11)
+                        : GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings8, 13)),
+                TextureFactory.builder()
+                    .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE)
+                    .extFacing()
+                    .build(),
+                TextureFactory.builder()
+                    .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW)
+                    .extFacing()
+                    .glow()
+                    .build() };
             return new ITexture[] {
                 BlockIcons.getCasingTextureForId(
-                    getTier() < 3 ? GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 11)
-                        : GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 13)),
+                    getTier() < 3 ? GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings8, 11)
+                        : GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings8, 13)),
                 TextureFactory.builder()
                     .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE)
                     .extFacing()
@@ -442,12 +440,12 @@ public class GT_MetaTileEntity_PCBFactory extends
                     .build() };
         }
         return new ITexture[] { BlockIcons.getCasingTextureForId(
-            mSetTier < 3 ? ((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex(11)
-                : ((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex(13)) };
+            mSetTier < 3 ? ((BlockCasings8) GregTechAPI.sBlockCasings8).getTextureIndex(11)
+                : ((BlockCasings8) GregTechAPI.sBlockCasings8).getTextureIndex(13)) };
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PCBFactory> getStructureDefinition() {
+    public IStructureDefinition<MTEPCBFactory> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -544,11 +542,11 @@ public class GT_MetaTileEntity_PCBFactory extends
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 // Here we check the dynamic parallels, which depend on the recipe
                 int numberOfNanites = 0;
                 ItemStack aNanite = recipe.getRepresentativeInput(1);
-                ItemData naniteData = GT_OreDictUnificator.getAssociation(aNanite);
+                ItemData naniteData = GTOreDictUnificator.getAssociation(aNanite);
                 if (naniteData != null && naniteData.mPrefix != null && naniteData.mPrefix.equals(OrePrefixes.nanite)) {
                     for (ItemStack aItem : inputItems) {
                         if (aItem != null && aItem.isItemEqual(aNanite)) {
@@ -571,7 +569,7 @@ public class GT_MetaTileEntity_PCBFactory extends
 
             @Nonnull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) {
+            protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) {
                 return super.createOverclockCalculator(recipe).setNoOverclock(isNoOC())
                     .setEUtDiscount((float) Math.sqrt(mUpgradesInstalled == 0 ? 1 : mUpgradesInstalled))
                     .setSpeedBoost(getDurationMultiplierFromRoughness())
@@ -580,7 +578,7 @@ public class GT_MetaTileEntity_PCBFactory extends
 
             @Nonnull
             @Override
-            protected GT_ParallelHelper createParallelHelper(@Nonnull GT_Recipe recipe) {
+            protected ParallelHelper createParallelHelper(@Nonnull GTRecipe recipe) {
                 return super.createParallelHelper(recipe)
                     .setEUtModifier((float) Math.sqrt(mUpgradesInstalled == 0 ? 1 : mUpgradesInstalled))
                     .setChanceMultiplier(mRoughnessMultiplier);
@@ -606,7 +604,7 @@ public class GT_MetaTileEntity_PCBFactory extends
 
         if (ticker % 20 == 0) {
             if (!isNoOC()) {
-                FluidStack tFluid = mOCTier1 ? GT_ModHandler.getDistilledWater(COOLANT_CONSUMED_PER_SEC)
+                FluidStack tFluid = mOCTier1 ? GTModHandler.getDistilledWater(COOLANT_CONSUMED_PER_SEC)
                     : Materials.SuperCoolant.getFluid(COOLANT_CONSUMED_PER_SEC);
                 if (!drain(mCoolantInputHatch, tFluid, true)) {
                     stopMachine(ShutDownReasonRegistry.outOfFluid(tFluid));
@@ -735,10 +733,10 @@ public class GT_MetaTileEntity_PCBFactory extends
         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;
-            mCoolantInputHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchInput) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null;
+            mCoolantInputHatch = (MTEHatchInput) aMetaTileEntity;
             return true;
         }
         return false;
@@ -752,7 +750,7 @@ public class GT_MetaTileEntity_PCBFactory extends
     @Override
     public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         inputSeparation = !inputSeparation;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation);
     }
@@ -760,13 +758,13 @@ public class GT_MetaTileEntity_PCBFactory extends
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+        for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
             mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
         }
 
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : getExoticAndNormalEnergyHatchList()) {
+        for (MTEHatch tHatch : getExoticAndNormalEnergyHatchList()) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -778,30 +776,30 @@ public class GT_MetaTileEntity_PCBFactory extends
         return new String[] {
             /* 1 */ StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mProgresstime / 20)
+                + GTUtility.formatNumbers(mProgresstime / 20)
                 + EnumChatFormatting.RESET
                 + " s / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(mMaxProgresstime / 20)
+                + GTUtility.formatNumbers(mMaxProgresstime / 20)
                 + EnumChatFormatting.RESET
                 + " s",
             /* 2 */ StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(storedEnergy)
+                + GTUtility.formatNumbers(storedEnergy)
                 + EnumChatFormatting.RESET
                 + " EU / "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(maxEnergy)
+                + GTUtility.formatNumbers(maxEnergy)
                 + EnumChatFormatting.RESET
                 + " EU",
             /* 3 */ StatCollector.translateToLocal("GT5U.multiblock.usage") + ": "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(getActualEnergyUsage())
+                + GTUtility.formatNumbers(getActualEnergyUsage())
                 + EnumChatFormatting.RESET
                 + " EU/t",
             /* 4 */ StatCollector.translateToLocal("GT5U.multiblock.mei") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(voltage)
+                + GTUtility.formatNumbers(voltage)
                 + EnumChatFormatting.RESET
                 + " EU/t(*"
                 + amps
@@ -809,7 +807,7 @@ public class GT_MetaTileEntity_PCBFactory extends
                 + StatCollector.translateToLocal("GT5U.machines.tier")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + VN[GT_Utility.getTier(voltage)]
+                + VN[GTUtility.getTier(voltage)]
                 + EnumChatFormatting.RESET,
             /* 5 */ StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
                 + EnumChatFormatting.RED
@@ -836,8 +834,8 @@ public class GT_MetaTileEntity_PCBFactory 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("Circuit Board Fabricator")
             .addInfo("Controller for the PCB Factory")
             .addInfo(
@@ -1052,8 +1050,8 @@ public class GT_MetaTileEntity_PCBFactory extends
                 .setSize(16, 16)
                 .setBackground(() -> {
                     List<UITexture> ret = new ArrayList<>();
-                    ret.add(GT_UITextures.BUTTON_STANDARD);
-                    ret.add(GT_UITextures.OVERLAY_BUTTON_CYCLIC);
+                    ret.add(GTUITextures.BUTTON_STANDARD);
+                    ret.add(GTUITextures.OVERLAY_BUTTON_CYCLIC);
                     return ret.toArray(new IDrawable[0]);
                 })
                 .addTooltip("Configuration Menu")
@@ -1070,17 +1068,17 @@ public class GT_MetaTileEntity_PCBFactory extends
                     .setTextColor(Color.WHITE.normal)
                     .setTextAlignment(Alignment.Center)
                     .addTooltip("PCB Factory Tier")
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                     .setSize(18, 18)
                     .setPos(173, 110));
     }
 
     protected ModularWindow createConfigurationWindow(final EntityPlayer player) {
         ModularWindow.Builder builder = ModularWindow.builder(200, 160);
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.setGuiTint(getGUIColorization());
         builder.widget(
-            new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
+            new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CYCLIC)
                 .setPos(5, 5)
                 .setSize(16, 16))
             .widget(new TextWidget("Configuration Menu").setPos(25, 9))
@@ -1093,19 +1091,19 @@ public class GT_MetaTileEntity_PCBFactory extends
                         new MultiChildWidget().addChild(new CycleButtonWidget().setToggle(() -> mBioUpgrade, val -> {
                             mBioUpgrade = val;
                             if (!mBioUpgrade) {
-                                GT_Utility
-                                    .sendChatToPlayer(player, GT_Utility.trans("339.1", "Biochamber Upgrade Disabled"));
+                                GTUtility
+                                    .sendChatToPlayer(player, GTUtility.trans("339.1", "Biochamber Upgrade Disabled"));
                             } else {
-                                GT_Utility
-                                    .sendChatToPlayer(player, GT_Utility.trans("339", "Biochamber Upgrade Enabled"));
+                                GTUtility
+                                    .sendChatToPlayer(player, GTUtility.trans("339", "Biochamber Upgrade Enabled"));
                             }
                         })
-                            .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+                            .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
                             .setSize(90, 18)
                             .addTooltip(
                                 "Enables nanites to construct organic circuitry. Required for Bioware and Wetware boards."))
                             .addChild(
-                                new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
+                                new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CYCLIC)
                                     .setSize(18, 18))
                             .addChild(
                                 new TextWidget("Biochamber").setTextAlignment(Alignment.Center)
@@ -1114,17 +1112,16 @@ public class GT_MetaTileEntity_PCBFactory extends
                     .widget(new MultiChildWidget().addChild(new CycleButtonWidget().setToggle(() -> mBioRotate, val -> {
                         mBioRotate = val;
                         if (!mBioRotate) {
-                            GT_Utility
-                                .sendChatToPlayer(player, GT_Utility.trans("340.1", "Rotated biochamber disabled"));
+                            GTUtility.sendChatToPlayer(player, GTUtility.trans("340.1", "Rotated biochamber disabled"));
                         } else {
-                            GT_Utility.sendChatToPlayer(player, GT_Utility.trans("340", "Rotated biochamber enabled"));
+                            GTUtility.sendChatToPlayer(player, GTUtility.trans("340", "Rotated biochamber enabled"));
                         }
                     })
-                        .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+                        .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
                         .setSize(90, 18)
                         .addTooltip("Rotates the biochamber by 90 degrees."))
                         .addChild(
-                            new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
+                            new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CYCLIC)
                                 .setSize(18, 18))
                         .addChild(
                             new TextWidget("Bio Rotation").setTextAlignment(Alignment.Center)
@@ -1134,17 +1131,17 @@ public class GT_MetaTileEntity_PCBFactory extends
                         mOCTier1 = val;
                         mOCTier2 = false;
                         if (!mOCTier1) {
-                            GT_Utility.sendChatToPlayer(player, GT_Utility.trans("341.1", "Tier 1 cooling disabled"));
+                            GTUtility.sendChatToPlayer(player, GTUtility.trans("341.1", "Tier 1 cooling disabled"));
                         } else {
-                            GT_Utility.sendChatToPlayer(player, GT_Utility.trans("341", "Tier 1 cooling enabled"));
+                            GTUtility.sendChatToPlayer(player, GTUtility.trans("341", "Tier 1 cooling enabled"));
                         }
                     })
-                        .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+                        .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
                         .setSize(90, 18)
                         .addTooltip(
                             "Allows for overclocking. Requires 10 L/s of distilled water. Cooling upgrades are mutually exclusive."))
                         .addChild(
-                            new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
+                            new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CYCLIC)
                                 .setSize(18, 18))
                         .addChild(
                             new TextWidget("Liquid Cooling").setTextAlignment(Alignment.Center)
@@ -1154,17 +1151,17 @@ public class GT_MetaTileEntity_PCBFactory extends
                         mOCTier2 = val;
                         mOCTier1 = false;
                         if (!mOCTier2) {
-                            GT_Utility.sendChatToPlayer(player, GT_Utility.trans("342.1", "Tier 2 cooling disabled"));
+                            GTUtility.sendChatToPlayer(player, GTUtility.trans("342.1", "Tier 2 cooling disabled"));
                         } else {
-                            GT_Utility.sendChatToPlayer(player, GT_Utility.trans("342", "Tier 2 cooling enabled"));
+                            GTUtility.sendChatToPlayer(player, GTUtility.trans("342", "Tier 2 cooling enabled"));
                         }
                     })
-                        .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+                        .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
                         .setSize(90, 18)
                         .addTooltip(
                             "Enables perfect overclocking by allowing nanites to work with extreme speed and efficiency. Uses 10 L/s of Super Coolant."))
                         .addChild(
-                            new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
+                            new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CYCLIC)
                                 .setSize(18, 18))
                         .addChild(
                             new TextWidget("Thermosink").setTextAlignment(Alignment.Center)
@@ -1182,10 +1179,10 @@ public class GT_MetaTileEntity_PCBFactory extends
                             .setTextAlignment(Alignment.Center)
                             .addTooltip(
                                 "Set the trace size. Smaller traces allow material savings but take longer to fabricate. Larger traces waste material but are fast. 50-200 μm.")
-                            .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                            .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                             .setSize(90, 16))
                     .widget(
-                        new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CROSS)
+                        new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CROSS)
                             .setSize(18, 18)
                             .addTooltip(new Text("Can't change configuration when running !").color(Color.RED.dark(3)))
                             .setEnabled(widget -> getBaseMetaTileEntity().isActive()))
@@ -1204,7 +1201,7 @@ public class GT_MetaTileEntity_PCBFactory extends
                                     .setTextColor(Color.WHITE.normal)
                                     .setTextAlignment(Alignment.Center)
                                     .addTooltip("X Offset")
-                                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                                     .setSize(36, 18))
                             .widget(
                                 new NumericWidget().setGetter(() -> mBioOffsets[1])
@@ -1213,7 +1210,7 @@ public class GT_MetaTileEntity_PCBFactory extends
                                     .setTextColor(Color.WHITE.normal)
                                     .setTextAlignment(Alignment.Center)
                                     .addTooltip("Z Offset")
-                                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                                     .setSize(36, 18))
                             .setEnabled(widget -> !getBaseMetaTileEntity().isActive()))
                     .widget(
@@ -1228,7 +1225,7 @@ public class GT_MetaTileEntity_PCBFactory extends
                                     .setTextColor(Color.WHITE.normal)
                                     .setTextAlignment(Alignment.Center)
                                     .addTooltip("X Offset")
-                                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                                     .setSize(36, 18))
                             .widget(
                                 new NumericWidget().setGetter(() -> mOCTier1Offsets[1])
@@ -1237,7 +1234,7 @@ public class GT_MetaTileEntity_PCBFactory extends
                                     .setTextColor(Color.WHITE.normal)
                                     .setTextAlignment(Alignment.Center)
                                     .addTooltip("Z Offset")
-                                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                                     .setSize(36, 18))
                             .setEnabled(widget -> !getBaseMetaTileEntity().isActive()))
                     .widget(
@@ -1252,7 +1249,7 @@ public class GT_MetaTileEntity_PCBFactory extends
                                     .setTextColor(Color.WHITE.normal)
                                     .setTextAlignment(Alignment.Center)
                                     .addTooltip("X Offset")
-                                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                                     .setSize(36, 18))
                             .widget(
                                 new NumericWidget().setGetter(() -> mOCTier2Offsets[1])
@@ -1261,7 +1258,7 @@ public class GT_MetaTileEntity_PCBFactory extends
                                     .setTextColor(Color.WHITE.normal)
                                     .setTextAlignment(Alignment.Center)
                                     .addTooltip("Z Offset")
-                                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                                     .setSize(36, 18))
                             .setEnabled(widget -> !getBaseMetaTileEntity().isActive()))
                     .setPos(110, 25));
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java
index d23ea912bb..feaead0047 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java
@@ -1,24 +1,24 @@
 package gregtech.common.tileentities.machines.multi;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-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.enums.GT_Values.AuthorColen;
-import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.AuthorColen;
+import static gregtech.api.enums.GTValues.VN;
+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.enums.Textures.BlockIcons.OVERLAY_DTPF_OFF;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_DTPF_ON;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION1_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_RAINBOWSCREEN_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
-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.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 import java.util.ArrayList;
@@ -42,7 +42,6 @@ import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.NotNull;
 
-import com.github.technus.tectech.thing.gui.TecTechUITextures;
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
@@ -61,35 +60,35 @@ import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 
 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.HeatingCoilLevel;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.MaterialsUEVplus;
 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.ITexture;
 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_ExtendedPowerMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.objects.GT_ChunkManager;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
+import gregtech.api.objects.GTChunkManager;
 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.render.TextureFactory;
-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 tectech.thing.gui.TecTechUITextures;
 
-public class GT_MetaTileEntity_PlasmaForge extends
-    GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_PlasmaForge> implements ISurvivalConstructable {
+public class MTEPlasmaForge extends MTEExtendedPowerMultiBlockBase<MTEPlasmaForge> implements ISurvivalConstructable {
 
     // 3600 seconds in an hour, 8 hours, 20 ticks in a second.
     private static final double max_efficiency_time_in_ticks = 3600d * 8d * 20d;
@@ -145,7 +144,7 @@ public class GT_MetaTileEntity_PlasmaForge extends
     private long running_time = 0;
     private boolean convergence = false;
     private HeatingCoilLevel mCoilLevel;
-    private GT_OverclockCalculator overclockCalculator;
+    private OverclockCalculator overclockCalculator;
 
     @SuppressWarnings("SpellCheckingInspection")
     private static final String[][] structure_string = new String[][] { { "                                 ",
@@ -549,50 +548,48 @@ public class GT_MetaTileEntity_PlasmaForge extends
     private boolean isMultiChunkloaded = true;
 
     protected static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_PlasmaForge> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PlasmaForge>builder()
+    private static final IStructureDefinition<MTEPlasmaForge> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPlasmaForge>builder()
         .addShape(STRUCTURE_PIECE_MAIN, structure_string)
-        .addElement(
-            'C',
-            ofCoil(GT_MetaTileEntity_PlasmaForge::setCoilLevel, GT_MetaTileEntity_PlasmaForge::getCoilLevel))
+        .addElement('C', ofCoil(MTEPlasmaForge::setCoilLevel, MTEPlasmaForge::getCoilLevel))
         .addElement(
             'b',
-            buildHatchAdder(GT_MetaTileEntity_PlasmaForge.class)
+            buildHatchAdder(MTEPlasmaForge.class)
                 .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Energy, ExoticEnergy, Maintenance)
                 .casingIndex(DIM_INJECTION_CASING)
                 .dot(3)
-                .buildAndChain(GregTech_API.sBlockCasings1, DIM_INJECTION_CASING))
-        .addElement('N', ofBlock(GregTech_API.sBlockCasings1, DIM_TRANS_CASING))
-        .addElement('s', ofBlock(GregTech_API.sBlockCasings1, DIM_BRIDGE_CASING))
+                .buildAndChain(GregTechAPI.sBlockCasings1, DIM_INJECTION_CASING))
+        .addElement('N', ofBlock(GregTechAPI.sBlockCasings1, DIM_TRANS_CASING))
+        .addElement('s', ofBlock(GregTechAPI.sBlockCasings1, DIM_BRIDGE_CASING))
         .build();
 
-    public GT_MetaTileEntity_PlasmaForge(int aID, String aName, String aNameRegional) {
+    public MTEPlasmaForge(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_PlasmaForge(String aName) {
+    public MTEPlasmaForge(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PlasmaForge(mName);
+        return new MTEPlasmaForge(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("Plasma Forge, DTPF")
             .addInfo("Transcending Dimensional Boundaries.")
             .addInfo(
                 "Takes " + EnumChatFormatting.RED
-                    + GT_Utility.formatNumbers(max_efficiency_time_in_ticks / (3600 * 20))
+                    + GTUtility.formatNumbers(max_efficiency_time_in_ticks / (3600 * 20))
                     + EnumChatFormatting.GRAY
                     + " hours of continuous run time to fully breach dimensional")
             .addInfo(
                 "boundaries and achieve maximum efficiency, reducing fuel consumption by up to "
                     + EnumChatFormatting.RED
-                    + GT_Utility.formatNumbers(100 * maximum_discount)
+                    + GTUtility.formatNumbers(100 * maximum_discount)
                     + "%"
                     + EnumChatFormatting.GRAY
                     + ".")
@@ -619,7 +616,7 @@ public class GT_MetaTileEntity_PlasmaForge extends
             .addInfo("but the extra power cost is instead added in form of increased catalyst amounts.")
             .addInfo(
                 "When no recipe is running, fuel discount decays x" + EnumChatFormatting.RED
-                    + GT_Utility.formatNumbers(efficiency_decay_rate)
+                    + GTUtility.formatNumbers(efficiency_decay_rate)
                     + EnumChatFormatting.GRAY
                     + " as fast as it builds up.")
             .addInfo(AuthorColen)
@@ -749,7 +746,7 @@ public class GT_MetaTileEntity_PlasmaForge extends
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PlasmaForge> getStructureDefinition() {
+    public IStructureDefinition<MTEPlasmaForge> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -769,7 +766,7 @@ public class GT_MetaTileEntity_PlasmaForge extends
 
             @Nonnull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) {
+            protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) {
                 overclockCalculator = super.createOverclockCalculator(recipe).setRecipeHeat(recipe.mSpecialValue)
                     .setMachineHeat(mHeatingCapacity);
                 if (discount == maximum_discount && convergence) {
@@ -780,12 +777,12 @@ public class GT_MetaTileEntity_PlasmaForge extends
 
             @NotNull
             @Override
-            protected GT_ParallelHelper createParallelHelper(@Nonnull GT_Recipe recipe) {
+            protected ParallelHelper createParallelHelper(@Nonnull GTRecipe recipe) {
                 return super.createParallelHelper(recipeAfterAdjustments(recipe));
             }
 
             @Override
-            protected @Nonnull CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected @Nonnull CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 return recipe.mSpecialValue <= mHeatingCapacity ? CheckRecipeResultRegistry.SUCCESSFUL
                     : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue);
             }
@@ -793,8 +790,8 @@ public class GT_MetaTileEntity_PlasmaForge extends
     }
 
     @Nonnull
-    protected GT_Recipe recipeAfterAdjustments(@Nonnull GT_Recipe recipe) {
-        GT_Recipe tRecipe = recipe.copy();
+    protected GTRecipe recipeAfterAdjustments(@Nonnull GTRecipe recipe) {
+        GTRecipe tRecipe = recipe.copy();
         boolean adjusted = false;
         outside: for (int i = 0; i < recipe.mFluidInputs.length; i++) {
             for (FluidStack fuel : valid_fuels) {
@@ -864,7 +861,7 @@ public class GT_MetaTileEntity_PlasmaForge extends
 
             // Check will also fail if energy hatches are not of the same tier.
             byte tier_of_hatch = mEnergyHatches.get(0).mTier;
-            for (GT_MetaTileEntity_Hatch_Energy energyHatch : mEnergyHatches) {
+            for (MTEHatchEnergy energyHatch : mEnergyHatches) {
                 if (energyHatch.mTier != tier_of_hatch) {
                     return false;
                 }
@@ -910,7 +907,7 @@ public class GT_MetaTileEntity_PlasmaForge extends
         long storedEnergy = 0;
         long maxEnergy = 0;
 
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mExoticEnergyHatches)) {
+        for (MTEHatch tHatch : filterValidMTEs(mExoticEnergyHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -925,30 +922,30 @@ public class GT_MetaTileEntity_PlasmaForge extends
         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(getActualEnergyUsage())
+                + GTUtility.formatNumbers(getActualEnergyUsage())
                 + EnumChatFormatting.RESET
                 + " EU/t",
             StatCollector.translateToLocal("GT5U.multiblock.mei") + ": "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(voltage)
+                + GTUtility.formatNumbers(voltage)
                 + EnumChatFormatting.RESET
                 + " EU/t(*"
                 + EnumChatFormatting.YELLOW
@@ -958,19 +955,19 @@ public class GT_MetaTileEntity_PlasmaForge extends
                 + StatCollector.translateToLocal("GT5U.machines.tier")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + VN[GT_Utility.getTier(voltage)]
+                + VN[GTUtility.getTier(voltage)]
                 + EnumChatFormatting.RESET,
             StatCollector.translateToLocal("GT5U.EBF.heat") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(mHeatingCapacity)
+                + GTUtility.formatNumbers(mHeatingCapacity)
                 + EnumChatFormatting.RESET
                 + " K",
             "Ticks run: " + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(running_time)
+                + GTUtility.formatNumbers(running_time)
                 + EnumChatFormatting.RESET
                 + ", Fuel Discount: "
                 + EnumChatFormatting.RED
-                + GT_Utility.formatNumbers(100 * (1 - discount))
+                + GTUtility.formatNumbers(100 * (1 - discount))
                 + EnumChatFormatting.RESET
                 + "%",
             "Convergence: " + (convergence ? EnumChatFormatting.GREEN + "Active" : EnumChatFormatting.RED + "Inactive"),
@@ -987,9 +984,9 @@ public class GT_MetaTileEntity_PlasmaForge extends
 
     private int catalystTypeForRecipesWithoutCatalyst = 1;
 
-    private void calculateCatalystIncrease(GT_Recipe recipe, int index, boolean withoutCatalyst) {
+    private void calculateCatalystIncrease(GTRecipe recipe, int index, boolean withoutCatalyst) {
         long machineConsumption = overclockCalculator.getConsumption();
-        int numberOfOverclocks = (int) Math.ceil(calculateTier(machineConsumption) - GT_Utility.getTier(recipe.mEUt));
+        int numberOfOverclocks = (int) Math.ceil(calculateTier(machineConsumption) - GTUtility.getTier(recipe.mEUt));
         double recipeDuration = recipe.mDuration / Math.pow(4, numberOfOverclocks);
         // Power difference between regular and perfect OCs for this recipe duration
         long extraPowerNeeded = (long) ((Math.pow(2, numberOfOverclocks) - 1) * machineConsumption * recipeDuration);
@@ -1044,40 +1041,40 @@ public class GT_MetaTileEntity_PlasmaForge extends
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         if (aBaseMetaTileEntity.isServerSide() && !aBaseMetaTileEntity.isAllowedToWork()) {
             // If machine has stopped, stop chunkloading.
-            GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity);
+            GTChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity);
             isMultiChunkloaded = false;
         } else if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && !isMultiChunkloaded) {
             // Load a 3x3 area centered on controller when machine is running.
-            GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity);
+            GTChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity);
 
             int ControllerXCoordinate = ((TileEntity) aBaseMetaTileEntity).xCoord;
             int ControllerZCoordinate = ((TileEntity) aBaseMetaTileEntity).zCoord;
 
-            GT_ChunkManager.requestChunkLoad(
+            GTChunkManager.requestChunkLoad(
                 (TileEntity) aBaseMetaTileEntity,
                 new ChunkCoordIntPair(ControllerXCoordinate, ControllerZCoordinate));
-            GT_ChunkManager.requestChunkLoad(
+            GTChunkManager.requestChunkLoad(
                 (TileEntity) aBaseMetaTileEntity,
                 new ChunkCoordIntPair(ControllerXCoordinate + 16, ControllerZCoordinate));
-            GT_ChunkManager.requestChunkLoad(
+            GTChunkManager.requestChunkLoad(
                 (TileEntity) aBaseMetaTileEntity,
                 new ChunkCoordIntPair(ControllerXCoordinate - 16, ControllerZCoordinate));
-            GT_ChunkManager.requestChunkLoad(
+            GTChunkManager.requestChunkLoad(
                 (TileEntity) aBaseMetaTileEntity,
                 new ChunkCoordIntPair(ControllerXCoordinate, ControllerZCoordinate + 16));
-            GT_ChunkManager.requestChunkLoad(
+            GTChunkManager.requestChunkLoad(
                 (TileEntity) aBaseMetaTileEntity,
                 new ChunkCoordIntPair(ControllerXCoordinate, ControllerZCoordinate - 16));
-            GT_ChunkManager.requestChunkLoad(
+            GTChunkManager.requestChunkLoad(
                 (TileEntity) aBaseMetaTileEntity,
                 new ChunkCoordIntPair(ControllerXCoordinate + 16, ControllerZCoordinate + 16));
-            GT_ChunkManager.requestChunkLoad(
+            GTChunkManager.requestChunkLoad(
                 (TileEntity) aBaseMetaTileEntity,
                 new ChunkCoordIntPair(ControllerXCoordinate + 16, ControllerZCoordinate - 16));
-            GT_ChunkManager.requestChunkLoad(
+            GTChunkManager.requestChunkLoad(
                 (TileEntity) aBaseMetaTileEntity,
                 new ChunkCoordIntPair(ControllerXCoordinate - 16, ControllerZCoordinate + 16));
-            GT_ChunkManager.requestChunkLoad(
+            GTChunkManager.requestChunkLoad(
                 (TileEntity) aBaseMetaTileEntity,
                 new ChunkCoordIntPair(ControllerXCoordinate - 16, ControllerZCoordinate - 16));
 
@@ -1163,10 +1160,10 @@ public class GT_MetaTileEntity_PlasmaForge extends
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
                 if (convergence) {
-                    ret.add(GT_UITextures.BUTTON_STANDARD_PRESSED);
+                    ret.add(GTUITextures.BUTTON_STANDARD_PRESSED);
                     ret.add(TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_ON);
                 } else {
-                    ret.add(GT_UITextures.BUTTON_STANDARD);
+                    ret.add(GTUITextures.BUTTON_STANDARD);
                     ret.add(TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_OFF);
                 }
                 return ret.toArray(new IDrawable[0]);
@@ -1187,7 +1184,7 @@ public class GT_MetaTileEntity_PlasmaForge extends
         final int PARENT_WIDTH = getGUIWidth();
         final int PARENT_HEIGHT = getGUIHeight();
         ModularWindow.Builder builder = ModularWindow.builder(WIDTH, HEIGHT);
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.setGuiTint(getGUIColorization());
         builder.setDraggable(true);
         builder.setPos(
@@ -1210,7 +1207,7 @@ public class GT_MetaTileEntity_PlasmaForge extends
                     .setTextColor(Color.WHITE.normal)
                     .setSize(50, 18)
                     .setPos(4, 25)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                     .addTooltip(translateToLocal("GT5U.DTPF.catalystinfotooltip"))
                     .attachSyncer(
                         new FakeSyncWidget.IntegerSyncer(
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPrimitiveBlastFurnace.java
index d28aae81ce..c95abda9d7 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPrimitiveBlastFurnace.java
@@ -30,36 +30,36 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ParticleFX;
 import gregtech.api.enums.SteamVariant;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.GUITextureSet;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.modularui.IGetTitleColor;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.RecipeMapWorkable;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
-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.WorldSpawnedEventBuilder;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
-import gregtech.common.GT_Pollution;
+import gregtech.common.Pollution;
 
-public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEntity
+public abstract class MTEPrimitiveBlastFurnace extends MetaTileEntity
     implements IAlignment, ISurvivalConstructable, RecipeMapWorkable, IAddUIWidgets, IGetTitleColor {
 
     public static final int INPUT_SLOTS = 3, OUTPUT_SLOTS = 3;
-    private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace>> STRUCTURE_DEFINITION = new ClassValue<>() {
+    private static final ClassValue<IStructureDefinition<MTEPrimitiveBlastFurnace>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
-        protected IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace> computeValue(Class<?> type) {
-            return IStructureDefinition.<GT_MetaTileEntity_PrimitiveBlastFurnace>builder()
+        protected IStructureDefinition<MTEPrimitiveBlastFurnace> computeValue(Class<?> type) {
+            return IStructureDefinition.<MTEPrimitiveBlastFurnace>builder()
                 .addShape(
                     "main",
                     transpose(
@@ -81,11 +81,11 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
 
     public ItemStack[] mOutputItems = new ItemStack[OUTPUT_SLOTS];
 
-    public GT_MetaTileEntity_PrimitiveBlastFurnace(int aID, String aName, String aNameRegional) {
+    public MTEPrimitiveBlastFurnace(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, INPUT_SLOTS + OUTPUT_SLOTS);
     }
 
-    public GT_MetaTileEntity_PrimitiveBlastFurnace(String aName) {
+    public MTEPrimitiveBlastFurnace(String aName) {
         super(aName, INPUT_SLOTS + OUTPUT_SLOTS);
     }
 
@@ -121,8 +121,8 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
-        return (GregTech_API.getCoverBehaviorNew(aCoverID.toStack())
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
+        return (GregTechAPI.getCoverBehaviorNew(aCoverID.toStack())
             .isSimpleCover()) && (super.allowCoverOnSide(side, aCoverID));
     }
 
@@ -151,13 +151,13 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
         this.mMaxProgresstime = aNBT.getInteger("mMaxProgresstime");
         this.mOutputItems = new ItemStack[OUTPUT_SLOTS];
         for (int i = 0; i < OUTPUT_SLOTS; i++) {
-            this.mOutputItems[i] = GT_Utility.loadItem(aNBT, "mOutputItem" + i);
+            this.mOutputItems[i] = GTUtility.loadItem(aNBT, "mOutputItem" + i);
         }
     }
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -233,7 +233,7 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
                         this.mOutputItems = null;
                         this.mProgresstime = 0;
                         this.mMaxProgresstime = 0;
-                        GT_Mod.achievements.issueAchievement(
+                        GTMod.achievements.issueAchievement(
                             aBaseMetaTileEntity.getWorld()
                                 .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()),
                             "steel");
@@ -243,9 +243,9 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
                 }
             }
             if (this.mMaxProgresstime > 0 && (aTimer % 20L == 0L)) {
-                GT_Pollution.addPollution(
+                Pollution.addPollution(
                     this.getBaseMetaTileEntity(),
-                    GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond);
+                    GTMod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond);
             }
 
             aBaseMetaTileEntity.setActive((this.mMaxProgresstime > 0) && (this.mMachine));
@@ -345,8 +345,8 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
         for (int i = 0; i < limit; i++) {
             int absi = INPUT_SLOTS + i;
             if (this.mInventory[absi] == null) {
-                this.mInventory[absi] = GT_Utility.copyOrNull(this.mOutputItems[i]);
-            } else if (GT_Utility.areStacksEqual(this.mInventory[absi], this.mOutputItems[i])) {
+                this.mInventory[absi] = GTUtility.copyOrNull(this.mOutputItems[i]);
+            } else if (GTUtility.areStacksEqual(this.mInventory[absi], this.mOutputItems[i])) {
                 this.mInventory[absi].stackSize = Math.min(
                     this.mInventory[absi].getMaxStackSize(),
                     this.mInventory[absi].stackSize + this.mOutputItems[i].stackSize);
@@ -361,7 +361,7 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
         }
         return ((this.mInventory[absoluteSlot].stackSize + outputStack.stackSize
             <= this.mInventory[absoluteSlot].getMaxStackSize())
-            && (GT_Utility.areStacksEqual(this.mInventory[absoluteSlot], outputStack)));
+            && (GTUtility.areStacksEqual(this.mInventory[absoluteSlot], outputStack)));
     }
 
     private boolean checkRecipe() {
@@ -370,7 +370,7 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
         }
         ItemStack[] inputs = new ItemStack[INPUT_SLOTS];
         System.arraycopy(mInventory, 0, inputs, 0, INPUT_SLOTS);
-        GT_Recipe recipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, 0, null, inputs);
+        GTRecipe recipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, 0, null, inputs);
         if (recipe == null) {
             this.mOutputItems = null;
             return false;
@@ -406,7 +406,7 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
     @Override
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        return !GT_Utility.areStacksEqual(aStack, this.mInventory[0]);
+        return !GTUtility.areStacksEqual(aStack, this.mInventory[0]);
     }
 
     @Override
@@ -467,40 +467,40 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
                 new SlotWidget(inventoryHandler, 0)
                     .setBackground(
                         getGUITextureSet().getItemSlot(),
-                        GT_UITextures.OVERLAY_SLOT_INGOT_STEAM.get(getSteamVariant()))
+                        GTUITextures.OVERLAY_SLOT_INGOT_STEAM.get(getSteamVariant()))
                     .setPos(33, 15))
             .widget(
                 new SlotWidget(inventoryHandler, 1)
                     .setBackground(
                         getGUITextureSet().getItemSlot(),
-                        GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()))
+                        GTUITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()))
                     .setPos(33, 33))
             .widget(
                 new SlotWidget(inventoryHandler, 2)
                     .setBackground(
                         getGUITextureSet().getItemSlot(),
-                        GT_UITextures.OVERLAY_SLOT_FURNACE_STEAM.get(getSteamVariant()))
+                        GTUITextures.OVERLAY_SLOT_FURNACE_STEAM.get(getSteamVariant()))
                     .setPos(33, 51))
             .widget(
                 new SlotWidget(inventoryHandler, 3).setAccess(true, false)
                     .setBackground(
                         getGUITextureSet().getItemSlot(),
-                        GT_UITextures.OVERLAY_SLOT_INGOT_STEAM.get(getSteamVariant()))
+                        GTUITextures.OVERLAY_SLOT_INGOT_STEAM.get(getSteamVariant()))
                     .setPos(85, 24))
             .widget(
                 new SlotWidget(inventoryHandler, 4).setAccess(true, false)
                     .setBackground(
                         getGUITextureSet().getItemSlot(),
-                        GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()))
+                        GTUITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()))
                     .setPos(103, 24))
             .widget(
                 new SlotWidget(inventoryHandler, 5).setAccess(true, false)
                     .setBackground(
                         getGUITextureSet().getItemSlot(),
-                        GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()))
+                        GTUITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()))
                     .setPos(121, 24))
             .widget(
-                new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ARROW_2_STEAM.get(getSteamVariant()), 20)
+                new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ARROW_2_STEAM.get(getSteamVariant()), 20)
                     .setProgress(() -> (float) mProgresstime / mMaxProgresstime)
                     .setNEITransferRect(
                         getRecipeMap().getFrontend()
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEProcessingArray.java
index abb0605df7..43f1c003a9 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEProcessingArray.java
@@ -5,21 +5,21 @@ 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.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.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.VN;
+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.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_GLOW;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
-import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine.isValidForLowGravity;
-import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.metatileentity.implementations.MTEBasicMachine.isValidForLowGravity;
+import static gregtech.api.util.GTUtility.filterValidMTEs;
 
 import java.util.List;
 
@@ -48,45 +48,45 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase;
-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_InputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+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.render.TextureFactory;
-import gregtech.api.util.GT_ExoticEnergyInputHelper;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_ProcessingArray_Manager;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Item_Machines;
+import gregtech.api.util.ExoticEnergyInputHelper;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.api.util.ProcessingArrayManager;
+import gregtech.common.blocks.ItemMachines;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
 @Deprecated
-public class GT_MetaTileEntity_ProcessingArray extends
-    GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_ProcessingArray> implements ISurvivalConstructable {
+public class MTEProcessingArray extends MTEExtendedPowerMultiBlockBase<MTEProcessingArray>
+    implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_ProcessingArray> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_ProcessingArray>builder()
+    private static final IStructureDefinition<MTEProcessingArray> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEProcessingArray>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(new String[][] { { "hhh", "hhh", "hhh" }, { "h~h", "h-h", "hhh" }, { "hhh", "hhh", "hhh" }, }))
@@ -94,12 +94,12 @@ public class GT_MetaTileEntity_ProcessingArray extends
             'h',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_ProcessingArray>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEProcessingArray>buildHatchAdder()
                         .atLeastList(t.getAllowedHatches())
                         .casingIndex(48)
                         .dot(1)
                         .build()),
-                onElementPass(t -> t.mCasingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0))))
+                onElementPass(t -> t.mCasingAmount++, ofBlock(GregTechAPI.sBlockCasings4, 0))))
         .build();
 
     private int mCasingAmount = 0;
@@ -110,22 +110,22 @@ public class GT_MetaTileEntity_ProcessingArray extends
     private int mMult = 0;
     private boolean downtierUEV = true;
 
-    public GT_MetaTileEntity_ProcessingArray(int aID, String aName, String aNameRegional) {
+    public MTEProcessingArray(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_ProcessingArray(String aName) {
+    public MTEProcessingArray(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ProcessingArray(this.mName);
+        return new MTEProcessingArray(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("Processing Array")
             .addInfo("Runs supplied machines as if placed in the world")
             .addInfo("Place up to 64 singleblock GT machines into the controller")
@@ -186,8 +186,7 @@ public class GT_MetaTileEntity_ProcessingArray extends
     private RecipeMap<?> fetchRecipeMap() {
         if (isCorrectMachinePart(getControllerSlot())) {
             // Gets the recipe map for the given machine through its unlocalized name
-            return GT_ProcessingArray_Manager
-                .giveRecipeMap(GT_ProcessingArray_Manager.getMachineName(getControllerSlot()));
+            return ProcessingArrayManager.giveRecipeMap(ProcessingArrayManager.getMachineName(getControllerSlot()));
         }
         return null;
     }
@@ -205,8 +204,8 @@ public class GT_MetaTileEntity_ProcessingArray extends
 
     @Override
     protected void sendStartMultiBlockSoundLoop() {
-        SoundResource sound = GT_ProcessingArray_Manager
-            .getSoundResource(GT_ProcessingArray_Manager.getMachineName(getControllerSlot()));
+        SoundResource sound = ProcessingArrayManager
+            .getSoundResource(ProcessingArrayManager.getMachineName(getControllerSlot()));
         if (sound != null) {
             sendLoopStart((byte) sound.id);
         }
@@ -217,14 +216,14 @@ public class GT_MetaTileEntity_ProcessingArray extends
         super.startSoundLoop(aIndex, aX, aY, aZ);
         SoundResource sound = SoundResource.get(aIndex < 0 ? aIndex + 256 : 0);
         if (sound != null) {
-            GT_Utility.doSoundAtClient(sound, getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(sound, getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
         }
     }
 
     @Override
     @NotNull
     public CheckRecipeResult checkProcessing() {
-        if (!GT_Utility.areStacksEqual(lastControllerStack, getControllerSlot())) {
+        if (!GTUtility.areStacksEqual(lastControllerStack, getControllerSlot())) {
             // controller slot has changed
             lastControllerStack = getControllerSlot();
             mLastRecipeMap = fetchRecipeMap();
@@ -246,8 +245,8 @@ public class GT_MetaTileEntity_ProcessingArray extends
 
             @Nonnull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
-                if (GT_Mod.gregtechproxy.mLowGravProcessing && recipe.mSpecialValue == -100
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
+                if (GTMod.gregtechproxy.mLowGravProcessing && recipe.mSpecialValue == -100
                     && !isValidForLowGravity(recipe, getBaseMetaTileEntity().getWorld().provider.dimensionId)) {
                     return SimpleCheckRecipeResult.ofFailure("high_gravity");
                 }
@@ -264,15 +263,15 @@ public class GT_MetaTileEntity_ProcessingArray extends
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Values.V[tTier] * (mLastRecipeMap != null ? mLastRecipeMap.getAmperage() : 1));
+        logic.setAvailableVoltage(GTValues.V[tTier] * (mLastRecipeMap != null ? mLastRecipeMap.getAmperage() : 1));
         logic.setAvailableAmperage(getMaxParallel());
         logic.setAmperageOC(false);
     }
 
     private void setTierAndMult() {
-        IMetaTileEntity aMachine = GT_Item_Machines.getMetaTileEntity(getControllerSlot());
-        if (aMachine instanceof GT_MetaTileEntity_TieredMachineBlock) {
-            tTier = ((GT_MetaTileEntity_TieredMachineBlock) aMachine).mTier;
+        IMetaTileEntity aMachine = ItemMachines.getMetaTileEntity(getControllerSlot());
+        if (aMachine instanceof MTETieredMachineBlock) {
+            tTier = ((MTETieredMachineBlock) aMachine).mTier;
         } else {
             tTier = 0;
         }
@@ -294,17 +293,17 @@ public class GT_MetaTileEntity_ProcessingArray extends
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPostTick(aBaseMetaTileEntity, aTick);
         if (mMachine && aTick % 20 == 0) {
-            for (GT_MetaTileEntity_Hatch_InputBus tInputBus : mInputBusses) {
+            for (MTEHatchInputBus tInputBus : mInputBusses) {
                 tInputBus.mRecipeMap = mLastRecipeMap;
             }
-            for (GT_MetaTileEntity_Hatch_Input tInputHatch : mInputHatches) {
+            for (MTEHatchInput tInputHatch : mInputHatches) {
                 tInputHatch.mRecipeMap = mLastRecipeMap;
             }
         }
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_ProcessingArray> getStructureDefinition() {
+    public IStructureDefinition<MTEProcessingArray> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -350,7 +349,7 @@ public class GT_MetaTileEntity_ProcessingArray extends
             super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ);
         } else {
             inputSeparation = !inputSeparation;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation);
         }
@@ -362,13 +361,13 @@ public class GT_MetaTileEntity_ProcessingArray extends
         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");
             }
         } else {
             downtierUEV = !downtierUEV;
-            GT_Utility.sendChatToPlayer(aPlayer, "Treat UEV+ machines as multiple UHV " + downtierUEV);
+            GTUtility.sendChatToPlayer(aPlayer, "Treat UEV+ machines as multiple UHV " + downtierUEV);
         }
         return true;
     }
@@ -388,7 +387,7 @@ public class GT_MetaTileEntity_ProcessingArray extends
         return false;
     }
 
-    private List<IHatchElement<? super GT_MetaTileEntity_ProcessingArray>> getAllowedHatches() {
+    private List<IHatchElement<? super MTEProcessingArray>> getAllowedHatches() {
         return ImmutableList.of(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy, ExoticEnergy);
     }
 
@@ -403,7 +402,7 @@ public class GT_MetaTileEntity_ProcessingArray extends
     public String[] getInfoData() {
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mExoticEnergyHatches)) {
+        for (MTEHatch tHatch : filterValidMTEs(mExoticEnergyHatches)) {
             storedEnergy += tHatch.getBaseMetaTileEntity()
                 .getStoredEU();
             maxEnergy += tHatch.getBaseMetaTileEntity()
@@ -413,41 +412,41 @@ public class GT_MetaTileEntity_ProcessingArray extends
         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.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(
-                    GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList()))
+                + GTUtility
+                    .formatNumbers(ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList()))
                 + EnumChatFormatting.RESET
                 + " EU/t(*"
-                + GT_Utility
-                    .formatNumbers(GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(getExoticAndNormalEnergyHatchList()))
+                + GTUtility
+                    .formatNumbers(ExoticEnergyInputHelper.getMaxInputAmpsMulti(getExoticAndNormalEnergyHatchList()))
                 + "A) "
                 + StatCollector.translateToLocal("GT5U.machines.tier")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + VN[GT_Utility
-                    .getTier(GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList()))]
+                + VN[GTUtility
+                    .getTier(ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList()))]
                 + EnumChatFormatting.RESET,
             StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
                 + EnumChatFormatting.RED
@@ -473,7 +472,7 @@ public class GT_MetaTileEntity_ProcessingArray extends
                 + " x",
             StatCollector.translateToLocal("GT5U.PA.parallel") + ": "
                 + EnumChatFormatting.GREEN
-                + GT_Utility.formatNumbers(getMaxParallel())
+                + GTUtility.formatNumbers(getMaxParallel())
                 + EnumChatFormatting.RESET };
     }
 
@@ -513,11 +512,11 @@ public class GT_MetaTileEntity_ProcessingArray extends
             .setPlayClickSound(true)
             .setBackground(() -> {
                 if (downtierUEV) {
-                    return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED,
-                        GT_UITextures.OVERLAY_BUTTON_DOWN_TIERING_ON };
+                    return new IDrawable[] { GTUITextures.BUTTON_STANDARD_PRESSED,
+                        GTUITextures.OVERLAY_BUTTON_DOWN_TIERING_ON };
                 } else {
-                    return new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
-                        GT_UITextures.OVERLAY_BUTTON_DOWN_TIERING_OFF };
+                    return new IDrawable[] { GTUITextures.BUTTON_STANDARD,
+                        GTUITextures.OVERLAY_BUTTON_DOWN_TIERING_OFF };
                 }
             })
             .setPos(80, 91)
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPyrolyseOven.java
index ff84a69b44..45d4c1931a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPyrolyseOven.java
@@ -4,20 +4,20 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockUnlocalizedName;
 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.NewHorizonsCoreMod;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofCoil;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -30,8 +30,8 @@ import com.gtnewhorizon.structurelib.structure.IStructureElement;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
@@ -39,26 +39,25 @@ 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_EnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_PyrolyseOven
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_PyrolyseOven> implements ISurvivalConstructable {
+public class MTEPyrolyseOven extends MTEEnhancedMultiBlockBase<MTEPyrolyseOven> implements ISurvivalConstructable {
 
     private HeatingCoilLevel coilHeat;
     private static final int CASING_INDEX = 1090;
-    private static final IStructureDefinition<GT_MetaTileEntity_PyrolyseOven> STRUCTURE_DEFINITION = createStructureDefinition();
+    private static final IStructureDefinition<MTEPyrolyseOven> STRUCTURE_DEFINITION = createStructureDefinition();
 
-    private static IStructureDefinition<GT_MetaTileEntity_PyrolyseOven> createStructureDefinition() {
-        IStructureElement<GT_MetaTileEntity_PyrolyseOven> tCasingElement = NewHorizonsCoreMod.isModLoaded()
+    private static IStructureDefinition<MTEPyrolyseOven> createStructureDefinition() {
+        IStructureElement<MTEPyrolyseOven> tCasingElement = NewHorizonsCoreMod.isModLoaded()
             ? ofBlockUnlocalizedName(NewHorizonsCoreMod.ID, "gt.blockcasingsNH", 2)
-            : ofBlock(GregTech_API.sBlockCasings1, 0);
+            : ofBlock(GregTechAPI.sBlockCasings1, 0);
 
-        return StructureDefinition.<GT_MetaTileEntity_PyrolyseOven>builder()
+        return StructureDefinition.<MTEPyrolyseOven>builder()
             .addShape(
                 "main",
                 transpose(
@@ -66,39 +65,36 @@ public class GT_MetaTileEntity_PyrolyseOven
                         { "ccccc", "c---c", "c---c", "c---c", "ccccc" },
                         { "ccccc", "c---c", "c---c", "c---c", "ccccc" },
                         { "bb~bb", "bCCCb", "bCCCb", "bCCCb", "bbbbb" }, }))
-            .addElement('c', onElementPass(GT_MetaTileEntity_PyrolyseOven::onCasingAdded, tCasingElement))
-            .addElement(
-                'C',
-                ofCoil(GT_MetaTileEntity_PyrolyseOven::setCoilLevel, GT_MetaTileEntity_PyrolyseOven::getCoilLevel))
+            .addElement('c', onElementPass(MTEPyrolyseOven::onCasingAdded, tCasingElement))
+            .addElement('C', ofCoil(MTEPyrolyseOven::setCoilLevel, MTEPyrolyseOven::getCoilLevel))
             .addElement(
                 'b',
-                buildHatchAdder(GT_MetaTileEntity_PyrolyseOven.class)
-                    .atLeast(OutputBus, OutputHatch, Energy, Maintenance)
+                buildHatchAdder(MTEPyrolyseOven.class).atLeast(OutputBus, OutputHatch, Energy, Maintenance)
                     .casingIndex(CASING_INDEX)
                     .dot(1)
-                    .buildAndChain(onElementPass(GT_MetaTileEntity_PyrolyseOven::onCasingAdded, tCasingElement)))
+                    .buildAndChain(onElementPass(MTEPyrolyseOven::onCasingAdded, tCasingElement)))
             .addElement(
                 't',
-                buildHatchAdder(GT_MetaTileEntity_PyrolyseOven.class).atLeast(InputBus, InputHatch, Muffler)
+                buildHatchAdder(MTEPyrolyseOven.class).atLeast(InputBus, InputHatch, Muffler)
                     .casingIndex(CASING_INDEX)
                     .dot(1)
-                    .buildAndChain(onElementPass(GT_MetaTileEntity_PyrolyseOven::onCasingAdded, tCasingElement)))
+                    .buildAndChain(onElementPass(MTEPyrolyseOven::onCasingAdded, tCasingElement)))
             .build();
     }
 
     private int mCasingAmount;
 
-    public GT_MetaTileEntity_PyrolyseOven(int aID, String aName, String aNameRegional) {
+    public MTEPyrolyseOven(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_PyrolyseOven(String aName) {
+    public MTEPyrolyseOven(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("Coke Oven")
             .addInfo("Controller block for the Pyrolyse Oven")
             .addInfo("Industrial Charcoal producer")
@@ -172,7 +168,7 @@ public class GT_MetaTileEntity_PyrolyseOven
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PyrolyseOven> getStructureDefinition() {
+    public IStructureDefinition<MTEPyrolyseOven> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -210,7 +206,7 @@ public class GT_MetaTileEntity_PyrolyseOven
 
     @Override
     public int getPollutionPerSecond(ItemStack aStack) {
-        return GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond;
+        return GTMod.gregtechproxy.mPollutionPyrolyseOvenPerSecond;
     }
 
     @Override
@@ -225,7 +221,7 @@ public class GT_MetaTileEntity_PyrolyseOven
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PyrolyseOven(this.mName);
+        return new MTEPyrolyseOven(this.mName);
     }
 
     private void replaceDeprecatedCoils(IGregTechTileEntity aBaseMetaTileEntity) {
@@ -236,10 +232,10 @@ public class GT_MetaTileEntity_PyrolyseOven
         final int tZ = aBaseMetaTileEntity.getZCoord() + zDir * 2;
         for (int xPos = tX - 1; xPos <= tX + 1; xPos++) {
             for (int zPos = tZ - 1; zPos <= tZ + 1; zPos++) {
-                if (aBaseMetaTileEntity.getBlock(xPos, tY, zPos) == GregTech_API.sBlockCasings1
+                if (aBaseMetaTileEntity.getBlock(xPos, tY, zPos) == GregTechAPI.sBlockCasings1
                     && aBaseMetaTileEntity.getMetaID(xPos, tY, zPos) == 13) {
                     aBaseMetaTileEntity.getWorld()
-                        .setBlock(xPos, tY, zPos, GregTech_API.sBlockCasings5, 1, 3);
+                        .setBlock(xPos, tY, zPos, GregTechAPI.sBlockCasings5, 1, 3);
                 }
             }
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java
index 749a94df57..c6fed966ef 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java
@@ -1,28 +1,28 @@
 package gregtech.common.tileentities.machines.multi;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-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.enums.GT_Values.AuthorColen;
+import static gregtech.api.enums.GTValues.AuthorColen;
+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.enums.Textures.BlockIcons.OVERLAY_DTPF_OFF;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_DTPF_ON;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION1_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTUtility.formatNumbers;
 import static gregtech.common.misc.WirelessNetworkManager.addEUToGlobalEnergyMap;
 import static gregtech.common.misc.WirelessNetworkManager.getUserEU;
 import static gregtech.common.misc.WirelessNetworkManager.processInitialSettings;
-import static gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PlasmaForge.DIM_BRIDGE_CASING;
-import static gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PlasmaForge.DIM_INJECTION_CASING;
-import static gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PlasmaForge.DIM_TRANS_CASING;
+import static gregtech.common.tileentities.machines.multi.MTEPlasmaForge.DIM_BRIDGE_CASING;
+import static gregtech.common.tileentities.machines.multi.MTEPlasmaForge.DIM_INJECTION_CASING;
+import static gregtech.common.tileentities.machines.multi.MTEPlasmaForge.DIM_TRANS_CASING;
+import static kekztech.util.Util.toStandardForm;
 import static net.minecraft.util.EnumChatFormatting.GOLD;
 import static net.minecraft.util.EnumChatFormatting.GRAY;
 import static net.minecraft.util.StatCollector.translateToLocal;
-import static util.Util.toStandardForm;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -56,24 +56,23 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.GregTechAPI;
+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_EnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
 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.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;
 
-public class GT_MetaTileEntity_TranscendentPlasmaMixer
-    extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_TranscendentPlasmaMixer>
+public class MTETranscendentPlasmaMixer extends MTEEnhancedMultiBlockBase<MTETranscendentPlasmaMixer>
     implements ISurvivalConstructable {
 
     private static final String[][] structure = new String[][] {
@@ -84,38 +83,37 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
         { " CAC ", " ABA ", " ABA ", " ABA ", " ABA ", " ABA ", " CAC " } };
 
     private static final String STRUCTURE_PIECE_MAIN = "MAIN";
-    private static final IStructureDefinition<GT_MetaTileEntity_TranscendentPlasmaMixer> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_TranscendentPlasmaMixer>builder()
+    private static final IStructureDefinition<MTETranscendentPlasmaMixer> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTETranscendentPlasmaMixer>builder()
         .addShape(STRUCTURE_PIECE_MAIN, structure)
         .addElement(
             'B',
-            buildHatchAdder(GT_MetaTileEntity_TranscendentPlasmaMixer.class)
-                .atLeast(InputHatch, OutputHatch, InputBus, Maintenance)
+            buildHatchAdder(MTETranscendentPlasmaMixer.class).atLeast(InputHatch, OutputHatch, InputBus, Maintenance)
                 .casingIndex(DIM_INJECTION_CASING)
                 .dot(1)
-                .buildAndChain(GregTech_API.sBlockCasings1, DIM_INJECTION_CASING))
-        .addElement('A', ofBlock(GregTech_API.sBlockCasings1, DIM_TRANS_CASING))
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings1, DIM_BRIDGE_CASING))
+                .buildAndChain(GregTechAPI.sBlockCasings1, DIM_INJECTION_CASING))
+        .addElement('A', ofBlock(GregTechAPI.sBlockCasings1, DIM_TRANS_CASING))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings1, DIM_BRIDGE_CASING))
         .build();
 
     private UUID ownerUUID;
 
-    public GT_MetaTileEntity_TranscendentPlasmaMixer(int aID, String aName, String aNameRegional) {
+    public MTETranscendentPlasmaMixer(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_TranscendentPlasmaMixer(String aName) {
+    public MTETranscendentPlasmaMixer(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_TranscendentPlasmaMixer> getStructureDefinition() {
+    public IStructureDefinition<MTETranscendentPlasmaMixer> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
     @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("Transcendent Mixer")
             .addInfo("Assisting in all your DTPF needs.")
             .addInfo("This multiblock will run in parallel according to the amount set")
@@ -133,7 +131,7 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_TranscendentPlasmaMixer(mName);
+        return new MTETranscendentPlasmaMixer(mName);
     }
 
     @Override
@@ -179,7 +177,7 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) {
                 BigInteger availableEU = getUserEU(ownerUUID);
                 recipeEU = BigInteger.valueOf(10L * recipe.mEUt * recipe.mDuration);
                 if (availableEU.compareTo(recipeEU) < 0) {
@@ -194,7 +192,7 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
 
             @NotNull
             @Override
-            protected CheckRecipeResult onRecipeStart(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult onRecipeStart(@Nonnull GTRecipe recipe) {
                 finalConsumption = recipeEU.multiply(BigInteger.valueOf(-calculatedParallels));
                 // This will void the inputs if wireless energy has dropped
                 // below the required amount between validateRecipe and here.
@@ -208,8 +206,8 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
 
             @Nonnull
             @Override
-            protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) {
-                return GT_OverclockCalculator.ofNoOverclock(recipe);
+            protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) {
+                return OverclockCalculator.ofNoOverclock(recipe);
             }
         }.setMaxParallelSupplier(() -> multiplier);
     }
@@ -298,8 +296,8 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
             .setPlayClickSound(true)
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
-                ret.add(GT_UITextures.BUTTON_STANDARD);
-                ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON);
+                ret.add(GTUITextures.BUTTON_STANDARD);
+                ret.add(GTUITextures.OVERLAY_BUTTON_BATCH_MODE_ON);
                 return ret.toArray(new IDrawable[0]);
             })
             .addTooltip(translateToLocal("GT5U.tpm.parallelwindow"))
@@ -315,7 +313,7 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
         final int PARENT_WIDTH = getGUIWidth();
         final int PARENT_HEIGHT = getGUIHeight();
         ModularWindow.Builder builder = ModularWindow.builder(WIDTH, HEIGHT);
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.setGuiTint(getGUIColorization());
         builder.setDraggable(true);
         builder.setPos(
@@ -338,7 +336,7 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer
                     .setTextColor(Color.WHITE.normal)
                     .setSize(150, 18)
                     .setPos(4, 25)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                     .attachSyncer(
                         new FakeSyncWidget.IntegerSyncer(() -> multiplier, (val) -> multiplier = val),
                         builder));
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEVacuumFreezer.java
index 499da54bc3..c2879e0ab7 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEVacuumFreezer.java
@@ -1,11 +1,11 @@
 package gregtech.common.tileentities.machines.multi;
 
-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.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.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE_GLOW;
@@ -21,37 +21,36 @@ import com.google.common.collect.ImmutableList;
 import com.gtnewhorizon.structurelib.structure.IStructureElement;
 import com.gtnewhorizon.structurelib.structure.StructureUtility;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_CubicMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTECubicMultiBlockBase;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_VacuumFreezer
-    extends GT_MetaTileEntity_CubicMultiBlockBase<GT_MetaTileEntity_VacuumFreezer> {
+public class MTEVacuumFreezer extends MTECubicMultiBlockBase<MTEVacuumFreezer> {
 
-    public GT_MetaTileEntity_VacuumFreezer(int aID, String aName, String aNameRegional) {
+    public MTEVacuumFreezer(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_VacuumFreezer(String aName) {
+    public MTEVacuumFreezer(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_VacuumFreezer(this.mName);
+        return new MTEVacuumFreezer(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("Vacuum Freezer")
             .addInfo("Controller Block for the Vacuum Freezer")
             .addInfo("Cools hot ingots and cells")
@@ -117,12 +116,12 @@ public class GT_MetaTileEntity_VacuumFreezer
     }
 
     @Override
-    protected IStructureElement<GT_MetaTileEntity_CubicMultiBlockBase<?>> getCasingElement() {
-        return StructureUtility.ofBlock(GregTech_API.sBlockCasings2, 1);
+    protected IStructureElement<MTECubicMultiBlockBase<?>> getCasingElement() {
+        return StructureUtility.ofBlock(GregTechAPI.sBlockCasings2, 1);
     }
 
     @Override
-    protected List<IHatchElement<? super GT_MetaTileEntity_CubicMultiBlockBase<?>>> getAllowedHatches() {
+    protected List<IHatchElement<? super MTECubicMultiBlockBase<?>>> getAllowedHatches() {
         return ImmutableList.of(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy);
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_WormholeGenerator.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java
index eeb5770800..12153fc10e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_WormholeGenerator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java
@@ -5,12 +5,12 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel;
 import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
-import static gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.enums.GTValues.VN;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.Maintenance;
 import static gregtech.api.enums.Textures.BlockIcons.getCasingTextureForId;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -35,11 +35,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
-import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.google.common.collect.MapMaker;
 import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
@@ -51,8 +46,9 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import appeng.api.AEApi;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import bartworks.API.BorosilicateGlass;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TierEU;
 import gregtech.api.interfaces.IHatchElement;
@@ -61,18 +57,22 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.ResultMissingItem;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.IGT_HatchAdder;
-import gregtech.common.tileentities.render.TileWormhole;
+import gregtech.api.util.IGTHatchAdder;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.tileentities.render.TileEntityWormhole;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+import tectech.thing.casing.BlockGTCasingsTT;
+import tectech.thing.casing.TTCasingsContainer;
+import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoMulti;
+import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti;
 
-public class GT_MetaTileEntity_WormholeGenerator extends
-    GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_WormholeGenerator> implements ISurvivalConstructable {
+public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeGenerator>
+    implements ISurvivalConstructable {
 
     /**
      * Number of seconds to average the wormhole energy over.
@@ -112,7 +112,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
     private static final String STRUCTURE_PIECE_MAIN = "main";
     private static final byte GLASS_TIER_UNSET = -2;
 
-    private static final int TT_CASING_INDEX = GT_Block_CasingsTT.textureOffset;
+    private static final int TT_CASING_INDEX = BlockGTCasingsTT.textureOffset;
 
     private static final int TOP_HATCH = 0, BOTTOM_HATCH = 1, LEFT_HATCH = 2, RIGHT_HATCH = 3, BACK_HATCH = 4,
         FRONT_HATCH = 5, MAX_HATCHES = 6;
@@ -126,8 +126,8 @@ public class GT_MetaTileEntity_WormholeGenerator extends
     private byte mGlassTier = -2;
     private boolean mStructureBadGlassTier = false;
 
-    private final GT_MetaTileEntity_Hatch_EnergyMulti[] mSendHatches = new GT_MetaTileEntity_Hatch_EnergyMulti[MAX_HATCHES];
-    private final GT_MetaTileEntity_Hatch_DynamoMulti[] mReceiveHatches = new GT_MetaTileEntity_Hatch_DynamoMulti[MAX_HATCHES];
+    private final MTEHatchEnergyMulti[] mSendHatches = new MTEHatchEnergyMulti[MAX_HATCHES];
+    private final MTEHatchDynamoMulti[] mReceiveHatches = new MTEHatchDynamoMulti[MAX_HATCHES];
 
     private final ItemStack singularity = AEApi.instance()
         .definitions()
@@ -143,23 +143,23 @@ public class GT_MetaTileEntity_WormholeGenerator extends
         .get();
 
     private WormholeLink mLink;
-    private final WeakReference<GT_MetaTileEntity_WormholeGenerator> mSelfReference = new WeakReference<>(this);
+    private final WeakReference<MTEWormholeGenerator> mSelfReference = new WeakReference<>(this);
 
     private double mWormholeEnergy_UI = 0;
 
     private boolean mIsUnloading = false;
 
-    public GT_MetaTileEntity_WormholeGenerator(int aID, String aName, String aNameRegional) {
+    public MTEWormholeGenerator(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_WormholeGenerator(String aName) {
+    public MTEWormholeGenerator(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_WormholeGenerator(mName);
+        return new MTEWormholeGenerator(mName);
     }
 
     @Override
@@ -184,8 +184,8 @@ public class GT_MetaTileEntity_WormholeGenerator extends
     // #region Structure
 
     // spotless:off
-    private static final IStructureDefinition<GT_MetaTileEntity_WormholeGenerator> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_WormholeGenerator>builder()
+    private static final IStructureDefinition<MTEWormholeGenerator> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEWormholeGenerator>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             transpose(
@@ -199,11 +199,11 @@ public class GT_MetaTileEntity_WormholeGenerator extends
                     {"       ","   F   ","  EEE  "," FEbEF ","  EEE  ","   F   ","       "}
                 }))
         .addElement('E',
-            buildHatchAdder(GT_MetaTileEntity_WormholeGenerator.class)
+            buildHatchAdder(MTEWormholeGenerator.class)
                 .atLeast(Maintenance, InputBus)
                 .casingIndex(TT_CASING_INDEX) // High Power Casing
                 .dot(1)
-                .buildAndChain(lazy(() -> ofBlock(TT_Container_Casings.sBlockCasingsTT, 0))) // High Power Casing
+                .buildAndChain(lazy(() -> ofBlock(TTCasingsContainer.sBlockCasingsTT, 0))) // High Power Casing
         )
         .addElement(
             'A',
@@ -211,41 +211,41 @@ public class GT_MetaTileEntity_WormholeGenerator extends
                 "glass",
                 BorosilicateGlass.ofBoroGlass(GLASS_TIER_UNSET, (te, t) -> te.mGlassTier = t, te -> te.mGlassTier))
         )
-        .addElement('D', ofBlock(GregTech_API.sBlockCasings8, 5)) // Europium Reinforced Radiation Proof Machine Casing
-        .addElement('B', ofBlock(GregTech_API.sBlockCasings4, 7)) // Fusion Coil Block
-        .addElement('F', lazy(() -> ofBlock(TT_Container_Casings.sBlockCasingsTT, 4))) // Molecular Casing
+        .addElement('D', ofBlock(GregTechAPI.sBlockCasings8, 5)) // Europium Reinforced Radiation Proof Machine Casing
+        .addElement('B', ofBlock(GregTechAPI.sBlockCasings4, 7)) // Fusion Coil Block
+        .addElement('F', lazy(() -> ofBlock(TTCasingsContainer.sBlockCasingsTT, 4))) // Molecular Casing
         .addElement('t',
-            buildHatchAdder(GT_MetaTileEntity_WormholeGenerator.class)
+            buildHatchAdder(MTEWormholeGenerator.class)
                 .anyOf(new TransferHatch(TOP_HATCH))
                 .casingIndex(TT_CASING_INDEX) // High Power Casing
                 .dot(2)
-                .buildAndChain(lazy(() -> ofBlock(TT_Container_Casings.sBlockCasingsTT, 0))) // High Power Casing
+                .buildAndChain(lazy(() -> ofBlock(TTCasingsContainer.sBlockCasingsTT, 0))) // High Power Casing
         )
         .addElement('b',
-            buildHatchAdder(GT_MetaTileEntity_WormholeGenerator.class)
+            buildHatchAdder(MTEWormholeGenerator.class)
                 .anyOf(new TransferHatch(BOTTOM_HATCH))
                 .casingIndex(TT_CASING_INDEX) // High Power Casing
                 .dot(2)
-                .buildAndChain(lazy(() -> ofBlock(TT_Container_Casings.sBlockCasingsTT, 0))) // High Power Casing
+                .buildAndChain(lazy(() -> ofBlock(TTCasingsContainer.sBlockCasingsTT, 0))) // High Power Casing
         )
         .addElement('l',
-            buildHatchAdder(GT_MetaTileEntity_WormholeGenerator.class)
+            buildHatchAdder(MTEWormholeGenerator.class)
                 .anyOf(new TransferHatch(LEFT_HATCH))
                 .casingIndex(TT_CASING_INDEX) // High Power Casing
                 .dot(2)
-                .buildAndChain(lazy(() -> ofBlock(TT_Container_Casings.sBlockCasingsTT, 0))) // High Power Casing
+                .buildAndChain(lazy(() -> ofBlock(TTCasingsContainer.sBlockCasingsTT, 0))) // High Power Casing
         )
         .addElement('r',
-            buildHatchAdder(GT_MetaTileEntity_WormholeGenerator.class)
+            buildHatchAdder(MTEWormholeGenerator.class)
                 .anyOf(new TransferHatch(RIGHT_HATCH))
                 .casingIndex(TT_CASING_INDEX) // High Power Casing
                 .dot(2)
-                .buildAndChain(lazy(() -> ofBlock(TT_Container_Casings.sBlockCasingsTT, 0))) // High Power Casing
+                .buildAndChain(lazy(() -> ofBlock(TTCasingsContainer.sBlockCasingsTT, 0))) // High Power Casing
         )
         .build();
     // spotless:on
 
-    private static class TransferHatch implements IHatchElement<GT_MetaTileEntity_WormholeGenerator> {
+    private static class TransferHatch implements IHatchElement<MTEWormholeGenerator> {
 
         public final int mIndex;
 
@@ -255,11 +255,11 @@ public class GT_MetaTileEntity_WormholeGenerator extends
 
         @Override
         public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
-            return Arrays.asList(GT_MetaTileEntity_Hatch_EnergyMulti.class, GT_MetaTileEntity_Hatch_DynamoMulti.class);
+            return Arrays.asList(MTEHatchEnergyMulti.class, MTEHatchDynamoMulti.class);
         }
 
         @Override
-        public IGT_HatchAdder<? super GT_MetaTileEntity_WormholeGenerator> adder() {
+        public IGTHatchAdder<? super MTEWormholeGenerator> adder() {
             return (tile, aTileEntity, aBaseCasingIndex) -> {
                 if (aTileEntity == null) return false;
 
@@ -267,12 +267,12 @@ public class GT_MetaTileEntity_WormholeGenerator extends
 
                 if (aMetaTileEntity == null) return false;
 
-                if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti input) {
+                if (aMetaTileEntity instanceof MTEHatchEnergyMulti input) {
                     input.updateTexture(aBaseCasingIndex);
                     input.updateCraftingIcon(tile.getMachineCraftingIcon());
                     tile.mSendHatches[mIndex] = input;
                     return true;
-                } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti output) {
+                } else if (aMetaTileEntity instanceof MTEHatchDynamoMulti output) {
                     output.updateTexture(aBaseCasingIndex);
                     output.updateCraftingIcon(tile.getMachineCraftingIcon());
                     tile.mReceiveHatches[mIndex] = output;
@@ -289,7 +289,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
         }
 
         @Override
-        public long count(GT_MetaTileEntity_WormholeGenerator t) {
+        public long count(MTEWormholeGenerator t) {
             return t.mExoticEnergyHatches.size();
         }
     }
@@ -305,7 +305,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_WormholeGenerator> getStructureDefinition() {
+    public IStructureDefinition<MTEWormholeGenerator> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -402,7 +402,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
     }
 
     @Nullable
-    private TileWormhole createRenderBlock() {
+    private TileEntityWormhole createRenderBlock() {
 
         IGregTechTileEntity gregTechTileEntity = this.getBaseMetaTileEntity();
         World world = gregTechTileEntity.getWorld();
@@ -424,9 +424,9 @@ public class GT_MetaTileEntity_WormholeGenerator extends
         int zTarget = z + zOffset;
 
         world.setBlock(xTarget, yTarget, zTarget, Blocks.air);
-        world.setBlock(xTarget, yTarget, zTarget, GregTech_API.sWormholeRender);
+        world.setBlock(xTarget, yTarget, zTarget, GregTechAPI.sWormholeRender);
 
-        TileWormhole wormhole = (TileWormhole) world.getTileEntity(xTarget, yTarget, zTarget);
+        TileEntityWormhole wormhole = (TileEntityWormhole) world.getTileEntity(xTarget, yTarget, zTarget);
 
         if (wormhole == null) {
             return null;
@@ -435,7 +435,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
     }
 
     @Nullable
-    private TileWormhole getRenderBlock() {
+    private TileEntityWormhole getRenderBlock() {
         IGregTechTileEntity gregTechTileEntity = this.getBaseMetaTileEntity();
 
         int x = gregTechTileEntity.getXCoord();
@@ -453,13 +453,13 @@ public class GT_MetaTileEntity_WormholeGenerator extends
         TileEntity tile = Optional.ofNullable(gregTechTileEntity.getWorld())
             .map(w -> w.getTileEntity(wX, wY, wZ))
             .orElse(null);
-        if (tile instanceof TileWormhole wormhole) return wormhole;
+        if (tile instanceof TileEntityWormhole wormhole) return wormhole;
         return null;
 
     }
 
     public void updateRenderDim() {
-        TileWormhole temp = getRenderBlock();
+        TileEntityWormhole temp = getRenderBlock();
 
         World target = Optional.ofNullable(mLink)
             .map(link -> link.getDest(mSelfReference))
@@ -467,7 +467,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
             .map(IHasWorldObjectAndCoords::getWorld)
             .orElse(null);
 
-        TileWormhole hole = getRenderBlock();
+        TileEntityWormhole hole = getRenderBlock();
         if (hole == null) hole = createRenderBlock();
 
         if (hole != null) {
@@ -476,7 +476,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
     }
 
     public void updateRenderRadius(double radius) {
-        TileWormhole hole = getRenderBlock();
+        TileEntityWormhole hole = getRenderBlock();
         if (hole == null) hole = createRenderBlock();
 
         if (hole != null) {
@@ -694,7 +694,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
                 aNBT.setTag("mLink", link);
             }
         } catch (Throwable t) {
-            GT_Mod.GT_FML_LOGGER.error("Could not save GT_MetaTileEntity_WormholeGenerator", t);
+            GTMod.GT_FML_LOGGER.error("Could not save GT_MetaTileEntity_WormholeGenerator", t);
         }
 
     }
@@ -742,7 +742,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
                         Math.min(send_amounts.length, mLink.mSendAmounts.length));
                 }
             } catch (Throwable t) {
-                GT_Mod.GT_FML_LOGGER.error("Could not load GT_MetaTileEntity_WormholeGenerator", t);
+                GTMod.GT_FML_LOGGER.error("Could not load GT_MetaTileEntity_WormholeGenerator", t);
             }
         }
     }
@@ -754,7 +754,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
 
         public final long mFrequency;
 
-        public WeakReference<GT_MetaTileEntity_WormholeGenerator> mMaster, mSlave;
+        public WeakReference<MTEWormholeGenerator> mMaster, mSlave;
 
         public final long[] mSendAmounts = new long[MAX_HATCHES];
         public final long[] mReceiveAmounts = new long[MAX_HATCHES];
@@ -770,7 +770,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
             return WORMHOLE_GENERATORS.computeIfAbsent(frequency, WormholeLink::new);
         }
 
-        public void update(WeakReference<GT_MetaTileEntity_WormholeGenerator> updater) {
+        public void update(WeakReference<MTEWormholeGenerator> updater) {
             tryPromote();
 
             if (isMaster(updater)) {
@@ -813,11 +813,11 @@ public class GT_MetaTileEntity_WormholeGenerator extends
             mPendingEnergy += amount;
         }
 
-        public boolean isMaster(WeakReference<GT_MetaTileEntity_WormholeGenerator> tile) {
+        public boolean isMaster(WeakReference<MTEWormholeGenerator> tile) {
             return mMaster == tile;
         }
 
-        public boolean isConnected(WeakReference<GT_MetaTileEntity_WormholeGenerator> tile) {
+        public boolean isConnected(WeakReference<MTEWormholeGenerator> tile) {
             return mMaster == tile || mSlave == tile;
         }
 
@@ -825,18 +825,18 @@ public class GT_MetaTileEntity_WormholeGenerator extends
             return mMaster != null && mSlave != null;
         }
 
-        public boolean connect(WeakReference<GT_MetaTileEntity_WormholeGenerator> tile) {
+        public boolean connect(WeakReference<MTEWormholeGenerator> tile) {
             tryPromote();
 
             if (mMaster == null) {
                 mMaster = tile;
                 Optional.ofNullable(mMaster)
                     .map(Reference::get)
-                    .ifPresent(GT_MetaTileEntity_WormholeGenerator::updateRenderDim);
+                    .ifPresent(MTEWormholeGenerator::updateRenderDim);
 
                 Optional.ofNullable(mSlave)
                     .map(Reference::get)
-                    .ifPresent(GT_MetaTileEntity_WormholeGenerator::updateRenderDim);
+                    .ifPresent(MTEWormholeGenerator::updateRenderDim);
                 return true;
             }
             if (mSlave == null) {
@@ -844,11 +844,11 @@ public class GT_MetaTileEntity_WormholeGenerator extends
 
                 Optional.of(mMaster)
                     .map(Reference::get)
-                    .ifPresent(GT_MetaTileEntity_WormholeGenerator::updateRenderDim);
+                    .ifPresent(MTEWormholeGenerator::updateRenderDim);
 
                 Optional.ofNullable(mSlave)
                     .map(Reference::get)
-                    .ifPresent(GT_MetaTileEntity_WormholeGenerator::updateRenderDim);
+                    .ifPresent(MTEWormholeGenerator::updateRenderDim);
 
                 return true;
             }
@@ -856,7 +856,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
             return false;
         }
 
-        public void disconnect(WeakReference<GT_MetaTileEntity_WormholeGenerator> tile) {
+        public void disconnect(WeakReference<MTEWormholeGenerator> tile) {
             Objects.requireNonNull(tile.get())
                 .destroyRenderBlock();
 
@@ -880,8 +880,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
             }
         }
 
-        private static WeakReference<GT_MetaTileEntity_WormholeGenerator> tryClean(
-            WeakReference<GT_MetaTileEntity_WormholeGenerator> tileReference) {
+        private static WeakReference<MTEWormholeGenerator> tryClean(WeakReference<MTEWormholeGenerator> tileReference) {
             if (tileReference != null) {
                 var tile = tileReference.get();
 
@@ -899,7 +898,7 @@ public class GT_MetaTileEntity_WormholeGenerator extends
             return tileReference;
         }
 
-        public GT_MetaTileEntity_WormholeGenerator getDest(WeakReference<GT_MetaTileEntity_WormholeGenerator> tile) {
+        public MTEWormholeGenerator getDest(WeakReference<MTEWormholeGenerator> tile) {
             if (tile == mMaster) {
                 return mSlave != null ? mSlave.get() : null;
             }
@@ -914,13 +913,13 @@ public class GT_MetaTileEntity_WormholeGenerator extends
         public boolean isActive() {
             boolean masterCanWork = Optional.ofNullable(mMaster)
                 .map(WeakReference::get)
-                .map(GT_MetaTileEntity_WormholeGenerator::getBaseMetaTileEntity)
+                .map(MTEWormholeGenerator::getBaseMetaTileEntity)
                 .map(IGregTechTileEntity::isAllowedToWork)
                 .orElse(false);
 
             boolean slaveCanWork = Optional.ofNullable(mSlave)
                 .map(WeakReference::get)
-                .map(GT_MetaTileEntity_WormholeGenerator::getBaseMetaTileEntity)
+                .map(MTEWormholeGenerator::getBaseMetaTileEntity)
                 .map(IGregTechTileEntity::isAllowedToWork)
                 .orElse(false);
 
@@ -933,8 +932,8 @@ public class GT_MetaTileEntity_WormholeGenerator extends
     // #region UI
 
     @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();
 
         // spotless:off
         tt.addMachineType("Wormhole Generator")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_BlackHoleCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java
index 0b36d35cf8..ba893e045d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_BlackHoleCompressor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java
@@ -1,15 +1,15 @@
 package gregtech.common.tileentities.machines.multi.compressor;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.enums.GT_HatchElement.*;
-import static gregtech.api.enums.GT_Values.AuthorFourIsTheNumber;
-import static gregtech.api.enums.GT_Values.Ollie;
+import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber;
+import static gregtech.api.enums.GTValues.Ollie;
+import static gregtech.api.enums.HatchElement.*;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -37,39 +37,38 @@ 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.MaterialsUEVplus;
 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_ExtendedPowerMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
 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.metadata.CompressionTierKey;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Casings10;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.blocks.BlockCasings10;
+import gregtech.common.items.MetaGeneratedItem01;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_BlackHoleCompressor
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_BlackHoleCompressor>
+public class MTEBlackHoleCompressor extends MTEExtendedPowerMultiBlockBase<MTEBlackHoleCompressor>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_BlackHoleCompressor> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_BlackHoleCompressor>builder()
+    private static final IStructureDefinition<MTEBlackHoleCompressor> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEBlackHoleCompressor>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             // spotless:off
@@ -109,27 +108,23 @@ public class GT_MetaTileEntity_BlackHoleCompressor
                 {"                                   ","                                   ","                                   ","                                   ","                                   ","                                   ","                                   ","                                   ","                                   ","              CC   CC              ","              CC   CC              ","              CC   CC              ","             CCC   CCC             ","            CCC     CCC            ","         CCCCC       CCCCC         ","         CCCC         CCCC         ","                                   ","                                   ","                                   ","         CCCC         CCCC         ","         CCCCC       CCCCC         ","            CCC     CCC            ","             CCC   CCC             ","              CC   CC              ","              CC   CC              ","              CC   CC              ","                                   ","                                   ","                                   ","                                   ","                                   ","                                   ","                                   ","                                   ","                                   "}
             }))
             //spotless:on
-        .addElement('A', ofBlock(GregTech_API.sBlockGlass1, 4))
+        .addElement('A', ofBlock(GregTechAPI.sBlockGlass1, 4))
         .addElement(
             'B',
-            buildHatchAdder(GT_MetaTileEntity_BlackHoleCompressor.class).atLeast(Maintenance, Energy)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(12))
+            buildHatchAdder(MTEBlackHoleCompressor.class).atLeast(Maintenance, Energy)
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(12))
                 .dot(2)
                 .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_BlackHoleCompressor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings10, 12))))
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings10, 11))
+                    onElementPass(MTEBlackHoleCompressor::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings10, 12))))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings10, 11))
         .addElement('D', ofFrame(Materials.NaquadahAlloy))
         .addElement(
             'E',
-            buildHatchAdder(GT_MetaTileEntity_BlackHoleCompressor.class).atLeast(InputBus, OutputBus, InputHatch)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(11))
+            buildHatchAdder(MTEBlackHoleCompressor.class).atLeast(InputBus, OutputBus, InputHatch)
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(11))
                 .dot(1)
                 .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_BlackHoleCompressor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings10, 11))))
+                    onElementPass(MTEBlackHoleCompressor::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings10, 11))))
 
         .build();
 
@@ -140,16 +135,16 @@ public class GT_MetaTileEntity_BlackHoleCompressor
     private final FluidStack blackholeCatalyzingCost = (MaterialsUEVplus.SpaceTime).getMolten(1);
     private int catalyzingCostModifier = 1;
 
-    public GT_MetaTileEntity_BlackHoleCompressor(final int aID, final String aName, final String aNameRegional) {
+    public MTEBlackHoleCompressor(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_BlackHoleCompressor(String aName) {
+    public MTEBlackHoleCompressor(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_BlackHoleCompressor> getStructureDefinition() {
+    public IStructureDefinition<MTEBlackHoleCompressor> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -160,7 +155,7 @@ public class GT_MetaTileEntity_BlackHoleCompressor
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_BlackHoleCompressor(this.mName);
+        return new MTEBlackHoleCompressor(this.mName);
     }
 
     @Override
@@ -170,8 +165,8 @@ public class GT_MetaTileEntity_BlackHoleCompressor
 
     @Override
     public void setMachineModeIcons() {
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_COMPRESSING);
-        machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_SINGULARITY);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_COMPRESSING);
+        machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_SINGULARITY);
     }
 
     @Override
@@ -195,7 +190,7 @@ public class GT_MetaTileEntity_BlackHoleCompressor
             if (aActive) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 11)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 11)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE)
                         .extFacing()
@@ -208,7 +203,7 @@ public class GT_MetaTileEntity_BlackHoleCompressor
             } else {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 11)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 11)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_COMPRESSOR)
                         .extFacing()
@@ -221,14 +216,14 @@ public class GT_MetaTileEntity_BlackHoleCompressor
             }
         } else {
             rTexture = new ITexture[] { Textures.BlockIcons
-                .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 11)) };
+                .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 11)) };
         }
         return rTexture;
     }
 
     @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("Compressor/Advanced Neutronium Compressor")
             .addInfo("Controller Block for the Semi-Stable Black Hole Containment Field")
             .addInfo(EnumChatFormatting.LIGHT_PURPLE + "Uses the immense power of the event horizon to compress things")
@@ -356,7 +351,7 @@ public class GT_MetaTileEntity_BlackHoleCompressor
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+        logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
         logic.setAvailableAmperage(1L);
     }
 
@@ -393,12 +388,12 @@ public class GT_MetaTileEntity_BlackHoleCompressor
 
             @NotNull
             @Override
-            protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
+            protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) {
 
                 // Loop through all items and look for the Activation and Deactivation Catalysts
                 // Deactivation resets stability to 100 and catalyzing cost to 1
                 for (ItemStack inputItem : inputItems) {
-                    if (inputItem.getItem() instanceof GT_MetaGenerated_Item_01) {
+                    if (inputItem.getItem() instanceof MetaGeneratedItem01) {
                         if (inputItem.getItemDamage() == 32418 && !blackholeOn) {
                             inputItem.stackSize -= 1;
                             blackholeOn = true;
@@ -417,7 +412,7 @@ public class GT_MetaTileEntity_BlackHoleCompressor
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
 
                 // Default speed bonus
                 setSpeedBonus(1F);
@@ -435,7 +430,7 @@ public class GT_MetaTileEntity_BlackHoleCompressor
             }
 
             @Nonnull
-            protected CheckRecipeResult onRecipeStart(@Nonnull GT_Recipe recipe) {
+            protected CheckRecipeResult onRecipeStart(@Nonnull GTRecipe recipe) {
                 // If recipe needs a black hole and one is active but unstable, continuously void items
                 if (blackHoleStability <= 0 && recipe.getMetadataOrDefault(CompressionTierKey.INSTANCE, 1) > 0) {
                     return CheckRecipeResultRegistry.UNSTABLE_BLACK_HOLE;
@@ -461,7 +456,7 @@ public class GT_MetaTileEntity_BlackHoleCompressor
                 // If found enough, drain it and reduce stability loss to 0
                 // Every 30 drains, double the cost
                 FluidStack totalCost = new FluidStack(blackholeCatalyzingCost, catalyzingCostModifier);
-                for (GT_MetaTileEntity_Hatch_Input hatch : mInputHatches) {
+                for (MTEHatchInput hatch : mInputHatches) {
                     if (drain(hatch, totalCost, false)) {
                         drain(hatch, totalCost, true);
                         catalyzingCounter += 1;
@@ -479,7 +474,7 @@ public class GT_MetaTileEntity_BlackHoleCompressor
     }
 
     public int getMaxParallelRecipes() {
-        int parallels = (8 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        int parallels = (8 * GTUtility.getTier(this.getMaxInputVoltage()));
         if (blackHoleStability < 60) {
             parallels *= 2;
             if (blackHoleStability < 20) parallels *= 2;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_HIPCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEHIPCompressor.java
index bb79cf692b..2491dcff38 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_HIPCompressor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEHIPCompressor.java
@@ -1,17 +1,17 @@
 package gregtech.common.tileentities.machines.multi.compressor;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.enums.GT_HatchElement.*;
-import static gregtech.api.enums.GT_Values.AuthorFourIsTheNumber;
-import static gregtech.api.enums.GT_Values.Ollie;
+import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber;
+import static gregtech.api.enums.GTValues.Ollie;
+import static gregtech.api.enums.HatchElement.*;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofCoil;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofCoil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,13 +28,13 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.github.bartimaeusnek.bartworks.util.MathUtils;
 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 bartworks.util.MathUtils;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IHatchElement;
@@ -42,28 +42,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.MTEExtendedPowerMultiBlockBase;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.metadata.CompressionTierKey;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.IGT_HatchAdder;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.IGTHatchAdder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.SimpleShutDownReason;
-import gregtech.common.blocks.GT_Block_Casings10;
+import gregtech.common.blocks.BlockCasings10;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_HIPCompressor extends
-    GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_HIPCompressor> implements ISurvivalConstructable {
+public class MTEHIPCompressor extends MTEExtendedPowerMultiBlockBase<MTEHIPCompressor>
+    implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_HIPCompressor> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_HIPCompressor>builder()
+    private static final IStructureDefinition<MTEHIPCompressor> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEHIPCompressor>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             // spotless:off
@@ -83,33 +83,24 @@ public class GT_MetaTileEntity_HIPCompressor extends
         .addElement('A', Glasses.chainAllGlasses())
         .addElement(
             'B',
-            buildHatchAdder(GT_MetaTileEntity_HIPCompressor.class)
-                .atLeast(Maintenance, Energy, SpecialHatchElement.HeatSensor)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(4))
+            buildHatchAdder(MTEHIPCompressor.class).atLeast(Maintenance, Energy, SpecialHatchElement.HeatSensor)
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(4))
                 .dot(1)
-                .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_HIPCompressor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings10, 4))))
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings10, 9))
-        .addElement('D', ofBlock(GregTech_API.sBlockCasings10, 10))
-        .addElement('E', ofBlock(GregTech_API.sBlockCasings4, 1))
-        .addElement(
-            'F',
-            ofCoil(GT_MetaTileEntity_HIPCompressor::setCoilLevel, GT_MetaTileEntity_HIPCompressor::getCoilLevel))
+                .buildAndChain(onElementPass(MTEHIPCompressor::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings10, 4))))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings10, 9))
+        .addElement('D', ofBlock(GregTechAPI.sBlockCasings10, 10))
+        .addElement('E', ofBlock(GregTechAPI.sBlockCasings4, 1))
+        .addElement('F', ofCoil(MTEHIPCompressor::setCoilLevel, MTEHIPCompressor::getCoilLevel))
         .addElement(
             'G',
-            buildHatchAdder(GT_MetaTileEntity_HIPCompressor.class).atLeast(InputBus, OutputBus)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(5))
+            buildHatchAdder(MTEHIPCompressor.class).atLeast(InputBus, OutputBus)
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(5))
                 .dot(1)
-                .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_HIPCompressor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings10, 5))))
-        .addElement('H', ofBlock(GregTech_API.sBlockCasings10, 5))
+                .buildAndChain(onElementPass(MTEHIPCompressor::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings10, 5))))
+        .addElement('H', ofBlock(GregTechAPI.sBlockCasings10, 5))
         .build();
 
-    private final ArrayList<GT_MetaTileEntity_HeatSensor> sensorHatches = new ArrayList<>();
+    private final ArrayList<MTEHeatSensor> sensorHatches = new ArrayList<>();
 
     private HeatingCoilLevel heatLevel;
     private int coilTier = 0;
@@ -117,16 +108,16 @@ public class GT_MetaTileEntity_HIPCompressor extends
     private float heat = 0;
     private boolean cooling = false;
 
-    public GT_MetaTileEntity_HIPCompressor(final int aID, final String aName, final String aNameRegional) {
+    public MTEHIPCompressor(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_HIPCompressor(String aName) {
+    public MTEHIPCompressor(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_HIPCompressor> getStructureDefinition() {
+    public IStructureDefinition<MTEHIPCompressor> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -137,7 +128,7 @@ public class GT_MetaTileEntity_HIPCompressor extends
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_HIPCompressor(this.mName);
+        return new MTEHIPCompressor(this.mName);
     }
 
     @Override
@@ -160,7 +151,7 @@ public class GT_MetaTileEntity_HIPCompressor extends
             if (cooling) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 4)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 4)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_COMPRESSOR_COOLING)
                         .extFacing()
@@ -173,7 +164,7 @@ public class GT_MetaTileEntity_HIPCompressor extends
             } else if (aActive) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 4)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 4)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE)
                         .extFacing()
@@ -186,7 +177,7 @@ public class GT_MetaTileEntity_HIPCompressor extends
             } else {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 4)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 4)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_COMPRESSOR)
                         .extFacing()
@@ -199,14 +190,14 @@ public class GT_MetaTileEntity_HIPCompressor extends
             }
         } else {
             rTexture = new ITexture[] { Textures.BlockIcons
-                .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 4)) };
+                .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 4)) };
         }
         return rTexture;
     }
 
     @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("Compressor")
             .addInfo("Controller Block for the Hot Isostatic Pressurization Unit")
             .addInfo("HIP Unit heats up while running")
@@ -318,7 +309,7 @@ public class GT_MetaTileEntity_HIPCompressor extends
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+        logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
         logic.setAvailableAmperage(1L);
     }
 
@@ -375,7 +366,7 @@ public class GT_MetaTileEntity_HIPCompressor extends
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 doingHIP = false;
                 setSpeedBonus(1F / 1.25F);
                 setEuModifier(0.75F);
@@ -423,15 +414,15 @@ public class GT_MetaTileEntity_HIPCompressor extends
         }
 
         // Update all the sensors
-        for (GT_MetaTileEntity_HeatSensor hatch : sensorHatches) {
+        for (MTEHeatSensor hatch : sensorHatches) {
             hatch.updateRedstoneOutput(heat);
         }
 
     }
 
     public int getMaxParallelRecipes() {
-        return cooling ? GT_Utility.getTier(this.getMaxInputVoltage())
-            : (4 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return cooling ? GTUtility.getTier(this.getMaxInputVoltage())
+            : (4 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
@@ -486,29 +477,28 @@ public class GT_MetaTileEntity_HIPCompressor extends
     public boolean addSensorHatchToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_HeatSensor sensor) {
+        if (aMetaTileEntity instanceof MTEHeatSensor sensor) {
             sensor.updateTexture(aBaseCasingIndex);
             return this.sensorHatches.add(sensor);
         }
         return false;
     }
 
-    private enum SpecialHatchElement implements IHatchElement<GT_MetaTileEntity_HIPCompressor> {
+    private enum SpecialHatchElement implements IHatchElement<MTEHIPCompressor> {
 
-        HeatSensor(GT_MetaTileEntity_HIPCompressor::addSensorHatchToMachineList, GT_MetaTileEntity_HeatSensor.class) {
+        HeatSensor(MTEHIPCompressor::addSensorHatchToMachineList, MTEHeatSensor.class) {
 
             @Override
-            public long count(GT_MetaTileEntity_HIPCompressor gtMetaTileEntityHIPCompressor) {
+            public long count(MTEHIPCompressor gtMetaTileEntityHIPCompressor) {
                 return gtMetaTileEntityHIPCompressor.sensorHatches.size();
             }
         };
 
         private final List<Class<? extends IMetaTileEntity>> mteClasses;
-        private final IGT_HatchAdder<GT_MetaTileEntity_HIPCompressor> adder;
+        private final IGTHatchAdder<MTEHIPCompressor> adder;
 
         @SafeVarargs
-        SpecialHatchElement(IGT_HatchAdder<GT_MetaTileEntity_HIPCompressor> adder,
-            Class<? extends IMetaTileEntity>... mteClasses) {
+        SpecialHatchElement(IGTHatchAdder<MTEHIPCompressor> adder, Class<? extends IMetaTileEntity>... mteClasses) {
             this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses));
             this.adder = adder;
         }
@@ -518,7 +508,7 @@ public class GT_MetaTileEntity_HIPCompressor extends
             return mteClasses;
         }
 
-        public IGT_HatchAdder<? super GT_MetaTileEntity_HIPCompressor> adder() {
+        public IGTHatchAdder<? super MTEHIPCompressor> adder() {
             return adder;
         }
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_HeatSensor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEHeatSensor.java
index e4721428fc..8ea57bc1cf 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_HeatSensor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEHeatSensor.java
@@ -14,18 +14,18 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget;
 import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 
 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.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 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.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.common.gui.modularui.widget.CoverCycleButtonWidget;
 
-public class GT_MetaTileEntity_HeatSensor extends GT_MetaTileEntity_Hatch {
+public class MTEHeatSensor extends MTEHatch {
 
     protected float threshold = 0;
     protected boolean inverted = false;
@@ -34,11 +34,11 @@ public class GT_MetaTileEntity_HeatSensor extends GT_MetaTileEntity_Hatch {
     private static final IIconContainer textureFont = Textures.BlockIcons.OVERLAY_HATCH_BLACKHOLE;
     private static final IIconContainer textureFont_Glow = Textures.BlockIcons.OVERLAY_HATCH_BLACKHOLE_GLOW;
 
-    public GT_MetaTileEntity_HeatSensor(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHeatSensor(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "Reads heat from HIP Unit.");
     }
 
-    public GT_MetaTileEntity_HeatSensor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHeatSensor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
@@ -87,7 +87,7 @@ public class GT_MetaTileEntity_HeatSensor extends GT_MetaTileEntity_Hatch {
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, ForgeDirection side,
         float aX, float aY, float aZ) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -134,7 +134,7 @@ public class GT_MetaTileEntity_HeatSensor extends GT_MetaTileEntity_Hatch {
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_HeatSensor(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHeatSensor(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -151,14 +151,14 @@ public class GT_MetaTileEntity_HeatSensor extends GT_MetaTileEntity_Hatch {
     }
 
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
-        final String INVERTED = GT_Utility.trans("INVERTED", "Inverted");
-        final String NORMAL = GT_Utility.trans("NORMAL", "Normal");
+        final String INVERTED = GTUtility.trans("INVERTED", "Inverted");
+        final String NORMAL = GTUtility.trans("NORMAL", "Normal");
 
         builder.widget(
             new CoverCycleButtonWidget().setToggle(() -> inverted, (val) -> inverted = val)
                 .setTextureGetter(
-                    (state) -> state == 1 ? GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON
-                        : GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF)
+                    (state) -> state == 1 ? GTUITextures.OVERLAY_BUTTON_REDSTONE_ON
+                        : GTUITextures.OVERLAY_BUTTON_REDSTONE_OFF)
                 .addTooltip(0, NORMAL)
                 .addTooltip(1, INVERTED)
                 .setPos(10, 8))
@@ -176,7 +176,7 @@ public class GT_MetaTileEntity_HeatSensor extends GT_MetaTileEntity_Hatch {
                     .setTextColor(Color.WHITE.dark(1))
                     .setTextAlignment(Alignment.CenterLeft)
                     .setFocusOnGuiOpen(true)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2))
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2))
                     .setPos(10, 28)
                     .setSize(77, 12))
             .widget(
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_IndustrialCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEIndustrialCompressor.java
index 489841c5d4..e21da1856f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_IndustrialCompressor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEIndustrialCompressor.java
@@ -1,14 +1,14 @@
 package gregtech.common.tileentities.machines.multi.compressor;
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.enums.GT_HatchElement.*;
-import static gregtech.api.enums.GT_Values.AuthorFourIsTheNumber;
-import static gregtech.api.enums.GT_Values.Ollie;
+import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber;
+import static gregtech.api.enums.GTValues.Ollie;
+import static gregtech.api.enums.HatchElement.*;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -19,28 +19,27 @@ 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.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.MTEExtendedPowerMultiBlockBase;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Casings10;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.blocks.BlockCasings10;
 
-public class GT_MetaTileEntity_IndustrialCompressor
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_IndustrialCompressor>
+public class MTEIndustrialCompressor extends MTEExtendedPowerMultiBlockBase<MTEIndustrialCompressor>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_IndustrialCompressor> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_IndustrialCompressor>builder()
+    private static final IStructureDefinition<MTEIndustrialCompressor> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEIndustrialCompressor>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             // spotless:off
@@ -57,36 +56,32 @@ public class GT_MetaTileEntity_IndustrialCompressor
             //spotless:on
         .addElement(
             'C',
-            buildHatchAdder(GT_MetaTileEntity_IndustrialCompressor.class).atLeast(InputBus, OutputBus)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(5))
+            buildHatchAdder(MTEIndustrialCompressor.class).atLeast(InputBus, OutputBus)
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(5))
                 .dot(1)
                 .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_IndustrialCompressor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings10, 5))))
+                    onElementPass(MTEIndustrialCompressor::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings10, 5))))
         .addElement(
             'B',
-            buildHatchAdder(GT_MetaTileEntity_IndustrialCompressor.class).atLeast(Maintenance, Energy)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(4))
+            buildHatchAdder(MTEIndustrialCompressor.class).atLeast(Maintenance, Energy)
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(4))
                 .dot(1)
                 .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_IndustrialCompressor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings10, 4))))
+                    onElementPass(MTEIndustrialCompressor::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings10, 4))))
         .addElement('A', Glasses.chainAllGlasses())
-        .addElement('D', ofBlock(GregTech_API.sBlockCasings10, 5))
+        .addElement('D', ofBlock(GregTechAPI.sBlockCasings10, 5))
         .build();
 
-    public GT_MetaTileEntity_IndustrialCompressor(final int aID, final String aName, final String aNameRegional) {
+    public MTEIndustrialCompressor(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_IndustrialCompressor(String aName) {
+    public MTEIndustrialCompressor(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_IndustrialCompressor> getStructureDefinition() {
+    public IStructureDefinition<MTEIndustrialCompressor> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -97,7 +92,7 @@ public class GT_MetaTileEntity_IndustrialCompressor
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_IndustrialCompressor(this.mName);
+        return new MTEIndustrialCompressor(this.mName);
     }
 
     @Override
@@ -108,7 +103,7 @@ public class GT_MetaTileEntity_IndustrialCompressor
             if (aActive) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 4)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 4)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE)
                         .extFacing()
@@ -121,7 +116,7 @@ public class GT_MetaTileEntity_IndustrialCompressor
             } else {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 4)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 4)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_COMPRESSOR)
                         .extFacing()
@@ -134,14 +129,14 @@ public class GT_MetaTileEntity_IndustrialCompressor
             }
         } else {
             rTexture = new ITexture[] { Textures.BlockIcons
-                .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 4)) };
+                .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 4)) };
         }
         return rTexture;
     }
 
     @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("Compressor")
             .addInfo("Controller Block for the Large Electric Compressor")
             .addInfo("100% faster than singleblock machines of the same voltage")
@@ -187,7 +182,7 @@ public class GT_MetaTileEntity_IndustrialCompressor
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+        logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
         logic.setAvailableAmperage(1L);
     }
 
@@ -199,7 +194,7 @@ public class GT_MetaTileEntity_IndustrialCompressor
     }
 
     public int getMaxParallelRecipes() {
-        return (2 * GT_Utility.getTier(this.getMaxInputVoltage()));
+        return (2 * GTUtility.getTier(this.getMaxInputVoltage()));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_NeutroniumCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTENeutroniumCompressor.java
index 90406bcb50..323e09f61b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/GT_MetaTileEntity_NeutroniumCompressor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTENeutroniumCompressor.java
@@ -3,18 +3,18 @@ package gregtech.common.tileentities.machines.multi.compressor;
 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.OutputBus;
-import static gregtech.api.enums.GT_Values.AuthorFourIsTheNumber;
-import static gregtech.api.enums.GT_Values.Ollie;
+import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber;
+import static gregtech.api.enums.GTValues.Ollie;
+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.OutputBus;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRESSOR_GLOW;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -27,32 +27,31 @@ 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.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.MTEExtendedPowerMultiBlockBase;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
 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.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Casings10;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.blocks.BlockCasings10;
 
-public class GT_MetaTileEntity_NeutroniumCompressor
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_NeutroniumCompressor>
+public class MTENeutroniumCompressor extends MTEExtendedPowerMultiBlockBase<MTENeutroniumCompressor>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final IStructureDefinition<GT_MetaTileEntity_NeutroniumCompressor> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_NeutroniumCompressor>builder()
+    private static final IStructureDefinition<MTENeutroniumCompressor> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTENeutroniumCompressor>builder()
         .addShape(
             STRUCTURE_PIECE_MAIN,
             // spotless:off
@@ -73,29 +72,26 @@ public class GT_MetaTileEntity_NeutroniumCompressor
         .addElement('A', Glasses.chainAllGlasses())
         .addElement(
             'B',
-            buildHatchAdder(GT_MetaTileEntity_NeutroniumCompressor.class)
-                .atLeast(InputBus, OutputBus, Maintenance, Energy)
-                .casingIndex(((GT_Block_Casings10) GregTech_API.sBlockCasings10).getTextureIndex(6))
+            buildHatchAdder(MTENeutroniumCompressor.class).atLeast(InputBus, OutputBus, Maintenance, Energy)
+                .casingIndex(((BlockCasings10) GregTechAPI.sBlockCasings10).getTextureIndex(6))
                 .dot(1)
                 .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_NeutroniumCompressor::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings10, 6))))
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings10, 8))
-        .addElement('D', ofBlock(GregTech_API.sBlockCasings10, 7))
+                    onElementPass(MTENeutroniumCompressor::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings10, 6))))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings10, 8))
+        .addElement('D', ofBlock(GregTechAPI.sBlockCasings10, 7))
         .addElement('E', ofFrame(Materials.NaquadahAlloy))
         .build();
 
-    public GT_MetaTileEntity_NeutroniumCompressor(final int aID, final String aName, final String aNameRegional) {
+    public MTENeutroniumCompressor(final int aID, final String aName, final String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_NeutroniumCompressor(String aName) {
+    public MTENeutroniumCompressor(String aName) {
         super(aName);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_NeutroniumCompressor> getStructureDefinition() {
+    public IStructureDefinition<MTENeutroniumCompressor> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -106,7 +102,7 @@ public class GT_MetaTileEntity_NeutroniumCompressor
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_NeutroniumCompressor(this.mName);
+        return new MTENeutroniumCompressor(this.mName);
     }
 
     @Override
@@ -117,7 +113,7 @@ public class GT_MetaTileEntity_NeutroniumCompressor
             if (aActive) {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 6)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 6)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_COMPRESSOR_ACTIVE)
                         .extFacing()
@@ -130,7 +126,7 @@ public class GT_MetaTileEntity_NeutroniumCompressor
             } else {
                 rTexture = new ITexture[] {
                     Textures.BlockIcons
-                        .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 6)),
+                        .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 6)),
                     TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_MULTI_COMPRESSOR)
                         .extFacing()
@@ -143,14 +139,14 @@ public class GT_MetaTileEntity_NeutroniumCompressor
             }
         } else {
             rTexture = new ITexture[] { Textures.BlockIcons
-                .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings10, 6)) };
+                .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings10, 6)) };
         }
         return rTexture;
     }
 
     @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("Neutronium Compressor")
             .addInfo("Controller Block for the Neutronium Compressor")
             .addInfo("Has a static 8 parallels")
@@ -199,7 +195,7 @@ public class GT_MetaTileEntity_NeutroniumCompressor
 
     @Override
     protected void setProcessingLogicPower(ProcessingLogic logic) {
-        logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage()));
+        logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage()));
         logic.setAvailableAmperage(1L);
     }
 
@@ -210,7 +206,7 @@ public class GT_MetaTileEntity_NeutroniumCompressor
 
             @NotNull
             @Override
-            protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
+            protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
                 if (recipe.mSpecialValue > 0) {
                     return CheckRecipeResultRegistry.NO_BLACK_HOLE;
                 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/drone/DroneConnection.java b/src/main/java/gregtech/common/tileentities/machines/multi/drone/DroneConnection.java
index 92b1c65032..e5f3cb99ab 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/drone/DroneConnection.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/drone/DroneConnection.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.multi.drone;
 
-import static gregtech.GT_Mod.gregtechproxy;
+import static gregtech.GTMod.gregtechproxy;
 
 import java.util.Optional;
 
@@ -13,23 +13,23 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 
 public class DroneConnection {
 
     String customName;
     String unlocalizedName;
-    GT_MetaTileEntity_MultiBlockBase machine;
+    MTEMultiBlockBase machine;
     ItemStack machineItem;
     ChunkCoordinates machineCoord;
-    GT_MetaTileEntity_DroneCentre centre;
+    MTEDroneCentre centre;
     ChunkCoordinates centreCoord;
     World world;
 
-    public DroneConnection(GT_MetaTileEntity_MultiBlockBase machine, GT_MetaTileEntity_DroneCentre centre) {
+    public DroneConnection(MTEMultiBlockBase machine, MTEDroneCentre centre) {
         this.machine = machine;
         this.machineItem = machine.getStackForm(1);
         machineCoord = machine.getBaseMetaTileEntity()
@@ -62,19 +62,18 @@ public class DroneConnection {
             centreTag.getInteger("x"),
             centreTag.getInteger("y"),
             centreTag.getInteger("z"));
-        this.centre = (GT_MetaTileEntity_DroneCentre) getLoadedGT_BaseMachineAt(centreCoord, world, true);
+        this.centre = (MTEDroneCentre) getLoadedGT_BaseMachineAt(centreCoord, world, true);
         this.customName = aNBT.getString("name");
         this.unlocalizedName = aNBT.getString("unlocalizedName");
     }
 
-    public GT_MetaTileEntity_MultiBlockBase getMachine() {
+    public MTEMultiBlockBase getMachine() {
         return machine;
     }
 
     public boolean reCheckConnection() {
         if (machine == null) this.machine = getLoadedGT_BaseMachineAt(machineCoord, world, true);
-        if (centre == null)
-            this.centre = (GT_MetaTileEntity_DroneCentre) getLoadedGT_BaseMachineAt(centreCoord, world, true);
+        if (centre == null) this.centre = (MTEDroneCentre) getLoadedGT_BaseMachineAt(centreCoord, world, true);
         if (machine != null && centre != null
             && !centre.getConnectionList()
                 .contains(this))
@@ -84,7 +83,7 @@ public class DroneConnection {
     }
 
     public String getCustomName(boolean localized) {
-        if (localized) return GT_LanguageManager.getTranslation("gt.blockmachines." + unlocalizedName + ".name");
+        if (localized) return GTLanguageManager.getTranslation("gt.blockmachines." + unlocalizedName + ".name");
         return customName;
     }
 
@@ -100,7 +99,7 @@ public class DroneConnection {
         return machine != null && machine.shouldDisplayShutDownReason()
             && !machine.getBaseMetaTileEntity()
                 .isActive()
-            && GT_Utility.isStringValid(
+            && GTUtility.isStringValid(
                 machine.getBaseMetaTileEntity()
                     .getLastShutDownReason()
                     .getDisplayString())
@@ -122,11 +121,10 @@ public class DroneConnection {
         return aNBT;
     }
 
-    public GT_MetaTileEntity_MultiBlockBase getLoadedGT_BaseMachineAt(ChunkCoordinates coords, World world,
-        boolean isLoaded) {
-        TileEntity te = GT_Util.getTileEntity(world, coords, isLoaded);
+    public MTEMultiBlockBase getLoadedGT_BaseMachineAt(ChunkCoordinates coords, World world, boolean isLoaded) {
+        TileEntity te = GTUtil.getTileEntity(world, coords, isLoaded);
         if (te == null) return null;
-        return (GT_MetaTileEntity_MultiBlockBase) ((IGregTechTileEntity) te).getMetaTileEntity();
+        return (MTEMultiBlockBase) ((IGregTechTileEntity) te).getMetaTileEntity();
     }
 
     private NBTTagCompound transCoordsToNBT(ChunkCoordinates coord) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_DroneCentre.java b/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java
index 8d2eaa0480..cf52680d71 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_DroneCentre.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java
@@ -3,11 +3,11 @@ package gregtech.common.tileentities.machines.multi.drone;
 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_Values.AuthorSilverMoon;
+import static gregtech.api.enums.GTValues.AuthorSilverMoon;
+import static gregtech.api.enums.HatchElement.InputBus;
 import static gregtech.api.multitileentity.multiblock.casing.Glasses.chainAllGlasses;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
-import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 
 import java.io.IOException;
 import java.text.Collator;
@@ -65,32 +65,31 @@ import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget;
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.WorldCoord;
 import appeng.client.render.BlockPosHighlighter;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 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.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.SimpleCheckRecipeResult;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.ShutDownReason;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gregtech.common.gui.modularui.widget.ShutDownReasonSyncer;
-import gregtech.common.items.GT_TierDrone;
+import gregtech.common.items.ItemTierDrone;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_DroneCentre extends
-    GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_DroneCentre> implements ISurvivalConstructable {
+public class MTEDroneCentre extends MTEExtendedPowerMultiBlockBase<MTEDroneCentre> implements ISurvivalConstructable {
 
     private static final IIconContainer ACTIVE = new Textures.BlockIcons.CustomIcon("iconsets/DRONE_CENTRE_ACTIVE");
     private static final IIconContainer FACE = new Textures.BlockIcons.CustomIcon("iconsets/DRONE_CENTRE_FACE");
@@ -109,10 +108,10 @@ public class GT_MetaTileEntity_DroneCentre extends
     private List<DroneConnection> connectionList = new ArrayList<>();
     public HashMap<String, String> tempNameList = new HashMap<>();
     // Save centre by dimID
-    private static final HashMultimap<Integer, GT_MetaTileEntity_DroneCentre> droneMap = HashMultimap.create();
+    private static final HashMultimap<Integer, MTEDroneCentre> droneMap = HashMultimap.create();
     // spotless off
-    private static final IStructureDefinition<GT_MetaTileEntity_DroneCentre> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_DroneCentre>builder()
+    private static final IStructureDefinition<MTEDroneCentre> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEDroneCentre>builder()
         .addShape(
             "main",
             transpose(
@@ -122,30 +121,27 @@ public class GT_MetaTileEntity_DroneCentre extends
                     { "C   C", "     ", "     ", "     ", "     ", "     ", "     ", "     ", "C   C" } }))
         .addElement(
             'C',
-            buildHatchAdder(GT_MetaTileEntity_DroneCentre.class).atLeast(InputBus)
+            buildHatchAdder(MTEDroneCentre.class).atLeast(InputBus)
                 .casingIndex(59)
                 .dot(1)
-                .buildAndChain(
-                    onElementPass(
-                        GT_MetaTileEntity_DroneCentre::onCasingAdded,
-                        ofBlock(GregTech_API.sBlockCasings4, 2))))
+                .buildAndChain(onElementPass(MTEDroneCentre::onCasingAdded, ofBlock(GregTechAPI.sBlockCasings4, 2))))
         .addElement('A', chainAllGlasses())
-        .addElement('B', ofBlock(GregTech_API.sBlockCasings1, 11))
-        .addElement('D', ofBlock(GregTech_API.sBlockCasings4, 0))
+        .addElement('B', ofBlock(GregTechAPI.sBlockCasings1, 11))
+        .addElement('D', ofBlock(GregTechAPI.sBlockCasings4, 0))
         .build();
 
     // spotless on
-    public GT_MetaTileEntity_DroneCentre(String name) {
+    public MTEDroneCentre(String name) {
         super(name);
     }
 
-    public GT_MetaTileEntity_DroneCentre(int ID, String Name, String NameRegional) {
+    public MTEDroneCentre(int ID, String Name, String NameRegional) {
         super(ID, Name, NameRegional);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_DroneCentre(super.mName);
+        return new MTEDroneCentre(super.mName);
     }
 
     @Override
@@ -173,13 +169,13 @@ public class GT_MetaTileEntity_DroneCentre extends
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_DroneCentre> getStructureDefinition() {
+    public IStructureDefinition<MTEDroneCentre> 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("Drone Centre")
             .addInfo("Drone Center Controller")
             .addInfo(EnumChatFormatting.AQUA + "Drone #10032, cleared for takeoff!")
@@ -432,7 +428,7 @@ public class GT_MetaTileEntity_DroneCentre extends
         List<ItemStack> inputs = getStoredInputs();
         if (inputs.isEmpty()) return false;
         for (ItemStack item : inputs) {
-            if (item != null && item.getItem() instanceof GT_TierDrone drone) {
+            if (item != null && item.getItem() instanceof ItemTierDrone drone) {
                 this.droneLevel = drone.getLevel();
                 item.stackSize--;
                 updateSlots();
@@ -446,7 +442,7 @@ public class GT_MetaTileEntity_DroneCentre extends
         List<ItemStack> inputs = getStoredInputs();
         if (inputs.isEmpty()) return;
         for (ItemStack item : inputs) {
-            if (item != null && item.getItem() instanceof GT_TierDrone drone) {
+            if (item != null && item.getItem() instanceof ItemTierDrone drone) {
                 if (drone.getLevel() <= this.droneLevel) continue;
                 this.droneLevel = drone.getLevel();
                 item.stackSize--;
@@ -471,7 +467,7 @@ public class GT_MetaTileEntity_DroneCentre extends
             .setBlock((int) (x + xOffset), (int) (y + yOffset), (int) (z + zOffset), Blocks.air);
         this.getBaseMetaTileEntity()
             .getWorld()
-            .setBlock((int) (x + xOffset), (int) (y + yOffset), (int) (z + zOffset), GregTech_API.sDroneRender);
+            .setBlock((int) (x + xOffset), (int) (y + yOffset), (int) (z + zOffset), GregTechAPI.sDroneRender);
     }
 
     private void destroyRenderBlock() {
@@ -502,8 +498,8 @@ public class GT_MetaTileEntity_DroneCentre extends
                 .setSize(16, 16)
                 .setBackground(() -> {
                     List<UITexture> UI = new ArrayList<>();
-                    UI.add(GT_UITextures.BUTTON_STANDARD);
-                    UI.add(GT_UITextures.OVERLAY_BUTTON_WHITELIST);
+                    UI.add(GTUITextures.BUTTON_STANDARD);
+                    UI.add(GTUITextures.OVERLAY_BUTTON_WHITELIST);
                     return UI.toArray(new IDrawable[0]);
                 })
                 .addTooltip(StatCollector.translateToLocal("GT5U.gui.button.drone_open_list"))
@@ -534,8 +530,8 @@ public class GT_MetaTileEntity_DroneCentre extends
                     .setSize(16, 16)
                     .setBackground(() -> {
                         List<UITexture> UI = new ArrayList<>();
-                        UI.add(GT_UITextures.BUTTON_STANDARD);
-                        UI.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON);
+                        UI.add(GTUITextures.BUTTON_STANDARD);
+                        UI.add(GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON);
                         return UI.toArray(new IDrawable[0]);
                     })
                     .addTooltip(StatCollector.translateToLocal("GT5U.gui.button.drone_poweron_all"))
@@ -566,8 +562,8 @@ public class GT_MetaTileEntity_DroneCentre extends
                     .setSize(16, 16)
                     .setBackground(() -> {
                         List<UITexture> UI = new ArrayList<>();
-                        UI.add(GT_UITextures.BUTTON_STANDARD);
-                        UI.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF);
+                        UI.add(GTUITextures.BUTTON_STANDARD);
+                        UI.add(GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF);
                         return UI.toArray(new IDrawable[0]);
                     })
                     .addTooltip(StatCollector.translateToLocal("GT5U.gui.button.drone_poweroff_all"))
@@ -580,13 +576,13 @@ public class GT_MetaTileEntity_DroneCentre extends
                 try {
                     buffer.writeNBTTagCompoundToBuffer(j.transConnectionToNBT());
                 } catch (IOException e) {
-                    GT_Log.err.println(e.getCause());
+                    GTLog.err.println(e.getCause());
                 }
             }, buffer -> {
                 try {
                     return new DroneConnection(buffer.readNBTTagCompoundFromBuffer());
                 } catch (IOException e) {
-                    GT_Log.err.println(e.getCause());
+                    GTLog.err.println(e.getCause());
                 }
                 return null;
             }));
@@ -596,7 +592,7 @@ public class GT_MetaTileEntity_DroneCentre extends
         int heightCoff = getBaseMetaTileEntity().isServerSide() ? 0
             : Minecraft.getMinecraft().currentScreen.height - 40;
         ModularWindow.Builder builder = ModularWindow.builder(260, heightCoff);
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.setGuiTint(getGUIColorization());
         builder.widget(
             ButtonWidget.closeWindowButton(true)
@@ -632,7 +628,7 @@ public class GT_MetaTileEntity_DroneCentre extends
             .setTextAlignment(Alignment.CenterLeft)
             .setTextColor(Color.WHITE.dark(1))
             .setFocusOnGuiOpen(false)
-            .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2))
+            .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2))
             .addTooltip(StatCollector.translateToLocal("GT5U.gui.text.drone_search"))
             .setPos(50, 30)
             .setSize(200, 16))
@@ -665,7 +661,7 @@ public class GT_MetaTileEntity_DroneCentre extends
             })
                 .addTooltip(StatCollector.translateToLocal("GT5U.gui.button.drone_" + sort))
                 .setBackground(
-                    () -> new IDrawable[] { GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_SORTING_MODE })
+                    () -> new IDrawable[] { GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_SORTING_MODE })
                 .setPos(10, 30)
                 .setSize(16, 16))
             .widget(new FakeSyncWidget.StringSyncer(() -> sort, var1 -> sort = var1))
@@ -693,8 +689,8 @@ public class GT_MetaTileEntity_DroneCentre extends
                 .addTooltip(StatCollector.translateToLocal("GT5U.gui.button.drone_showLocalName"))
                 .setBackground(
                     () -> new IDrawable[] {
-                        showLocalizedName ? GT_UITextures.BUTTON_STANDARD_PRESSED : GT_UITextures.BUTTON_STANDARD,
-                        GT_UITextures.OVERLAY_BUTTON_CYCLIC })
+                        showLocalizedName ? GTUITextures.BUTTON_STANDARD_PRESSED : GTUITextures.BUTTON_STANDARD,
+                        GTUITextures.OVERLAY_BUTTON_CYCLIC })
                 .setPos(30, 30)
                 .setSize(16, 16));
         // Sort first
@@ -724,7 +720,7 @@ public class GT_MetaTileEntity_DroneCentre extends
             ItemStackHandler drawitem = new ItemStackHandler(1);
             drawitem.setStackInSlot(0, connection.machineItem);
             DynamicPositionedRow row = new DynamicPositionedRow().setSynced(false);
-            GT_MetaTileEntity_MultiBlockBase coreMachine = connection.machine;
+            MTEMultiBlockBase coreMachine = connection.machine;
             int finalI = i;
             row.widget(
                 SlotWidget.phantom(drawitem, 0)
@@ -737,7 +733,7 @@ public class GT_MetaTileEntity_DroneCentre extends
                 })
                     .addTooltip(StatCollector.translateToLocal("GT5U.gui.button.drone_setname"))
                     .setBackground(
-                        () -> new IDrawable[] { GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_PRINT })
+                        () -> new IDrawable[] { GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_PRINT })
                     .setSize(16, 16));
             // Client can't handle unloaded machines
             row.widget(
@@ -757,22 +753,22 @@ public class GT_MetaTileEntity_DroneCentre extends
                         }))
                     .setPlayClickSoundResource(
                         () -> Optional.ofNullable(coreMachine)
-                            .filter(GT_MetaTileEntity_MultiBlockBase::isAllowedToWork)
+                            .filter(MTEMultiBlockBase::isAllowedToWork)
                             .map(var -> SoundResource.GUI_BUTTON_UP.resourceLocation)
                             .orElse(SoundResource.GUI_BUTTON_DOWN.resourceLocation))
                     .setBackground(
                         () -> Optional.ofNullable(coreMachine)
                             .map(
                                 machine -> machine.isAllowedToWork()
-                                    ? new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED,
-                                        GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON }
-                                    : new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
-                                        GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF })
-                            .orElse(new IDrawable[] { GT_UITextures.OVERLAY_BUTTON_CROSS }))
+                                    ? new IDrawable[] { GTUITextures.BUTTON_STANDARD_PRESSED,
+                                        GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON }
+                                    : new IDrawable[] { GTUITextures.BUTTON_STANDARD,
+                                        GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF })
+                            .orElse(new IDrawable[] { GTUITextures.OVERLAY_BUTTON_CROSS }))
                     .attachSyncer(
                         new FakeSyncWidget.BooleanSyncer(
                             () -> Optional.ofNullable(coreMachine)
-                                .map(GT_MetaTileEntity_MultiBlockBase::isAllowedToWork)
+                                .map(MTEMultiBlockBase::isAllowedToWork)
                                 .orElse(false),
                             var -> Optional.ofNullable(coreMachine)
                                 .ifPresent(machine -> {
@@ -792,7 +788,7 @@ public class GT_MetaTileEntity_DroneCentre extends
                 })
                     .addTooltip(StatCollector.translateToLocal("GT5U.gui.button.drone_highlight"))
                     .setBackground(
-                        new IDrawable[] { GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_INVERT_REDSTONE })
+                        new IDrawable[] { GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_INVERT_REDSTONE })
                     .setSize(16, 16));
             // Show the reason why the machine shutdown
             row.widget(
@@ -804,13 +800,13 @@ public class GT_MetaTileEntity_DroneCentre extends
                                     .getLastShutDownReason()
                                     .getDisplayString())
                             .orElse("")))
-                    .setBackground(GT_UITextures.PICTURE_STALLED_ELECTRICITY)
+                    .setBackground(GTUITextures.PICTURE_STALLED_ELECTRICITY)
                     .setSize(16, 16)
                     .setEnabled(
                         var -> coreMachine != null && coreMachine.shouldDisplayShutDownReason()
                             && !coreMachine.getBaseMetaTileEntity()
                                 .isActive()
-                            && GT_Utility.isStringValid(
+                            && GTUtility.isStringValid(
                                 coreMachine.getBaseMetaTileEntity()
                                     .getLastShutDownReason()
                                     .getDisplayString())
@@ -860,7 +856,7 @@ public class GT_MetaTileEntity_DroneCentre extends
 
     protected ModularWindow createCustomNameWindow(final EntityPlayer player) {
         ModularWindow.Builder builder = ModularWindow.builder(150, 40);
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.setGuiTint(getGUIColorization());
         return builder.widget(
             ButtonWidget.closeWindowButton(true)
@@ -887,7 +883,7 @@ public class GT_MetaTileEntity_DroneCentre extends
                 .setTextAlignment(Alignment.CenterLeft)
                 .setTextColor(Color.WHITE.dark(1))
                 .setFocusOnGuiOpen(true)
-                .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2))
+                .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2))
                 .setPos(10, 16)
                 .setSize(130, 16))
             .build();
@@ -906,7 +902,7 @@ public class GT_MetaTileEntity_DroneCentre extends
             System.currentTimeMillis() + 500 * WorldCoord.getTaxicabDistance(blockPos, blockPos2));
     }
 
-    public static HashMultimap<Integer, GT_MetaTileEntity_DroneCentre> getCentreMap() {
+    public static HashMultimap<Integer, MTEDroneCentre> getCentreMap() {
         return droneMap;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_Hatch_DroneDownLink.java b/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEHatchDroneDownLink.java
index 33dad93d52..224f187347 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_Hatch_DroneDownLink.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEHatchDroneDownLink.java
@@ -33,36 +33,35 @@ import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget;
 
 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.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.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEHatchMaintenance;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
 import gregtech.api.render.TextureFactory;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hatch_Maintenance {
+public class MTEHatchDroneDownLink extends MTEHatchMaintenance {
 
     private Vec3Impl downlinkCoord;
     private DroneConnection connection;
     // This has to be existed for doing random damage.
-    private GT_MetaTileEntity_MultiBlockBase machine;
+    private MTEMultiBlockBase machine;
     private static final IIconContainer moduleActive = new Textures.BlockIcons.CustomIcon(
         "iconsets/OVERLAY_DRONE_MODULE_ACTIVE");
 
-    public GT_MetaTileEntity_Hatch_DroneDownLink(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchDroneDownLink(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_Hatch_DroneDownLink(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchDroneDownLink(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures, false);
     }
 
@@ -89,11 +88,7 @@ public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hat
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_DroneDownLink(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures);
+        return new MTEHatchDroneDownLink(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -144,7 +139,7 @@ public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hat
                 aPlayer.addChatComponentMessage(new ChatComponentTranslation("GT5U.machines.dronecentre.noconnection"));
                 return false;
             }
-            GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+            GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
             return true;
         }
         return false;
@@ -177,18 +172,18 @@ public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hat
      * Find a drone connection. This will search for all DC in the same dimension, then find one in range.
      */
     private void tryFindConnection() {
-        if (GT_MetaTileEntity_DroneCentre.getCentreMap()
+        if (MTEDroneCentre.getCentreMap()
             .containsKey(getBaseMetaTileEntity().getWorld().provider.dimensionId)) {
-            List<GT_MetaTileEntity_DroneCentre> target = GT_MetaTileEntity_DroneCentre.getCentreMap()
+            List<MTEDroneCentre> target = MTEDroneCentre.getCentreMap()
                 .get(getBaseMetaTileEntity().getWorld().provider.dimensionId)
                 .stream()
                 .collect(Collectors.toList());
-            for (GT_MetaTileEntity_DroneCentre centre : target) {
+            for (MTEDroneCentre centre : target) {
                 if (centre.getCoords()
                     .withinDistance(this.downlinkCoord, centre.getRange())
                     && centre.getBaseMetaTileEntity()
                         .isActive()) {
-                    GT_MetaTileEntity_MultiBlockBase machine = tryFindCoreGTMultiBlock();
+                    MTEMultiBlockBase machine = tryFindCoreGTMultiBlock();
                     if (machine != null && machine.isValid()) {
                         this.machine = machine;
                         connection = new DroneConnection(machine, centre);
@@ -202,7 +197,7 @@ public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hat
     }
 
     // Find mainframe. Mainly from a method in GT_API——This will cause performance issue! Do not call it frequently.
-    private GT_MetaTileEntity_MultiBlockBase tryFindCoreGTMultiBlock() {
+    private MTEMultiBlockBase tryFindCoreGTMultiBlock() {
         Queue<ChunkCoordinates> tQueue = new LinkedList<>();
         Set<ChunkCoordinates> visited = new HashSet<>(80);
         tQueue.add(
@@ -219,13 +214,13 @@ public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hat
             // Plascrete block isn't registered as machineBlock, therefore we have to check it manually so that drone
             // can work with cleanroom.
             // Todo: loading cleanroom's config for other blocks
-            isMachineBlock = GregTech_API
+            isMachineBlock = GregTechAPI
                 .isMachineBlock(block, world.getBlockMetadata(aCoords.posX, aCoords.posY, aCoords.posZ))
-                || (block == GregTech_API.sBlockReinforced
+                || (block == GregTechAPI.sBlockReinforced
                     && world.getBlockMetadata(aCoords.posX, aCoords.posY, aCoords.posZ) == 2);
             // See if the block itself is MultiBlock, also the one we need.
             if (tTileEntity instanceof IGregTechTileEntity te
-                && te.getMetaTileEntity() instanceof GT_MetaTileEntity_MultiBlockBase mte)
+                && te.getMetaTileEntity() instanceof MTEMultiBlockBase mte)
                 if (mte.mMaintenanceHatches.contains(this)) return mte;
 
             // Now see if we should add the nearby blocks to the queue:
@@ -272,7 +267,7 @@ public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hat
 
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.setGuiTint(getGUIColorization());
         builder.widget(
             ButtonWidget.closeWindowButton(true)
@@ -288,7 +283,7 @@ public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hat
                     .setTextAlignment(Alignment.CenterLeft)
                     .setTextColor(Color.WHITE.dark(1))
                     .setFocusOnGuiOpen(true)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2))
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2))
                     .setPos(10, 16)
                     .setSize(130, 16))
             .build();
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/LinkedPurificationUnit.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/LinkedPurificationUnit.java
index 104cbe300f..8be6d0ab65 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/LinkedPurificationUnit.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/LinkedPurificationUnit.java
@@ -1,6 +1,6 @@
 package gregtech.common.tileentities.machines.multi.purification;
 
-import static gregtech.GT_Mod.gregtechproxy;
+import static gregtech.GTMod.gregtechproxy;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.NBTTagCompound;
@@ -10,7 +10,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTUtil;
 
 /**
  * Small wrapper around a GT_MetaTileEntity_PurificationUnitBase, to be stored in the main purification plant
@@ -25,9 +25,9 @@ public class LinkedPurificationUnit {
      */
     private boolean mIsActive = false;
 
-    private final GT_MetaTileEntity_PurificationUnitBase<?> mMetaTileEntity;
+    private final MTEPurificationUnitBase<?> mMetaTileEntity;
 
-    public LinkedPurificationUnit(GT_MetaTileEntity_PurificationUnitBase<?> unit) {
+    public LinkedPurificationUnit(MTEPurificationUnitBase<?> unit) {
         this.mMetaTileEntity = unit;
     }
 
@@ -52,18 +52,17 @@ public class LinkedPurificationUnit {
         int z = linkData.getInteger("z");
 
         // Find a TileEntity at this location
-        TileEntity te = GT_Util.getTileEntity(world, x, y, z, true);
+        TileEntity te = GTUtil.getTileEntity(world, x, y, z, true);
         if (te == null) {
             // This is a bug, throw a fatal error.
             throw new NullPointerException("Unit disappeared during server sync. This is a bug.");
         }
 
         // Cast TileEntity to proper GT TileEntity
-        this.mMetaTileEntity = (GT_MetaTileEntity_PurificationUnitBase<?>) ((IGregTechTileEntity) te)
-            .getMetaTileEntity();
+        this.mMetaTileEntity = (MTEPurificationUnitBase<?>) ((IGregTechTileEntity) te).getMetaTileEntity();
     }
 
-    public GT_MetaTileEntity_PurificationUnitBase<?> metaTileEntity() {
+    public MTEPurificationUnitBase<?> metaTileEntity() {
         return mMetaTileEntity;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_Hatch_DegasifierControlHatch.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchDegasifierControl.java
index 3d49f05dca..53c042439c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_Hatch_DegasifierControlHatch.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchDegasifierControl.java
@@ -9,22 +9,21 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.metatileentity.implementations.MTEHatch;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_Hatch_DegasifierControlHatch extends GT_MetaTileEntity_Hatch {
+public class MTEHatchDegasifierControl extends MTEHatch {
 
     private byte outputStrength = 0;
 
     private static final IIconContainer textureFont = Textures.BlockIcons.OVERLAY_HATCH_PH_SENSOR;
     private static final IIconContainer textureFont_Glow = Textures.BlockIcons.OVERLAY_HATCH_PH_SENSOR_GLOW;
 
-    public GT_MetaTileEntity_Hatch_DegasifierControlHatch(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchDegasifierControl(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "Outputs a control signal for the Degasser Purification Unit");
     }
 
-    public GT_MetaTileEntity_Hatch_DegasifierControlHatch(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEHatchDegasifierControl(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
@@ -67,7 +66,7 @@ public class GT_MetaTileEntity_Hatch_DegasifierControlHatch extends GT_MetaTileE
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_DegasifierControlHatch(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchDegasifierControl(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_LensHousing.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchLensHousing.java
index bd025e0e69..81dbab61cb 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_LensHousing.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchLensHousing.java
@@ -6,28 +6,28 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gregtech.client.GT_TooltipHandler;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
+import gregtech.client.GTTooltipHandler;
 
-public class GT_MetaTileEntity_LensHousing extends GT_MetaTileEntity_Hatch_InputBus {
+public class MTEHatchLensHousing extends MTEHatchInputBus {
 
-    public GT_MetaTileEntity_LensHousing(int id, String name, String nameRegional) {
+    public MTEHatchLensHousing(int id, String name, String nameRegional) {
         super(
             id,
             name,
             nameRegional,
-            GT_TooltipHandler.Tier.UV.ordinal(),
+            GTTooltipHandler.Tier.UV.ordinal(),
             1,
             new String[] { "Holds a lens for UV laser focusing." });
     }
 
-    public GT_MetaTileEntity_LensHousing(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchLensHousing(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LensHousing(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTEHatchLensHousing(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_LensIndicator.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchLensIndicator.java
index c017025d42..5ed495f935 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_LensIndicator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchLensIndicator.java
@@ -10,21 +10,21 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.metatileentity.implementations.MTEHatch;
 import gregtech.api.render.TextureFactory;
 
-public class GT_MetaTileEntity_LensIndicator extends GT_MetaTileEntity_Hatch {
+public class MTEHatchLensIndicator extends MTEHatch {
 
     private boolean isOn = false;
 
     private static final IIconContainer textureFont = Textures.BlockIcons.OVERLAY_HATCH_PH_SENSOR;
     private static final IIconContainer textureFont_Glow = Textures.BlockIcons.OVERLAY_HATCH_PH_SENSOR_GLOW;
 
-    public GT_MetaTileEntity_LensIndicator(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchLensIndicator(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "Indicates required lens swaps.");
     }
 
-    public GT_MetaTileEntity_LensIndicator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchLensIndicator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
@@ -99,7 +99,7 @@ public class GT_MetaTileEntity_LensIndicator extends GT_MetaTileEntity_Hatch {
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_LensIndicator(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchLensIndicator(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_pHSensor.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchPHSensor.java
index e8e393cb3c..790b14c2f5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_pHSensor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEHatchPHSensor.java
@@ -14,18 +14,18 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget;
 import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 
 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.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 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.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.common.gui.modularui.widget.CoverCycleButtonWidget;
 
-public class GT_MetaTileEntity_pHSensor extends GT_MetaTileEntity_Hatch {
+public class MTEHatchPHSensor extends MTEHatch {
 
     // This implementation was largely copied from the neutron sensor hatch
 
@@ -36,11 +36,11 @@ public class GT_MetaTileEntity_pHSensor extends GT_MetaTileEntity_Hatch {
     private static final IIconContainer textureFont = Textures.BlockIcons.OVERLAY_HATCH_PH_SENSOR;
     private static final IIconContainer textureFont_Glow = Textures.BlockIcons.OVERLAY_HATCH_PH_SENSOR_GLOW;
 
-    public GT_MetaTileEntity_pHSensor(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEHatchPHSensor(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "Detects pH value.");
     }
 
-    public GT_MetaTileEntity_pHSensor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEHatchPHSensor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
     }
 
@@ -89,7 +89,7 @@ public class GT_MetaTileEntity_pHSensor extends GT_MetaTileEntity_Hatch {
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, ForgeDirection side,
         float aX, float aY, float aZ) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -137,7 +137,7 @@ public class GT_MetaTileEntity_pHSensor extends GT_MetaTileEntity_Hatch {
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_pHSensor(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEHatchPHSensor(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -154,14 +154,14 @@ public class GT_MetaTileEntity_pHSensor extends GT_MetaTileEntity_Hatch {
     }
 
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
-        final String INVERTED = GT_Utility.trans("INVERTED", "Inverted");
-        final String NORMAL = GT_Utility.trans("NORMAL", "Normal");
+        final String INVERTED = GTUtility.trans("INVERTED", "Inverted");
+        final String NORMAL = GTUtility.trans("NORMAL", "Normal");
 
         builder.widget(
             new CoverCycleButtonWidget().setToggle(() -> inverted, (val) -> inverted = val)
                 .setTextureGetter(
-                    (state) -> state == 1 ? GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON
-                        : GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF)
+                    (state) -> state == 1 ? GTUITextures.OVERLAY_BUTTON_REDSTONE_ON
+                        : GTUITextures.OVERLAY_BUTTON_REDSTONE_OFF)
                 .addTooltip(0, NORMAL)
                 .addTooltip(1, INVERTED)
                 .setPos(10, 8))
@@ -180,7 +180,7 @@ public class GT_MetaTileEntity_pHSensor extends GT_MetaTileEntity_Hatch {
                     .setTextColor(Color.WHITE.dark(1))
                     .setTextAlignment(Alignment.CenterLeft)
                     .setFocusOnGuiOpen(true)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2))
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2))
                     .setPos(10, 28)
                     .setSize(77, 12))
             .widget(
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationPlant.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java
index 42bfd06d7a..86f2c2b5bd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationPlant.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java
@@ -4,18 +4,18 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
-import static gregtech.api.enums.GT_HatchElement.Energy;
-import static gregtech.api.enums.GT_HatchElement.ExoticEnergy;
-import static gregtech.api.enums.GT_HatchElement.Maintenance;
-import static gregtech.api.enums.GT_Values.AuthorNotAPenguin;
+import static gregtech.api.enums.GTValues.AuthorNotAPenguin;
+import static gregtech.api.enums.HatchElement.Energy;
+import static gregtech.api.enums.HatchElement.ExoticEnergy;
+import static gregtech.api.enums.HatchElement.Maintenance;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_GLOW;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
-import static gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitBase.WATER_BOOST_BONUS_CHANCE;
-import static gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitBase.WATER_BOOST_NEEDED_FLUID;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
+import static gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitBase.WATER_BOOST_BONUS_CHANCE;
+import static gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitBase.WATER_BOOST_NEEDED_FLUID;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -52,27 +52,26 @@ import com.gtnewhorizons.modularui.common.widget.Scrollable;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gregtech.common.gui.modularui.widget.ShutDownReasonSyncer;
 import gregtech.common.gui.modularui.widget.TextButtonWidget;
 
-public class GT_MetaTileEntity_PurificationPlant
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_MetaTileEntity_PurificationPlant>
+public class MTEPurificationPlant extends MTEExtendedPowerMultiBlockBase<MTEPurificationPlant>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
@@ -96,8 +95,8 @@ public class GT_MetaTileEntity_PurificationPlant
      */
     private final List<LinkedPurificationUnit> mLinkedUnits = new ArrayList<>();
 
-    private static final IStructureDefinition<GT_MetaTileEntity_PurificationPlant> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PurificationPlant>builder()
+    private static final IStructureDefinition<MTEPurificationPlant> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPurificationPlant>builder()
         .addShape(STRUCTURE_PIECE_MAIN, PurificationPlantStructureString.STRUCTURE_STRING)
         // Create an identical structure for survival autobuild, with water replaced with air
         .addShape(
@@ -109,13 +108,13 @@ public class GT_MetaTileEntity_PurificationPlant
                         .toArray(String[]::new))
                 .toArray(String[][]::new))
         // Superplasticizer-treated high strength concrete
-        .addElement('A', ofBlock(GregTech_API.sBlockCasings9, 3))
+        .addElement('A', ofBlock(GregTechAPI.sBlockCasings9, 3))
         // Sterile Water Plant Casing
-        .addElement('B', ofBlock(GregTech_API.sBlockCasings9, 4))
+        .addElement('B', ofBlock(GregTechAPI.sBlockCasings9, 4))
         // Reinforced Sterile Water Plant Casing
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings9, 5))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings9, 5))
         // Tinted Industrial Glass
-        .addElement('D', ofBlockAnyMeta(GregTech_API.sBlockTintedGlass, 0))
+        .addElement('D', ofBlockAnyMeta(GregTechAPI.sBlockTintedGlass, 0))
         .addElement('F', ofBlock(Blocks.water, 0))
         .addElement('G', ofFrame(Materials.Tungsten))
         // Hatch space
@@ -123,19 +122,19 @@ public class GT_MetaTileEntity_PurificationPlant
             'H',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationPlant>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEPurificationPlant>buildHatchAdder()
                         .atLeastList(t.getAllowedHatches())
                         .dot(1)
-                        .casingIndex(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings9, 4))
+                        .casingIndex(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings9, 4))
                         .build()),
-                ofBlock(GregTech_API.sBlockCasings9, 4)))
+                ofBlock(GregTechAPI.sBlockCasings9, 4)))
         .build();
 
-    public GT_MetaTileEntity_PurificationPlant(int aID, String aName, String aNameRegional) {
+    public MTEPurificationPlant(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_PurificationPlant(String aName) {
+    public MTEPurificationPlant(String aName) {
         super(aName);
     }
 
@@ -148,7 +147,7 @@ public class GT_MetaTileEntity_PurificationPlant
     public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
         int built = survivialBuildPiece(STRUCTURE_PIECE_MAIN_SURVIVAL, stackSize, 3, 6, 0, elementBudget, env, true);
         if (built == -1) {
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 env.getActor(),
                 EnumChatFormatting.GREEN + "Auto placing done ! Now go place the water yourself !");
             return 0;
@@ -157,13 +156,13 @@ public class GT_MetaTileEntity_PurificationPlant
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PurificationPlant> getStructureDefinition() {
+    public IStructureDefinition<MTEPurificationPlant> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
     @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("Purification Plant")
             .addInfo("Main controller block for the Water Purification Plant.")
             .addInfo(
@@ -188,13 +187,13 @@ public class GT_MetaTileEntity_PurificationPlant
             .addInfo("Every recipe has a base chance of success. Success rate can be boosted")
             .addInfo("by using a portion of the target output as a secondary input.")
             .addInfo(
-                EnumChatFormatting.RED + GT_Utility.formatNumbers(WATER_BOOST_NEEDED_FLUID * 100)
+                EnumChatFormatting.RED + GTUtility.formatNumbers(WATER_BOOST_NEEDED_FLUID * 100)
                     + "%"
                     + EnumChatFormatting.GRAY
                     + " of output yield will be consumed in exchange for an")
             .addInfo(
                 "additive " + EnumChatFormatting.RED
-                    + GT_Utility.formatNumbers(WATER_BOOST_BONUS_CHANCE * 100)
+                    + GTUtility.formatNumbers(WATER_BOOST_BONUS_CHANCE * 100)
                     + "%"
                     + EnumChatFormatting.GRAY
                     + " increase to success.")
@@ -270,7 +269,7 @@ public class GT_MetaTileEntity_PurificationPlant
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PurificationPlant(this.mName);
+        return new MTEPurificationPlant(this.mName);
     }
 
     @Override
@@ -279,7 +278,7 @@ public class GT_MetaTileEntity_PurificationPlant
         if (side == facing) {
             if (active) return new ITexture[] {
                 Textures.BlockIcons
-                    .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings9, 4)),
+                    .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings9, 4)),
                 TextureFactory.builder()
                     .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE)
                     .extFacing()
@@ -291,7 +290,7 @@ public class GT_MetaTileEntity_PurificationPlant
                     .build() };
             return new ITexture[] {
                 Textures.BlockIcons
-                    .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings9, 4)),
+                    .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings9, 4)),
                 TextureFactory.builder()
                     .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY)
                     .extFacing()
@@ -302,8 +301,8 @@ public class GT_MetaTileEntity_PurificationPlant
                     .glow()
                     .build() };
         }
-        return new ITexture[] { Textures.BlockIcons
-            .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings9, 4)) };
+        return new ITexture[] {
+            Textures.BlockIcons.getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings9, 4)) };
     }
 
     @Override
@@ -311,7 +310,7 @@ public class GT_MetaTileEntity_PurificationPlant
         return true;
     }
 
-    private List<IHatchElement<? super GT_MetaTileEntity_PurificationPlant>> getAllowedHatches() {
+    private List<IHatchElement<? super MTEPurificationPlant>> getAllowedHatches() {
         return ImmutableList.of(Maintenance, Energy, ExoticEnergy);
     }
 
@@ -388,7 +387,7 @@ public class GT_MetaTileEntity_PurificationPlant
                     // Update progress time for active units
                     for (LinkedPurificationUnit unit : this.mLinkedUnits) {
                         if (unit.isActive()) {
-                            GT_MetaTileEntity_PurificationUnitBase<?> metaTileEntity = unit.metaTileEntity();
+                            MTEPurificationUnitBase<?> metaTileEntity = unit.metaTileEntity();
                             metaTileEntity.mProgresstime = mProgresstime;
                         }
                     }
@@ -423,7 +422,7 @@ public class GT_MetaTileEntity_PurificationPlant
 
         // Find active units and notify them that the cycle started
         for (LinkedPurificationUnit unit : this.mLinkedUnits) {
-            GT_MetaTileEntity_PurificationUnitBase<?> metaTileEntity = unit.metaTileEntity();
+            MTEPurificationUnitBase<?> metaTileEntity = unit.metaTileEntity();
             PurificationUnitStatus status = metaTileEntity.status();
             // Unit needs to be online to be considered active.
             if (status == PurificationUnitStatus.ONLINE) {
@@ -444,7 +443,7 @@ public class GT_MetaTileEntity_PurificationPlant
 
         // Mark all units as inactive and reset their progress time
         for (LinkedPurificationUnit unit : this.mLinkedUnits) {
-            GT_MetaTileEntity_PurificationUnitBase<?> metaTileEntity = unit.metaTileEntity();
+            MTEPurificationUnitBase<?> metaTileEntity = unit.metaTileEntity();
             // If this unit was active, end the cycle
             if (unit.isActive()) {
                 metaTileEntity.endCycle();
@@ -482,11 +481,11 @@ public class GT_MetaTileEntity_PurificationPlant
         return false;
     }
 
-    public void registerLinkedUnit(GT_MetaTileEntity_PurificationUnitBase<?> unit) {
+    public void registerLinkedUnit(MTEPurificationUnitBase<?> unit) {
         this.mLinkedUnits.add(new LinkedPurificationUnit(unit));
     }
 
-    public void unregisterLinkedUnit(GT_MetaTileEntity_PurificationUnitBase<?> unit) {
+    public void unregisterLinkedUnit(MTEPurificationUnitBase<?> unit) {
         this.mLinkedUnits.removeIf(link -> link.metaTileEntity() == unit);
     }
 
@@ -555,7 +554,7 @@ public class GT_MetaTileEntity_PurificationPlant
 
         screenElements
             .widget(
-                new TextWidget(GT_Utility.trans("138", "Incomplete Structure.")).setDefaultColor(EnumChatFormatting.RED)
+                new TextWidget(GTUtility.trans("138", "Incomplete Structure.")).setDefaultColor(EnumChatFormatting.RED)
                     .setEnabled(widget -> !mMachine))
             .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val));
 
@@ -572,7 +571,7 @@ public class GT_MetaTileEntity_PurificationPlant
                     () -> getBaseMetaTileEntity().isActive(),
                     val -> getBaseMetaTileEntity().setActive(val)));
         screenElements.widget(
-            new TextWidget(GT_Utility.trans("142", "Running perfectly.")).setDefaultColor(EnumChatFormatting.GREEN)
+            new TextWidget(GTUtility.trans("142", "Running perfectly.")).setDefaultColor(EnumChatFormatting.GREEN)
                 .setEnabled(
                     widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 && getBaseMetaTileEntity().isActive()));
         screenElements.widget(
@@ -583,7 +582,7 @@ public class GT_MetaTileEntity_PurificationPlant
                 .setTextAlignment(Alignment.CenterLeft)
                 .setEnabled(
                     widget -> shouldDisplayShutDownReason() && !getBaseMetaTileEntity().isActive()
-                        && GT_Utility.isStringValid(
+                        && GTUtility.isStringValid(
                             getBaseMetaTileEntity().getLastShutDownReason()
                                 .getDisplayString())
                         && getBaseMetaTileEntity().wasShutdown()))
@@ -610,7 +609,7 @@ public class GT_MetaTileEntity_PurificationPlant
         final int windowWidth = 260;
         final int windowHeight = 200;
         ModularWindow.Builder builder = ModularWindow.builder(windowWidth, windowHeight);
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.widget(
             ButtonWidget.closeWindowButton(true)
                 .setPos(windowWidth - 15, 3));
@@ -645,7 +644,7 @@ public class GT_MetaTileEntity_PurificationPlant
                     if (!w.isClient()) w.getContext()
                         .openSyncedWindow(STATUS_WINDOW_ID);
                 })
-            .setBackground(GT_UITextures.BUTTON_STANDARD);
+            .setBackground(GTUITextures.BUTTON_STANDARD);
         widget.text()
             .setTextAlignment(Alignment.CenterLeft)
             .setDefaultColor(EnumChatFormatting.BLACK);
@@ -725,14 +724,14 @@ public class GT_MetaTileEntity_PurificationPlant
             try {
                 buffer.writeNBTTagCompoundToBuffer(link.writeLinkDataToNBT());
             } catch (IOException e) {
-                GT_Log.err.println(e.getCause());
+                GTLog.err.println(e.getCause());
             }
         }, buffer -> {
             // Try to load link data from NBT compound as constructed above.
             try {
                 return new LinkedPurificationUnit(buffer.readNBTTagCompoundFromBuffer());
             } catch (IOException e) {
-                GT_Log.err.println(e.getCause());
+                GTLog.err.println(e.getCause());
             }
             return null;
         }));
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitParticleExtractor.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java
index 17945f7cc9..250d968945 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitParticleExtractor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java
@@ -4,16 +4,16 @@ 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.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorNotAPenguin;
+import static gregtech.api.enums.GTValues.AuthorNotAPenguin;
+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.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_GLOW;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,7 +31,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.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
@@ -39,20 +39,19 @@ import gregtech.api.enums.TierEU;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
-import gregtech.common.items.GT_MetaGenerated_Item_03;
-import gregtech.common.items.ID_MetaItem_03;
+import gregtech.common.items.IDMetaItem03;
+import gregtech.common.items.MetaGeneratedItem03;
 
-public class GT_MetaTileEntity_PurificationUnitParticleExtractor
-    extends GT_MetaTileEntity_PurificationUnitBase<GT_MetaTileEntity_PurificationUnitParticleExtractor>
-    implements ISurvivalConstructable {
+public class MTEPurificationUnitBaryonicPerfection
+    extends MTEPurificationUnitBase<MTEPurificationUnitBaryonicPerfection> implements ISurvivalConstructable {
 
     public static long BARYONIC_MATTER_OUTPUT = 2000L;
 
@@ -83,28 +82,28 @@ public class GT_MetaTileEntity_PurificationUnitParticleExtractor
     // spotless:on
 
     // Dimensionally transcendent casing (placeholder)
-    private static final int CASING_INDEX_MAIN = getTextureIndex(GregTech_API.sBlockCasings10, 2);
+    private static final int CASING_INDEX_MAIN = getTextureIndex(GregTechAPI.sBlockCasings10, 2);
 
-    private static final IStructureDefinition<GT_MetaTileEntity_PurificationUnitParticleExtractor> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PurificationUnitParticleExtractor>builder()
+    private static final IStructureDefinition<MTEPurificationUnitBaryonicPerfection> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPurificationUnitBaryonicPerfection>builder()
         .addShape(STRUCTURE_PIECE_MAIN, structure)
         // Quark Exclusion Casing
         .addElement(
             'A',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitParticleExtractor>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEPurificationUnitBaryonicPerfection>buildHatchAdder()
                         .atLeastList(Arrays.asList(InputBus, OutputBus, InputHatch, OutputHatch))
                         .dot(1)
                         .casingIndex(CASING_INDEX_MAIN)
                         .build()),
-                onElementPass(t -> t.numCasings++, ofBlock(GregTech_API.sBlockCasings10, 2))))
+                onElementPass(t -> t.numCasings++, ofBlock(GregTechAPI.sBlockCasings10, 2))))
         // Particle Beam Guidance Pipe Casing
-        .addElement('B', ofBlock(GregTech_API.sBlockCasings9, 14))
+        .addElement('B', ofBlock(GregTechAPI.sBlockCasings9, 14))
         // Femtometer-Calibrated Particle Beam Casing
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings9, 15))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings9, 15))
         // Non-Photonic Matter Exclusion Glass
-        .addElement('D', ofBlock(GregTech_API.sBlockGlass1, 3))
+        .addElement('D', ofBlock(GregTechAPI.sBlockGlass1, 3))
         .addElement('E', ofFrame(Materials.Bedrockium))
         .build();
 
@@ -172,17 +171,17 @@ public class GT_MetaTileEntity_PurificationUnitParticleExtractor
     private int numCasings = 0;
     private static final int MIN_CASINGS = 300;
 
-    public GT_MetaTileEntity_PurificationUnitParticleExtractor(int aID, String aName, String aNameRegional) {
+    public MTEPurificationUnitBaryonicPerfection(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_PurificationUnitParticleExtractor(String aName) {
+    public MTEPurificationUnitBaryonicPerfection(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PurificationUnitParticleExtractor(mName);
+        return new MTEPurificationUnitBaryonicPerfection(mName);
     }
 
     @Override
@@ -238,7 +237,7 @@ public class GT_MetaTileEntity_PurificationUnitParticleExtractor
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PurificationUnitParticleExtractor> getStructureDefinition() {
+    public IStructureDefinition<MTEPurificationUnitBaryonicPerfection> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -251,15 +250,15 @@ public class GT_MetaTileEntity_PurificationUnitParticleExtractor
     }
 
     @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("Purification Unit")
             .addInfo(
                 EnumChatFormatting.AQUA + ""
                     + EnumChatFormatting.BOLD
                     + "Water Tier: "
                     + EnumChatFormatting.WHITE
-                    + GT_Utility.formatNumbers(getWaterTier())
+                    + GTUtility.formatNumbers(getWaterTier())
                     + EnumChatFormatting.RESET)
             .addInfo("Controller block for the Absolute Baryonic Perfection Purification Unit.")
             .addInfo("Must be linked to a Purification Plant using a data stick to work.")
@@ -369,10 +368,10 @@ public class GT_MetaTileEntity_PurificationUnitParticleExtractor
     }
 
     private boolean isCatalyst(ItemStack stack) {
-        if (stack.getItem() instanceof GT_MetaGenerated_Item_03) {
+        if (stack.getItem() instanceof MetaGeneratedItem03) {
             int meta = stack.getItemDamage() - 32000; // why, greg.
-            return meta >= ID_MetaItem_03.Quark_Creation_Catalyst_Up.ID
-                && meta <= ID_MetaItem_03.Quark_Creation_Catalyst_Top.ID;
+            return meta >= IDMetaItem03.Quark_Creation_Catalyst_Up.ID
+                && meta <= IDMetaItem03.Quark_Creation_Catalyst_Top.ID;
         }
         return false;
     }
@@ -439,7 +438,7 @@ public class GT_MetaTileEntity_PurificationUnitParticleExtractor
                     // Drain the input cost directly from a hatch since we are not inside
                     // recipe processing
                     boolean drained = false;
-                    for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) {
+                    for (MTEHatchInput hatch : this.mInputHatches) {
                         FluidStack drainedStack = hatch.drain(ForgeDirection.UNKNOWN, inputCost, true);
                         if (drainedStack != null && drainedStack.amount == inputCost.amount) {
                             drained = true;
@@ -519,12 +518,12 @@ public class GT_MetaTileEntity_PurificationUnitParticleExtractor
 
     public EnumChatFormatting getQuarkColor(ItemStack stack) {
         int meta = stack.getItemDamage() - 32000;
-        if (meta == ID_MetaItem_03.Quark_Creation_Catalyst_Up.ID) return EnumChatFormatting.BLUE;
-        if (meta == ID_MetaItem_03.Quark_Creation_Catalyst_Down.ID) return EnumChatFormatting.LIGHT_PURPLE;
-        if (meta == ID_MetaItem_03.Quark_Creation_Catalyst_Strange.ID) return EnumChatFormatting.YELLOW;
-        if (meta == ID_MetaItem_03.Quark_Creation_Catalyst_Charm.ID) return EnumChatFormatting.GREEN;
-        if (meta == ID_MetaItem_03.Quark_Creation_Catalyst_Bottom.ID) return EnumChatFormatting.AQUA;
-        if (meta == ID_MetaItem_03.Quark_Creation_Catalyst_Top.ID) return EnumChatFormatting.RED;
+        if (meta == IDMetaItem03.Quark_Creation_Catalyst_Up.ID) return EnumChatFormatting.BLUE;
+        if (meta == IDMetaItem03.Quark_Creation_Catalyst_Down.ID) return EnumChatFormatting.LIGHT_PURPLE;
+        if (meta == IDMetaItem03.Quark_Creation_Catalyst_Strange.ID) return EnumChatFormatting.YELLOW;
+        if (meta == IDMetaItem03.Quark_Creation_Catalyst_Charm.ID) return EnumChatFormatting.GREEN;
+        if (meta == IDMetaItem03.Quark_Creation_Catalyst_Bottom.ID) return EnumChatFormatting.AQUA;
+        if (meta == IDMetaItem03.Quark_Creation_Catalyst_Top.ID) return EnumChatFormatting.RED;
         return EnumChatFormatting.GRAY;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBase.java
index 075ddc74c2..e986f16940 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBase.java
@@ -41,18 +41,18 @@ import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.VoidingMode;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
+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.metadata.PurificationPlantBaseChanceKey;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Casings_Abstract;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.BlockCasingsAbstract;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
@@ -61,8 +61,8 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
  * When inheriting from this, make sure to call super.loadNBTData() and super.saveNBTData()
  * if you override these methods, or linking will break.
  */
-public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T>>
-    extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> {
+public abstract class MTEPurificationUnitBase<T extends MTEExtendedPowerMultiBlockBase<T>>
+    extends MTEExtendedPowerMultiBlockBase<T> {
 
     /**
      * Ratio of output fluid that needs to be inserted back as input to trigger a "water boost".
@@ -108,14 +108,14 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
     /**
      * Pointer to the main purification plant controller.
      */
-    private GT_MetaTileEntity_PurificationPlant controller = null;
+    private MTEPurificationPlant controller = null;
 
     /**
      * The current recipe being run in the purification unit. Note that purification unit recipes are a bit special,
      * so input and output in the recipe might not exactly match the required inputs and produced outputs.
      * For more information, always look at the purification unit tooltip and implementation.
      */
-    protected GT_Recipe currentRecipe = null;
+    protected GTRecipe currentRecipe = null;
 
     /**
      * Current chance of the recipe succeeding, always in [0, 100]. A chance above 100 will be interpreted as 100.
@@ -131,11 +131,11 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
 
     protected ArrayList<FluidStack> storedFluids = null;
 
-    protected GT_MetaTileEntity_PurificationUnitBase(int aID, String aName, String aNameRegional) {
+    protected MTEPurificationUnitBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    protected GT_MetaTileEntity_PurificationUnitBase(String aName) {
+    protected MTEPurificationUnitBase(String aName) {
         super(aName);
     }
 
@@ -166,7 +166,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
     }
 
     @Override
-    protected void setHatchRecipeMap(GT_MetaTileEntity_Hatch_Input hatch) {
+    protected void setHatchRecipeMap(MTEHatchInput hatch) {
         // Do nothing, we don't want to lock hatches to recipe maps since this can cause
         // them to reject our catalyst fluids
     }
@@ -179,7 +179,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
      * @return The correct index into the global texture atlas.
      */
     protected static int getTextureIndex(Block block, int meta) {
-        return ((GT_Block_Casings_Abstract) block).getTextureIndex(meta);
+        return ((BlockCasingsAbstract) block).getTextureIndex(meta);
     }
 
     @Override
@@ -210,11 +210,11 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
         RecipeMap<?> recipeMap = this.getRecipeMap();
 
         // Grab a stream of recipes and find the one with the highest success chance
-        Stream<GT_Recipe> recipes = recipeMap.findRecipeQuery()
+        Stream<GTRecipe> recipes = recipeMap.findRecipeQuery()
             .fluids(fluidInputs)
             .items(itemInputs)
             .findAll();
-        GT_Recipe recipe = recipes
+        GTRecipe recipe = recipes
             .max(Comparator.comparing(r -> r.getMetadataOrDefault(PurificationPlantBaseChanceKey.INSTANCE, 0.0f)))
             .orElse(null);
 
@@ -315,7 +315,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
     /**
      * Get the amount of water needed to execute a water boost, in mb.
      */
-    public FluidStack getWaterBoostAmount(GT_Recipe recipe) {
+    public FluidStack getWaterBoostAmount(GTRecipe recipe) {
         // Recipes should always be constructed so that output water is always the first fluid output
         FluidStack outputWater = recipe.mFluidOutputs[0];
         int amount = Math.round(outputWater.amount * WATER_BOOST_NEEDED_FLUID);
@@ -329,7 +329,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
      *
      * @param recipe The recipe to check the water boost of
      */
-    public boolean isWaterBoosted(GT_Recipe recipe) {
+    public boolean isWaterBoosted(GTRecipe recipe) {
         FluidStack inputWater = getWaterBoostAmount(recipe);
         // Simulate input drain to see if we can water boost
         return depleteInput(inputWater, true);
@@ -459,7 +459,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
                 int amount = mOutputFluids[0].amount;
                 // For tier 1, this is distilled water, so we cannot use the helper function!
                 if (waterTier == 1) {
-                    return GT_ModHandler.getDistilledWater(amount);
+                    return GTModHandler.getDistilledWater(amount);
                 }
                 Materials water = PurifiedWaterHelpers.getPurifiedWaterTier(waterTier - 1);
                 return water.getFluid(amount);
@@ -538,11 +538,11 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
         IGregTechTileEntity ourBaseMetaTileEntity = this.getBaseMetaTileEntity();
         // First check whether the controller we try to link to is within range. The range is defined
         // as a max distance in each axis.
-        if (Math.abs(ourBaseMetaTileEntity.getXCoord() - x) > GT_MetaTileEntity_PurificationPlant.MAX_UNIT_DISTANCE)
+        if (Math.abs(ourBaseMetaTileEntity.getXCoord() - x) > MTEPurificationPlant.MAX_UNIT_DISTANCE)
             return LinkResult.TOO_FAR;
-        if (Math.abs(ourBaseMetaTileEntity.getYCoord() - y) > GT_MetaTileEntity_PurificationPlant.MAX_UNIT_DISTANCE)
+        if (Math.abs(ourBaseMetaTileEntity.getYCoord() - y) > MTEPurificationPlant.MAX_UNIT_DISTANCE)
             return LinkResult.TOO_FAR;
-        if (Math.abs(ourBaseMetaTileEntity.getZCoord() - z) > GT_MetaTileEntity_PurificationPlant.MAX_UNIT_DISTANCE)
+        if (Math.abs(ourBaseMetaTileEntity.getZCoord() - z) > MTEPurificationPlant.MAX_UNIT_DISTANCE)
             return LinkResult.TOO_FAR;
 
         // Find the block at the requested coordinated and check if it is a purification plant controller.
@@ -551,11 +551,11 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
         if (tileEntity == null) return LinkResult.NO_VALID_PLANT;
         if (!(tileEntity instanceof IGregTechTileEntity gtTileEntity)) return LinkResult.NO_VALID_PLANT;
         var metaTileEntity = gtTileEntity.getMetaTileEntity();
-        if (!(metaTileEntity instanceof GT_MetaTileEntity_PurificationPlant)) return LinkResult.NO_VALID_PLANT;
+        if (!(metaTileEntity instanceof MTEPurificationPlant)) return LinkResult.NO_VALID_PLANT;
 
         // Before linking, unlink from current controller, so we don't end up with units linked to multiple
         // controllers.
-        GT_MetaTileEntity_PurificationPlant oldController = getController();
+        MTEPurificationPlant oldController = getController();
         if (oldController != null) {
             oldController.unregisterLinkedUnit(this);
             this.unlinkController();
@@ -566,7 +566,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
         controllerY = y;
         controllerZ = z;
         controllerSet = true;
-        controller = (GT_MetaTileEntity_PurificationPlant) metaTileEntity;
+        controller = (MTEPurificationPlant) metaTileEntity;
         controller.registerLinkedUnit(this);
         return LinkResult.SUCCESS;
     }
@@ -617,7 +617,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
         return super.onRightclick(aBaseMetaTileEntity, aPlayer);
     }
 
-    public GT_MetaTileEntity_PurificationPlant getController() {
+    public MTEPurificationPlant getController() {
         if (controller == null) return null;
         // Controller disappeared
         if (controller.getBaseMetaTileEntity() == null) return null;
@@ -637,7 +637,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
     @Override
     public void onBlockDestroyed() {
         // When this block is destroyed, explicitly unlink it from the controller if there is any.
-        GT_MetaTileEntity_PurificationPlant controller = getController();
+        MTEPurificationPlant controller = getController();
         if (controller != null) {
             controller.unregisterLinkedUnit(this);
         }
@@ -661,7 +661,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
             if (this.mMaxProgresstime != 0) {
                 ret.add(
                     "Success chance: " + EnumChatFormatting.YELLOW
-                        + GT_Utility.formatNumbers(this.calculateFinalSuccessChance())
+                        + GTUtility.formatNumbers(this.calculateFinalSuccessChance())
                         + "%"
                         + EnumChatFormatting.RESET);
             }
@@ -741,8 +741,8 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
             .setPlayClickSound(true)
             .setBackground(() -> {
                 List<UITexture> ret = new ArrayList<>();
-                ret.add(GT_UITextures.BUTTON_STANDARD);
-                ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON);
+                ret.add(GTUITextures.BUTTON_STANDARD);
+                ret.add(GTUITextures.OVERLAY_BUTTON_BATCH_MODE_ON);
                 return ret.toArray(new IDrawable[0]);
             })
             .addTooltip(translateToLocal("GT5U.tpm.parallelwindow"))
@@ -758,7 +758,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
         final int PARENT_WIDTH = getGUIWidth();
         final int PARENT_HEIGHT = getGUIHeight();
         ModularWindow.Builder builder = ModularWindow.builder(WIDTH, HEIGHT);
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.setGuiTint(getGUIColorization());
         builder.setDraggable(true);
         builder.setPos(
@@ -781,7 +781,7 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase<T extends GT_MetaTi
                     .setTextColor(Color.WHITE.normal)
                     .setSize(150, 18)
                     .setPos(4, 25)
-                    .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                    .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                     .attachSyncer(
                         new FakeSyncWidget.IntegerSyncer(() -> maxParallel, (val) -> maxParallel = val),
                         builder));
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitClarifier.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java
index 7823fa0ba7..4cd654af28 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitClarifier.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java
@@ -3,16 +3,16 @@ package gregtech.common.tileentities.machines.multi.purification;
 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 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.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorNotAPenguin;
+import static gregtech.api.enums.GTValues.AuthorNotAPenguin;
+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.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.Arrays;
 import java.util.List;
@@ -34,7 +34,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.Materials;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
@@ -47,12 +47,11 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_PurificationUnitClarifier
-    extends GT_MetaTileEntity_PurificationUnitBase<GT_MetaTileEntity_PurificationUnitClarifier>
+public class MTEPurificationUnitClarifier extends MTEPurificationUnitBase<MTEPurificationUnitClarifier>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
@@ -65,7 +64,7 @@ public class GT_MetaTileEntity_PurificationUnitClarifier
     // Chance that the filter is damaged every cycle.
     public static final float FILTER_DAMAGE_RATE = 20.0f;
 
-    private static final int CASING_TEXTURE_INDEX = getTextureIndex(GregTech_API.sBlockCasings9, 5);
+    private static final int CASING_TEXTURE_INDEX = getTextureIndex(GregTechAPI.sBlockCasings9, 5);
 
     private static final String[][] structure =
         // spotless:off
@@ -84,8 +83,8 @@ public class GT_MetaTileEntity_PurificationUnitClarifier
             { "           ", "   AAAAA   ", "   AHAHA   ", "   AAAAA   " } };
     // spotless:on
 
-    private static final IStructureDefinition<GT_MetaTileEntity_PurificationUnitClarifier> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PurificationUnitClarifier>builder()
+    private static final IStructureDefinition<MTEPurificationUnitClarifier> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPurificationUnitClarifier>builder()
         .addShape(STRUCTURE_PIECE_MAIN, structure)
         .addShape(
             STRUCTURE_PIECE_MAIN_SURVIVAL,
@@ -100,29 +99,29 @@ public class GT_MetaTileEntity_PurificationUnitClarifier
             'H',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitClarifier>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEPurificationUnitClarifier>buildHatchAdder()
                         .atLeastList(t.getAllowedHatches())
                         .casingIndex(CASING_TEXTURE_INDEX)
                         .dot(1)
                         .build()),
                 // Reinforced Sterile Water Plant Casing
-                ofBlock(GregTech_API.sBlockCasings9, 5)))
+                ofBlock(GregTechAPI.sBlockCasings9, 5)))
         // Reinforced Sterile Water Plant Casing
-        .addElement('A', ofBlock(GregTech_API.sBlockCasings9, 5))
+        .addElement('A', ofBlock(GregTechAPI.sBlockCasings9, 5))
         // PTFE pipe casing
-        .addElement('B', ofBlock(GregTech_API.sBlockCasings8, 1))
+        .addElement('B', ofBlock(GregTechAPI.sBlockCasings8, 1))
         .addElement('C', ofFrame(Materials.Iridium))
         .addElement('D', ofFrame(Materials.DamascusSteel))
         .addElement('W', ofChain(ofBlock(Blocks.water, 0)))
         // Filter machine casing
-        .addElement('F', ofBlock(GregTech_API.sBlockCasings3, 11))
+        .addElement('F', ofBlock(GregTechAPI.sBlockCasings3, 11))
         .build();
 
-    public GT_MetaTileEntity_PurificationUnitClarifier(int aID, String aName, String aNameRegional) {
+    public MTEPurificationUnitClarifier(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_PurificationUnitClarifier(String aName) {
+    public MTEPurificationUnitClarifier(String aName) {
         super(aName);
     }
 
@@ -164,7 +163,7 @@ public class GT_MetaTileEntity_PurificationUnitClarifier
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PurificationUnitClarifier> getStructureDefinition() {
+    public IStructureDefinition<MTEPurificationUnitClarifier> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -175,15 +174,15 @@ public class GT_MetaTileEntity_PurificationUnitClarifier
     }
 
     @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("Purification Unit")
             .addInfo(
                 EnumChatFormatting.AQUA + ""
                     + EnumChatFormatting.BOLD
                     + "Water Tier: "
                     + EnumChatFormatting.WHITE
-                    + GT_Utility.formatNumbers(getWaterTier())
+                    + GTUtility.formatNumbers(getWaterTier())
                     + EnumChatFormatting.RESET)
             .addInfo("Controller block for the Clarifier Purification Unit.")
             .addInfo("Must be linked to a Purification Plant using a data stick to work.")
@@ -191,7 +190,7 @@ public class GT_MetaTileEntity_PurificationUnitClarifier
             .addInfo("Requires a filter made of Activated Carbon to work.")
             .addInfo(
                 "Every cycle, has a " + EnumChatFormatting.RED
-                    + GT_Utility.formatNumbers(FILTER_DAMAGE_RATE)
+                    + GTUtility.formatNumbers(FILTER_DAMAGE_RATE)
                     + "%"
                     + EnumChatFormatting.GRAY
                     + " chance to destroy the filter.")
@@ -271,7 +270,7 @@ public class GT_MetaTileEntity_PurificationUnitClarifier
             env,
             true);
         if (built == -1) {
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 env.getActor(),
                 EnumChatFormatting.GREEN + "Auto placing done ! Now go place the water yourself !");
             return 0;
@@ -281,10 +280,10 @@ public class GT_MetaTileEntity_PurificationUnitClarifier
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PurificationUnitClarifier(this.mName);
+        return new MTEPurificationUnitClarifier(this.mName);
     }
 
-    private List<IHatchElement<? super GT_MetaTileEntity_PurificationUnitClarifier>> getAllowedHatches() {
+    private List<IHatchElement<? super MTEPurificationUnitClarifier>> getAllowedHatches() {
         return ImmutableList.of(InputBus, InputHatch, OutputBus, OutputHatch);
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitDegasifier.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java
index 5a8e96ea48..b139a0f6d4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitDegasifier.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.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.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorNotAPenguin;
+import static gregtech.api.enums.GTValues.AuthorNotAPenguin;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_GLOW;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,13 +29,13 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 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 bartworks.system.material.WerkstoffLoader;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.TierEU;
@@ -43,22 +43,21 @@ import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchMultiInput;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.IGT_HatchAdder;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.IGTHatchAdder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_PurificationUnitDegasifier
-    extends GT_MetaTileEntity_PurificationUnitBase<GT_MetaTileEntity_PurificationUnitDegasifier>
+public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPurificationUnitDegasser>
     implements ISurvivalConstructable {
 
-    private static final int CASING_INDEX_MAIN = getTextureIndex(GregTech_API.sBlockCasings9, 11);
+    private static final int CASING_INDEX_MAIN = getTextureIndex(GregTechAPI.sBlockCasings9, 11);
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
 
@@ -86,22 +85,22 @@ public class GT_MetaTileEntity_PurificationUnitDegasifier
     private int casingCount = 0;
     private static final int MIN_CASING = 780;
 
-    private static final IStructureDefinition<GT_MetaTileEntity_PurificationUnitDegasifier> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PurificationUnitDegasifier>builder()
+    private static final IStructureDefinition<MTEPurificationUnitDegasser> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPurificationUnitDegasser>builder()
         .addShape(STRUCTURE_PIECE_MAIN, structure)
         .addElement(
             'A',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitDegasifier>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEPurificationUnitDegasser>buildHatchAdder()
                         .atLeastList(Arrays.asList(InputHatch, OutputHatch, SpecialHatchElement.ControlHatch))
                         .casingIndex(CASING_INDEX_MAIN)
                         .dot(1)
                         .cacheHint(() -> "Input Hatch, Output Hatch, Control Hatch")
                         .build()),
-                onElementPass(t -> t.casingCount++, ofBlock(GregTech_API.sBlockCasings9, 11))))
+                onElementPass(t -> t.casingCount++, ofBlock(GregTechAPI.sBlockCasings9, 11))))
         // Omni-purpose infinity fused glass
-        .addElement('B', ofBlock(GregTech_API.sBlockGlass1, 2))
+        .addElement('B', ofBlock(GregTechAPI.sBlockGlass1, 2))
         .addElement('C', ofFrame(Materials.Bedrockium))
         .build();
 
@@ -210,19 +209,19 @@ public class GT_MetaTileEntity_PurificationUnitDegasifier
 
     private float outputMultiplier = 1.0f;
 
-    private GT_MetaTileEntity_Hatch_DegasifierControlHatch controlHatch = null;
+    private MTEHatchDegasifierControl controlHatch = null;
 
-    public GT_MetaTileEntity_PurificationUnitDegasifier(int aID, String aName, String aNameRegional) {
+    public MTEPurificationUnitDegasser(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    protected GT_MetaTileEntity_PurificationUnitDegasifier(String aName) {
+    protected MTEPurificationUnitDegasser(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PurificationUnitDegasifier(mName);
+        return new MTEPurificationUnitDegasser(mName);
     }
 
     @Override
@@ -278,20 +277,20 @@ public class GT_MetaTileEntity_PurificationUnitDegasifier
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PurificationUnitDegasifier> getStructureDefinition() {
+    public IStructureDefinition<MTEPurificationUnitDegasser> 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("Purification Unit")
             .addInfo(
                 EnumChatFormatting.AQUA + ""
                     + EnumChatFormatting.BOLD
                     + "Water Tier: "
                     + EnumChatFormatting.WHITE
-                    + GT_Utility.formatNumbers(getWaterTier())
+                    + GTUtility.formatNumbers(getWaterTier())
                     + EnumChatFormatting.RESET)
             .addInfo("Controller block for the Residual Decontaminant Degasser Purification Unit.")
             .addInfo("Must be linked to a Purification Plant using a data stick to work.")
@@ -642,10 +641,10 @@ public class GT_MetaTileEntity_PurificationUnitDegasifier
         this.controlHatch.updateOutputSignal(this.controlSignal.getSignal());
     }
 
-    private static ArrayList<FluidStack> getDrainableFluidsFromHatch(GT_MetaTileEntity_Hatch_Input hatch) {
+    private static ArrayList<FluidStack> getDrainableFluidsFromHatch(MTEHatchInput hatch) {
         // Need special handling for quad input hatches, otherwise it only returns the first fluid in the hatch
-        if (hatch instanceof GT_MetaTileEntity_Hatch_MultiInput) {
-            return new ArrayList<>(Arrays.asList(((GT_MetaTileEntity_Hatch_MultiInput) hatch).getStoredFluid()));
+        if (hatch instanceof MTEHatchMultiInput) {
+            return new ArrayList<>(Arrays.asList(((MTEHatchMultiInput) hatch).getStoredFluid()));
         }
         return new ArrayList<>(Collections.singletonList(hatch.getFluid()));
     }
@@ -657,7 +656,7 @@ public class GT_MetaTileEntity_PurificationUnitDegasifier
         // If machine is running, continuously consume all valid inputs
         if (mMaxProgresstime > 0 && aTick % CONSUME_INTERVAL == 0) {
             // For each hatch, check if each fluid inside is one of the valid fluids. If so, consume it all.
-            for (GT_MetaTileEntity_Hatch_Input hatch : mInputHatches) {
+            for (MTEHatchInput hatch : mInputHatches) {
                 ArrayList<FluidStack> drainableFluids = getDrainableFluidsFromHatch(hatch);
                 for (FluidStack fluid : drainableFluids) {
                     if (fluid != null && isValidFluid(fluid)) {
@@ -718,11 +717,11 @@ public class GT_MetaTileEntity_PurificationUnitDegasifier
     public boolean addControlHatchToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DegasifierControlHatch) {
+        if (aMetaTileEntity instanceof MTEHatchDegasifierControl) {
             // Only allow a single control hatch, so fail structure check if there is already one
             if (this.controlHatch == null) {
-                ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-                this.controlHatch = (GT_MetaTileEntity_Hatch_DegasifierControlHatch) aMetaTileEntity;
+                ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+                this.controlHatch = (MTEHatchDegasifierControl) aMetaTileEntity;
                 return true;
             }
         }
@@ -799,22 +798,21 @@ public class GT_MetaTileEntity_PurificationUnitDegasifier
         return info.toArray(new String[] {});
     }
 
-    private enum SpecialHatchElement implements IHatchElement<GT_MetaTileEntity_PurificationUnitDegasifier> {
+    private enum SpecialHatchElement implements IHatchElement<MTEPurificationUnitDegasser> {
 
-        ControlHatch(GT_MetaTileEntity_PurificationUnitDegasifier::addControlHatchToMachineList,
-            GT_MetaTileEntity_Hatch_DegasifierControlHatch.class) {
+        ControlHatch(MTEPurificationUnitDegasser::addControlHatchToMachineList, MTEHatchDegasifierControl.class) {
 
             @Override
-            public long count(GT_MetaTileEntity_PurificationUnitDegasifier mte) {
+            public long count(MTEPurificationUnitDegasser mte) {
                 return mte.controlHatch == null ? 0 : 1;
             }
         };
 
         private final List<Class<? extends IMetaTileEntity>> mteClasses;
-        private final IGT_HatchAdder<GT_MetaTileEntity_PurificationUnitDegasifier> adder;
+        private final IGTHatchAdder<MTEPurificationUnitDegasser> adder;
 
         @SafeVarargs
-        SpecialHatchElement(IGT_HatchAdder<GT_MetaTileEntity_PurificationUnitDegasifier> adder,
+        SpecialHatchElement(IGTHatchAdder<MTEPurificationUnitDegasser> adder,
             Class<? extends IMetaTileEntity>... mteClasses) {
             this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses));
             this.adder = adder;
@@ -825,7 +823,7 @@ public class GT_MetaTileEntity_PurificationUnitDegasifier
             return mteClasses;
         }
 
-        public IGT_HatchAdder<? super GT_MetaTileEntity_PurificationUnitDegasifier> adder() {
+        public IGTHatchAdder<? super MTEPurificationUnitDegasser> adder() {
             return adder;
         }
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitFlocculation.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java
index 3f414d0eca..36856fa11c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitFlocculation.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java
@@ -5,17 +5,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
-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.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorNotAPenguin;
+import static gregtech.api.enums.GTValues.AuthorNotAPenguin;
+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.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_GLOW;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,7 +36,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.Materials;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
@@ -48,13 +48,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 
-public class GT_MetaTileEntity_PurificationUnitFlocculation
-    extends GT_MetaTileEntity_PurificationUnitBase<GT_MetaTileEntity_PurificationUnitFlocculation>
+public class MTEPurificationUnitFlocculation extends MTEPurificationUnitBase<MTEPurificationUnitFlocculation>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
@@ -111,13 +110,13 @@ public class GT_MetaTileEntity_PurificationUnitFlocculation
         };
         // spotless:on
 
-    private static final int MAIN_CASING_INDEX = getTextureIndex(GregTech_API.sBlockCasings9, 6);
+    private static final int MAIN_CASING_INDEX = getTextureIndex(GregTechAPI.sBlockCasings9, 6);
 
     private int casingCount = 0;
     private static final int MIN_CASING = 56;
 
-    private static final IStructureDefinition<GT_MetaTileEntity_PurificationUnitFlocculation> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PurificationUnitFlocculation>builder()
+    private static final IStructureDefinition<MTEPurificationUnitFlocculation> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPurificationUnitFlocculation>builder()
         .addShape(STRUCTURE_PIECE_MAIN, structure)
         .addShape(
             STRUCTURE_PIECE_MAIN_SURVIVAL,
@@ -128,43 +127,43 @@ public class GT_MetaTileEntity_PurificationUnitFlocculation
                         .toArray(String[]::new))
                 .toArray(String[][]::new))
         // Filter machine casing
-        .addElement('A', ofBlock(GregTech_API.sBlockCasings3, 11))
+        .addElement('A', ofBlock(GregTechAPI.sBlockCasings3, 11))
         .addElement(
             'B',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitFlocculation>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEPurificationUnitFlocculation>buildHatchAdder()
                         .atLeastList(t.getAllowedHatches())
                         .casingIndex(MAIN_CASING_INDEX)
                         .dot(1)
                         .build()),
                 // Clean Flocculation Casing
-                onElementPass(t -> t.casingCount++, ofBlock(GregTech_API.sBlockCasings9, 6))))
+                onElementPass(t -> t.casingCount++, ofBlock(GregTechAPI.sBlockCasings9, 6))))
         // Reinforced Sterile Water Plant Casing
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings9, 5))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings9, 5))
         // Sterile Water Plant Casing
-        .addElement('D', ofBlock(GregTech_API.sBlockCasings9, 4))
+        .addElement('D', ofBlock(GregTechAPI.sBlockCasings9, 4))
         .addElement('E', ofFrame(Materials.Adamantium))
         .addElement('W', ofBlock(Blocks.water, 0))
         // Tinted industrial glass
-        .addElement('G', ofBlockAnyMeta(GregTech_API.sBlockTintedGlass))
+        .addElement('G', ofBlockAnyMeta(GregTechAPI.sBlockTintedGlass))
         .build();
 
-    List<IHatchElement<? super GT_MetaTileEntity_PurificationUnitFlocculation>> getAllowedHatches() {
+    List<IHatchElement<? super MTEPurificationUnitFlocculation>> getAllowedHatches() {
         return ImmutableList.of(InputBus, InputHatch, OutputBus, OutputHatch);
     }
 
-    public GT_MetaTileEntity_PurificationUnitFlocculation(int aID, String aName, String aNameRegional) {
+    public MTEPurificationUnitFlocculation(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_PurificationUnitFlocculation(String aName) {
+    public MTEPurificationUnitFlocculation(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PurificationUnitFlocculation(this.mName);
+        return new MTEPurificationUnitFlocculation(this.mName);
     }
 
     @Override
@@ -218,7 +217,7 @@ public class GT_MetaTileEntity_PurificationUnitFlocculation
             env,
             true);
         if (built == -1) {
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 env.getActor(),
                 EnumChatFormatting.GREEN + "Auto placing done ! Now go place the water yourself !");
             return 0;
@@ -227,7 +226,7 @@ public class GT_MetaTileEntity_PurificationUnitFlocculation
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PurificationUnitFlocculation> getStructureDefinition() {
+    public IStructureDefinition<MTEPurificationUnitFlocculation> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -257,15 +256,15 @@ public class GT_MetaTileEntity_PurificationUnitFlocculation
     }
 
     @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("Purification Unit")
             .addInfo(
                 EnumChatFormatting.AQUA + ""
                     + EnumChatFormatting.BOLD
                     + "Water Tier: "
                     + EnumChatFormatting.WHITE
-                    + GT_Utility.formatNumbers(getWaterTier())
+                    + GTUtility.formatNumbers(getWaterTier())
                     + EnumChatFormatting.RESET)
             .addInfo("Controller block for the Flocculation Purification Unit.")
             .addInfo("Must be linked to a Purification Plant using a data stick to work.")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitOzonation.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java
index a539cd157e..f1d3b56fe8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitOzonation.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java
@@ -5,15 +5,15 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.OutputBus;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorNotAPenguin;
+import static gregtech.api.enums.GTValues.AuthorNotAPenguin;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.OutputBus;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_GLOW;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -29,7 +29,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.Materials;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
@@ -41,12 +41,11 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_PurificationUnitOzonation
-    extends GT_MetaTileEntity_PurificationUnitBase<GT_MetaTileEntity_PurificationUnitOzonation>
+public class MTEPurificationUnitOzonation extends MTEPurificationUnitBase<MTEPurificationUnitOzonation>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
@@ -61,7 +60,7 @@ public class GT_MetaTileEntity_PurificationUnitOzonation
         { "         ", "         ", "      A  ", "      A  ", "     AAA ", "     AAA ", "     AAA ", "     AAA ", "     AAA ", "     AAA " } };
     // spotless:on
 
-    private static final int MAIN_CASING_INDEX = getTextureIndex(GregTech_API.sBlockCasings9, 10);
+    private static final int MAIN_CASING_INDEX = getTextureIndex(GregTechAPI.sBlockCasings9, 10);
 
     private static final int OFFSET_X = 6;
     private static final int OFFSET_Y = 9;
@@ -75,49 +74,49 @@ public class GT_MetaTileEntity_PurificationUnitOzonation
     private int casingCount = 0;
     private static final int MIN_CASING = 96;
 
-    private static final IStructureDefinition<GT_MetaTileEntity_PurificationUnitOzonation> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PurificationUnitOzonation>builder()
+    private static final IStructureDefinition<MTEPurificationUnitOzonation> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPurificationUnitOzonation>builder()
         .addShape(STRUCTURE_PIECE_MAIN, structure)
         // Inert Filtration Casing
         .addElement(
             'A',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitOzonation>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEPurificationUnitOzonation>buildHatchAdder()
                         .atLeastList(ImmutableList.of(InputHatch, OutputHatch, OutputBus))
-                        .casingIndex(getTextureIndex(GregTech_API.sBlockCasings9, 10))
+                        .casingIndex(getTextureIndex(GregTechAPI.sBlockCasings9, 10))
                         .dot(1)
                         .build()),
-                onElementPass(t -> t.casingCount++, ofBlock(GregTech_API.sBlockCasings9, 10))))
+                onElementPass(t -> t.casingCount++, ofBlock(GregTechAPI.sBlockCasings9, 10))))
         // High Pressure Resistant Casing (possibly placeholder name)
-        .addElement('B', ofBlock(GregTech_API.sBlockCasings9, 9))
+        .addElement('B', ofBlock(GregTechAPI.sBlockCasings9, 9))
         // PTFE pipe casing
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings8, 1))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings8, 1))
         // Any tinted industrial glass
-        .addElement('D', ofBlockAnyMeta(GregTech_API.sBlockTintedGlass))
+        .addElement('D', ofBlockAnyMeta(GregTechAPI.sBlockTintedGlass))
         .addElement('E', ofFrame(Materials.TungstenSteel))
         // Ozone input hatch
         .addElement(
             'O',
             lazy(
-                t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitOzonation>buildHatchAdder()
+                t -> GTStructureUtility.<MTEPurificationUnitOzonation>buildHatchAdder()
                     .atLeast(InputHatch)
-                    .casingIndex(getTextureIndex(GregTech_API.sBlockCasings9, 9))
+                    .casingIndex(getTextureIndex(GregTechAPI.sBlockCasings9, 9))
                     .dot(2)
-                    .buildAndChain(ofBlock(GregTech_API.sBlockCasings9, 9))))
+                    .buildAndChain(ofBlock(GregTechAPI.sBlockCasings9, 9))))
         .build();
 
-    public GT_MetaTileEntity_PurificationUnitOzonation(int aID, String aName, String aNameRegional) {
+    public MTEPurificationUnitOzonation(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    protected GT_MetaTileEntity_PurificationUnitOzonation(String aName) {
+    protected MTEPurificationUnitOzonation(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PurificationUnitOzonation(this.mName);
+        return new MTEPurificationUnitOzonation(this.mName);
     }
 
     @Override
@@ -167,20 +166,20 @@ public class GT_MetaTileEntity_PurificationUnitOzonation
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PurificationUnitOzonation> getStructureDefinition() {
+    public IStructureDefinition<MTEPurificationUnitOzonation> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
     @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("Purification Unit")
             .addInfo(
                 EnumChatFormatting.AQUA + ""
                     + EnumChatFormatting.BOLD
                     + "Water Tier: "
                     + EnumChatFormatting.WHITE
-                    + GT_Utility.formatNumbers(getWaterTier())
+                    + GTUtility.formatNumbers(getWaterTier())
                     + EnumChatFormatting.RESET)
             .addInfo("Controller block for the Ozonation Purification Unit.")
             .addInfo("Must be linked to a Purification Plant using a data stick to work.")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java
index 58b689b04d..803d9b684e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java
@@ -3,16 +3,16 @@ package gregtech.common.tileentities.machines.multi.purification;
 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 gregtech.api.enums.GT_HatchElement.InputBus;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorNotAPenguin;
+import static gregtech.api.enums.GTValues.AuthorNotAPenguin;
+import static gregtech.api.enums.HatchElement.InputBus;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_GLOW;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,7 +35,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.Materials;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
@@ -44,20 +44,19 @@ import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.IGT_HatchAdder;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.IGTHatchAdder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.shutdown.SimpleShutDownReason;
 
-public class GT_MetaTileEntity_PurificationUnitPhAdjustment
-    extends GT_MetaTileEntity_PurificationUnitBase<GT_MetaTileEntity_PurificationUnitPhAdjustment>
+public class MTEPurificationUnitPhAdjustment extends MTEPurificationUnitBase<MTEPurificationUnitPhAdjustment>
     implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
@@ -74,8 +73,8 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
         { "E   E     E   E", "EAAAE     EAAAE", "EAGAE     EAHAE", "EAGAE     EAHAE", "EAGAE     EAHAE", "EAAAE     EAAAE" } };
     // spotless:on
 
-    private static final int CASING_INDEX_MIDDLE = getTextureIndex(GregTech_API.sBlockCasings9, 7);
-    private static final int CASING_INDEX_TOWER = getTextureIndex(GregTech_API.sBlockCasings9, 8);
+    private static final int CASING_INDEX_MIDDLE = getTextureIndex(GregTechAPI.sBlockCasings9, 7);
+    private static final int CASING_INDEX_TOWER = getTextureIndex(GregTechAPI.sBlockCasings9, 8);
 
     /**
      * The current pH value of the water inside the multiblock
@@ -125,60 +124,60 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
     /**
      * The input hatch for the acidic material
      */
-    private GT_MetaTileEntity_Hatch_Input acidInputHatch;
+    private MTEHatchInput acidInputHatch;
     /**
      * The input bus for the alkaline material
      */
-    private GT_MetaTileEntity_Hatch_InputBus alkalineInputBus;
+    private MTEHatchInputBus alkalineInputBus;
 
     /**
      * List of all placed sensor hatches in the multi, so we can update them with the proper pH value when it changes.
      */
-    private final ArrayList<GT_MetaTileEntity_pHSensor> sensorHatches = new ArrayList<>();
+    private final ArrayList<MTEHatchPHSensor> sensorHatches = new ArrayList<>();
 
-    private static final IStructureDefinition<GT_MetaTileEntity_PurificationUnitPhAdjustment> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PurificationUnitPhAdjustment>builder()
+    private static final IStructureDefinition<MTEPurificationUnitPhAdjustment> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPurificationUnitPhAdjustment>builder()
         .addShape(STRUCTURE_PIECE_MAIN, structure)
         // Extreme Corrosion Resistant Casing
-        .addElement('A', ofBlock(GregTech_API.sBlockCasings9, 8))
+        .addElement('A', ofBlock(GregTechAPI.sBlockCasings9, 8))
         // Naquadah Reinforced Water Plant Casing
-        .addElement('B', ofBlock(GregTech_API.sBlockCasings9, 7))
+        .addElement('B', ofBlock(GregTechAPI.sBlockCasings9, 7))
         .addElement('E', ofFrame(Materials.NaquadahAlloy))
         // pH Resistant Glass
-        .addElement('G', ofBlock(GregTech_API.sBlockGlass1, 0))
-        .addElement('H', ofBlock(GregTech_API.sBlockGlass1, 0))
+        .addElement('G', ofBlock(GregTechAPI.sBlockGlass1, 0))
+        .addElement('H', ofBlock(GregTechAPI.sBlockGlass1, 0))
         // Regular I/O hatches
         .addElement(
             'I',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitPhAdjustment>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEPurificationUnitPhAdjustment>buildHatchAdder()
                         .atLeastList(t.getAllowedHatches())
                         .dot(1)
                         .casingIndex(CASING_INDEX_MIDDLE)
                         .build()),
                 // Naquadah Reinforced Water Plant Casing
-                ofBlock(GregTech_API.sBlockCasings9, 7)))
+                ofBlock(GregTechAPI.sBlockCasings9, 7)))
         .addElement(
             'R',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitPhAdjustment>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEPurificationUnitPhAdjustment>buildHatchAdder()
                         .atLeast(SpecialHatchElement.PhSensor)
                         .dot(2)
                         .cacheHint(() -> "pH Sensor Hatch")
                         .casingIndex(CASING_INDEX_MIDDLE)
                         .build()),
                 // Naquadah Reinforced Water Plant Casing
-                ofBlock(GregTech_API.sBlockCasings9, 7)))
+                ofBlock(GregTechAPI.sBlockCasings9, 7)))
         // Special I/O hatches
         .addElement(
             'X',
             lazy(
-                t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitPhAdjustment>buildHatchAdder()
+                t -> GTStructureUtility.<MTEPurificationUnitPhAdjustment>buildHatchAdder()
                     .atLeast(InputBus)
                     .dot(3)
-                    .adder(GT_MetaTileEntity_PurificationUnitPhAdjustment::addAlkalineBusToMachineList)
+                    .adder(MTEPurificationUnitPhAdjustment::addAlkalineBusToMachineList)
                     .cacheHint(() -> "Input Bus (" + ALKALINE_MATERIAL.mLocalizedName + ")")
                     .casingIndex(CASING_INDEX_TOWER)
                     .allowOnly(ForgeDirection.UP)
@@ -186,17 +185,17 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
         .addElement(
             'Y',
             lazy(
-                t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitPhAdjustment>buildHatchAdder()
+                t -> GTStructureUtility.<MTEPurificationUnitPhAdjustment>buildHatchAdder()
                     .atLeast(InputHatch)
                     .dot(4)
-                    .adder(GT_MetaTileEntity_PurificationUnitPhAdjustment::addAcidHatchToMachineList)
+                    .adder(MTEPurificationUnitPhAdjustment::addAcidHatchToMachineList)
                     .cacheHint(() -> "Input Hatch (" + ACIDIC_MATERIAL.mLocalizedName + ")")
                     .casingIndex(CASING_INDEX_TOWER)
                     .allowOnly(ForgeDirection.UP)
                     .build()))
         .build();
 
-    private List<IHatchElement<? super GT_MetaTileEntity_PurificationUnitPhAdjustment>> getAllowedHatches() {
+    private List<IHatchElement<? super MTEPurificationUnitPhAdjustment>> getAllowedHatches() {
         return ImmutableList.of(InputHatch, OutputHatch);
     }
 
@@ -228,17 +227,17 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
         return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX_MIDDLE) };
     }
 
-    public GT_MetaTileEntity_PurificationUnitPhAdjustment(int aID, String aName, String aNameRegional) {
+    public MTEPurificationUnitPhAdjustment(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_PurificationUnitPhAdjustment(String aName) {
+    public MTEPurificationUnitPhAdjustment(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PurificationUnitPhAdjustment(this.mName);
+        return new MTEPurificationUnitPhAdjustment(this.mName);
     }
 
     @Override
@@ -266,7 +265,7 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PurificationUnitPhAdjustment> getStructureDefinition() {
+    public IStructureDefinition<MTEPurificationUnitPhAdjustment> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -279,10 +278,10 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
         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;
-            acidInputHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchInput) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null;
+            acidInputHatch = (MTEHatchInput) aMetaTileEntity;
             return true;
         }
         return false;
@@ -292,10 +291,10 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
-            ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-            ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = null;
-            alkalineInputBus = (GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchInputBus) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            ((MTEHatchInputBus) aMetaTileEntity).mRecipeMap = null;
+            alkalineInputBus = (MTEHatchInputBus) aMetaTileEntity;
             return true;
         }
         return false;
@@ -304,23 +303,23 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
     public boolean addSensorHatchToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_pHSensor) {
-            ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-            return this.sensorHatches.add((GT_MetaTileEntity_pHSensor) aMetaTileEntity);
+        if (aMetaTileEntity instanceof MTEHatchPHSensor) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            return this.sensorHatches.add((MTEHatchPHSensor) aMetaTileEntity);
         }
         return false;
     }
 
     @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("Purification Unit")
             .addInfo(
                 EnumChatFormatting.AQUA + ""
                     + EnumChatFormatting.BOLD
                     + "Water Tier: "
                     + EnumChatFormatting.WHITE
-                    + GT_Utility.formatNumbers(getWaterTier())
+                    + GTUtility.formatNumbers(getWaterTier())
                     + EnumChatFormatting.RESET)
             .addInfo("Controller block for the pH Neutralization Purification Unit.")
             .addInfo("Must be linked to a Purification Plant using a data stick to work.")
@@ -515,7 +514,7 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
         super.onPostTick(aBaseMetaTileEntity, aTimer);
         // Update sensor hatch
-        for (GT_MetaTileEntity_pHSensor hatch : sensorHatches) {
+        for (MTEHatchPHSensor hatch : sensorHatches) {
             hatch.updateRedstoneOutput(this.currentpHValue);
         }
     }
@@ -577,23 +576,21 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
         return SoundResource.GT_MACHINES_PURIFICATION_PH_LOOP.resourceLocation;
     }
 
-    private enum SpecialHatchElement implements IHatchElement<GT_MetaTileEntity_PurificationUnitPhAdjustment> {
+    private enum SpecialHatchElement implements IHatchElement<MTEPurificationUnitPhAdjustment> {
 
-        PhSensor(GT_MetaTileEntity_PurificationUnitPhAdjustment::addSensorHatchToMachineList,
-            GT_MetaTileEntity_pHSensor.class) {
+        PhSensor(MTEPurificationUnitPhAdjustment::addSensorHatchToMachineList, MTEHatchPHSensor.class) {
 
             @Override
-            public long count(
-                GT_MetaTileEntity_PurificationUnitPhAdjustment gtMetaTileEntityPurificationUnitPhAdjustment) {
+            public long count(MTEPurificationUnitPhAdjustment gtMetaTileEntityPurificationUnitPhAdjustment) {
                 return gtMetaTileEntityPurificationUnitPhAdjustment.sensorHatches.size();
             }
         };
 
         private final List<Class<? extends IMetaTileEntity>> mteClasses;
-        private final IGT_HatchAdder<GT_MetaTileEntity_PurificationUnitPhAdjustment> adder;
+        private final IGTHatchAdder<MTEPurificationUnitPhAdjustment> adder;
 
         @SafeVarargs
-        SpecialHatchElement(IGT_HatchAdder<GT_MetaTileEntity_PurificationUnitPhAdjustment> adder,
+        SpecialHatchElement(IGTHatchAdder<MTEPurificationUnitPhAdjustment> adder,
             Class<? extends IMetaTileEntity>... mteClasses) {
             this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses));
             this.adder = adder;
@@ -604,7 +601,7 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment
             return mteClasses;
         }
 
-        public IGT_HatchAdder<? super GT_MetaTileEntity_PurificationUnitPhAdjustment> adder() {
+        public IGTHatchAdder<? super MTEPurificationUnitPhAdjustment> adder() {
             return adder;
         }
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java
index 8b10cae9b7..f59554171f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java
@@ -5,16 +5,16 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
-import static gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorNotAPenguin;
+import static gregtech.api.enums.GTValues.AuthorNotAPenguin;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_GLOW;
 import static gregtech.api.recipe.RecipeMaps.purificationPlasmaHeatingRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,7 +36,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
 import gregtech.api.enums.SoundResource;
@@ -46,21 +46,20 @@ import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.metatileentity.implementations.MTEHatch;
+import gregtech.api.metatileentity.implementations.MTEHatchInput;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
-    extends GT_MetaTileEntity_PurificationUnitBase<GT_MetaTileEntity_PurificationUnitPlasmaHeater>
+public class MTEPurificationUnitPlasmaHeater extends MTEPurificationUnitBase<MTEPurificationUnitPlasmaHeater>
     implements ISurvivalConstructable {
 
-    private static final int CASING_INDEX_HEATER = getTextureIndex(GregTech_API.sBlockCasings9, 11);
-    private static final int CASING_INDEX_TOWER = getTextureIndex(GregTech_API.sBlockCasings9, 5);
+    private static final int CASING_INDEX_HEATER = getTextureIndex(GregTechAPI.sBlockCasings9, 11);
+    private static final int CASING_INDEX_TOWER = getTextureIndex(GregTechAPI.sBlockCasings9, 5);
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
     private static final int STRUCTURE_X_OFFSET = 2;
@@ -113,8 +112,8 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
     private static final Materials plasmaMaterial = Materials.Helium;
     private static final Materials coolantMaterial = Materials.SuperCoolant;
 
-    private GT_MetaTileEntity_Hatch_Input plasmaInputHatch;
-    private GT_MetaTileEntity_Hatch_Input coolantInputHatch;
+    private MTEHatchInput plasmaInputHatch;
+    private MTEHatchInput coolantInputHatch;
 
     private static final String[][] structure = new String[][] {
         // spotless:off
@@ -138,26 +137,26 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
     private int casingCount = 0;
     private static final int MIN_CASING = 50;
 
-    private static final IStructureDefinition<GT_MetaTileEntity_PurificationUnitPlasmaHeater> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PurificationUnitPlasmaHeater>builder()
+    private static final IStructureDefinition<MTEPurificationUnitPlasmaHeater> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPurificationUnitPlasmaHeater>builder()
         .addShape(STRUCTURE_PIECE_MAIN, structure)
         // Superconducting coil block
-        .addElement('A', ofBlock(GregTech_API.sBlockCasings1, 15))
+        .addElement('A', ofBlock(GregTechAPI.sBlockCasings1, 15))
         // Plasma Heating Casing
         .addElement(
             'B',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitPlasmaHeater>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEPurificationUnitPlasmaHeater>buildHatchAdder()
                         .atLeastList(t.getAllowedHatches())
                         .dot(1)
                         .casingIndex(CASING_INDEX_HEATER)
                         .build()),
-                onElementPass(t -> t.casingCount++, ofBlock(GregTech_API.sBlockCasings9, 11))))
+                onElementPass(t -> t.casingCount++, ofBlock(GregTechAPI.sBlockCasings9, 11))))
         // Reinforced Sterile Water Plant Casing
-        .addElement('D', ofBlock(GregTech_API.sBlockCasings9, 5))
+        .addElement('D', ofBlock(GregTechAPI.sBlockCasings9, 5))
         // Any Tinted Glass
-        .addElement('E', ofBlockAnyMeta(GregTech_API.sBlockTintedGlass, 0))
+        .addElement('E', ofBlockAnyMeta(GregTechAPI.sBlockTintedGlass, 0))
         // Neonite, with fallback to air
         .addElement('F', lazy(t -> {
             if (Mods.Chisel.isModLoaded()) {
@@ -173,41 +172,41 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
         .addElement(
             'K',
             lazy(
-                t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitPlasmaHeater>buildHatchAdder()
+                t -> GTStructureUtility.<MTEPurificationUnitPlasmaHeater>buildHatchAdder()
                     .atLeast(InputHatch)
                     .dot(2)
-                    .adder(GT_MetaTileEntity_PurificationUnitPlasmaHeater::addCoolantHatchToMachineList)
+                    .adder(MTEPurificationUnitPlasmaHeater::addCoolantHatchToMachineList)
                     .cacheHint(() -> "Input Hatch (Coolant)")
                     .casingIndex(CASING_INDEX_TOWER)
-                    .buildAndChain(ofBlock(GregTech_API.sBlockCasings9, 5))))
+                    .buildAndChain(ofBlock(GregTechAPI.sBlockCasings9, 5))))
         // Plasma input hatch
         .addElement(
             'P',
             lazy(
-                t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitPlasmaHeater>buildHatchAdder()
+                t -> GTStructureUtility.<MTEPurificationUnitPlasmaHeater>buildHatchAdder()
                     .atLeast(InputHatch)
                     .dot(3)
-                    .adder(GT_MetaTileEntity_PurificationUnitPlasmaHeater::addPlasmaHatchToMachineList)
+                    .adder(MTEPurificationUnitPlasmaHeater::addPlasmaHatchToMachineList)
                     .cacheHint(() -> "Input Hatch (Plasma)")
                     .casingIndex(CASING_INDEX_HEATER)
-                    .buildAndChain(ofBlock(GregTech_API.sBlockCasings9, 11))))
+                    .buildAndChain(ofBlock(GregTechAPI.sBlockCasings9, 11))))
         .build();
 
-    private List<IHatchElement<? super GT_MetaTileEntity_PurificationUnitPlasmaHeater>> getAllowedHatches() {
+    private List<IHatchElement<? super MTEPurificationUnitPlasmaHeater>> getAllowedHatches() {
         return ImmutableList.of(InputHatch, OutputHatch);
     }
 
-    public GT_MetaTileEntity_PurificationUnitPlasmaHeater(int aID, String aName, String aNameRegional) {
+    public MTEPurificationUnitPlasmaHeater(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_PurificationUnitPlasmaHeater(String aName) {
+    public MTEPurificationUnitPlasmaHeater(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PurificationUnitPlasmaHeater(this.mName);
+        return new MTEPurificationUnitPlasmaHeater(this.mName);
     }
 
     @Override
@@ -263,7 +262,7 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PurificationUnitPlasmaHeater> getStructureDefinition() {
+    public IStructureDefinition<MTEPurificationUnitPlasmaHeater> getStructureDefinition() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -273,15 +272,15 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
     }
 
     @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("Purification Unit")
             .addInfo(
                 EnumChatFormatting.AQUA + ""
                     + EnumChatFormatting.BOLD
                     + "Water Tier: "
                     + EnumChatFormatting.WHITE
-                    + GT_Utility.formatNumbers(getWaterTier())
+                    + GTUtility.formatNumbers(getWaterTier())
                     + EnumChatFormatting.RESET)
             .addInfo("Controller block for the Extreme Temperature Fluctuation Purification Unit.")
             .addInfo("Must be linked to a Purification Plant using a data stick to work.")
@@ -415,7 +414,7 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
     }
 
     // Drains up to maxAmount of a fluid if it is the same fluid as given, returns the amount drained
-    private long drainFluidLimited(GT_MetaTileEntity_Hatch_Input inputHatch, FluidStack fluid, long maxAmount) {
+    private long drainFluidLimited(MTEHatchInput inputHatch, FluidStack fluid, long maxAmount) {
         FluidStack hatchStack = inputHatch.getDrainableStack();
         if (hatchStack == null) return 0;
         if (hatchStack.isFluidEqual(fluid)) {
@@ -437,7 +436,7 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
             FluidStack insertedWater = currentRecipe.mFluidInputs[0];
             // Multiply by 60 since that's the water:steam ratio in GTNH
             long steamAmount = insertedWater.amount * 60L;
-            addOutput(GT_ModHandler.getSteam(steamAmount));
+            addOutput(GTModHandler.getSteam(steamAmount));
         }
     }
 
@@ -480,10 +479,10 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
         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;
-            coolantInputHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchInput) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null;
+            coolantInputHatch = (MTEHatchInput) aMetaTileEntity;
             return true;
         }
         return false;
@@ -493,10 +492,10 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater
         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;
-            plasmaInputHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchInput) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null;
+            plasmaInputHatch = (MTEHatchInput) aMetaTileEntity;
             return true;
         }
         return false;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java
index f542216617..1ab8122d17 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java
@@ -3,15 +3,15 @@ package gregtech.common.tileentities.machines.multi.purification;
 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 gregtech.api.enums.GT_HatchElement.InputHatch;
-import static gregtech.api.enums.GT_HatchElement.OutputHatch;
-import static gregtech.api.enums.GT_Values.AuthorNotAPenguin;
+import static gregtech.api.enums.GTValues.AuthorNotAPenguin;
+import static gregtech.api.enums.HatchElement.InputHatch;
+import static gregtech.api.enums.HatchElement.OutputHatch;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_GLOW;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTStructureUtility.ofFrame;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,7 +32,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.Materials;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
@@ -41,29 +41,28 @@ import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.metatileentity.implementations.MTEHatch;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.IGT_HatchAdder;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.IGTHatchAdder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 
-public class GT_MetaTileEntity_PurificationUnitUVTreatment
-    extends GT_MetaTileEntity_PurificationUnitBase<GT_MetaTileEntity_PurificationUnitUVTreatment>
+public class MTEPurificationUnitUVTreatment extends MTEPurificationUnitBase<MTEPurificationUnitUVTreatment>
     implements ISurvivalConstructable {
 
-    private static final int CASING_INDEX_MAIN = getTextureIndex(GregTech_API.sBlockCasings9, 12);
+    private static final int CASING_INDEX_MAIN = getTextureIndex(GregTechAPI.sBlockCasings9, 12);
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
     private static final int STRUCTURE_X_OFFSET = 6;
     private static final int STRUCTURE_Y_OFFSET = 8;
     private static final int STRUCTURE_Z_OFFSET = 0;
 
-    private GT_MetaTileEntity_LensHousing lensInputBus;
-    private GT_MetaTileEntity_LensIndicator lensIndicator;
+    private MTEHatchLensHousing lensInputBus;
+    private MTEHatchLensIndicator lensIndicator;
 
     private UVTreatmentLensCycle lensCycle = null;
 
@@ -75,7 +74,7 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment
     /**
      * Maximum amount of ticks between two lens swaps
      */
-    public static final int MAX_TIME_BETWEEN_SWAPS = GT_MetaTileEntity_PurificationPlant.CYCLE_TIME_TICKS / 8;
+    public static final int MAX_TIME_BETWEEN_SWAPS = MTEPurificationPlant.CYCLE_TIME_TICKS / 8;
     /**
      * Minimum amount of time between two lens swaps
      */
@@ -101,21 +100,21 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment
         { "             ", "     DDD     ", "             ", "             ", "             ", "             ", "             ", "     DDD     ", "     HHH     " } };
         // spotless:on
 
-    private static final IStructureDefinition<GT_MetaTileEntity_PurificationUnitUVTreatment> STRUCTURE_DEFINITION = StructureDefinition
-        .<GT_MetaTileEntity_PurificationUnitUVTreatment>builder()
+    private static final IStructureDefinition<MTEPurificationUnitUVTreatment> STRUCTURE_DEFINITION = StructureDefinition
+        .<MTEPurificationUnitUVTreatment>builder()
         .addShape(STRUCTURE_PIECE_MAIN, structure)
         // Naquadria-Reinforced Water Plant Casing
-        .addElement('A', ofBlock(GregTech_API.sBlockCasings9, 12))
+        .addElement('A', ofBlock(GregTechAPI.sBlockCasings9, 12))
         // Neutronium-Coated UV-Resistant Glass
-        .addElement('B', ofBlock(GregTech_API.sBlockGlass1, 1))
+        .addElement('B', ofBlock(GregTechAPI.sBlockGlass1, 1))
         // UV Backlight sterilizer casing
-        .addElement('C', ofBlock(GregTech_API.sBlockCasings9, 13))
+        .addElement('C', ofBlock(GregTechAPI.sBlockCasings9, 13))
         .addElement('D', ofFrame(Materials.StellarAlloy))
         // Lens housing bus
         .addElement(
             'L',
             lazy(
-                t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitUVTreatment>buildHatchAdder()
+                t -> GTStructureUtility.<MTEPurificationUnitUVTreatment>buildHatchAdder()
                     .atLeast(SpecialHatchElement.LensHousing)
                     .dot(2)
                     .cacheHint(() -> "Lens Housing")
@@ -125,7 +124,7 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment
         .addElement(
             'I',
             lazy(
-                t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitUVTreatment>buildHatchAdder()
+                t -> GTStructureUtility.<MTEPurificationUnitUVTreatment>buildHatchAdder()
                     .atLeast(SpecialHatchElement.LensIndicator)
                     .dot(3)
                     .cacheHint(() -> "Lens Indicator")
@@ -136,27 +135,27 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment
             'H',
             ofChain(
                 lazy(
-                    t -> GT_StructureUtility.<GT_MetaTileEntity_PurificationUnitUVTreatment>buildHatchAdder()
+                    t -> GTStructureUtility.<MTEPurificationUnitUVTreatment>buildHatchAdder()
                         .atLeastList(Arrays.asList(InputHatch, OutputHatch))
                         .dot(1)
                         .cacheHint(() -> "Input Hatch, Output Hatch")
                         .casingIndex(CASING_INDEX_MAIN)
                         .build()),
                 // Naquadria-reinforced Water Plant Casing
-                ofBlock(GregTech_API.sBlockCasings9, 12)))
+                ofBlock(GregTechAPI.sBlockCasings9, 12)))
         .build();
 
-    public GT_MetaTileEntity_PurificationUnitUVTreatment(int aID, String aName, String aNameRegional) {
+    public MTEPurificationUnitUVTreatment(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    public GT_MetaTileEntity_PurificationUnitUVTreatment(String aName) {
+    public MTEPurificationUnitUVTreatment(String aName) {
         super(aName);
     }
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_PurificationUnitUVTreatment(this.mName);
+        return new MTEPurificationUnitUVTreatment(this.mName);
     }
 
     @Override
@@ -212,20 +211,20 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_PurificationUnitUVTreatment> getStructureDefinition() {
+    public IStructureDefinition<MTEPurificationUnitUVTreatment> 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("Purification Unit");
         tt.addInfo(
             EnumChatFormatting.AQUA + ""
                 + EnumChatFormatting.BOLD
                 + "Water Tier: "
                 + EnumChatFormatting.WHITE
-                + GT_Utility.formatNumbers(getWaterTier())
+                + GTUtility.formatNumbers(getWaterTier())
                 + EnumChatFormatting.RESET)
             .addInfo("Controller block for the High Energy Laser Purification Unit.")
             .addInfo("Must be linked to a Purification Plant using a data stick to work.")
@@ -455,9 +454,9 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment
     public boolean addLensHousingToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_LensHousing) {
-            ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-            this.lensInputBus = (GT_MetaTileEntity_LensHousing) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchLensHousing) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            this.lensInputBus = (MTEHatchLensHousing) aMetaTileEntity;
             return true;
         }
         return false;
@@ -466,44 +465,40 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment
     public boolean addLensIndicatorToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity == null) return false;
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_LensIndicator) {
-            ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-            this.lensIndicator = (GT_MetaTileEntity_LensIndicator) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchLensIndicator) {
+            ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+            this.lensIndicator = (MTEHatchLensIndicator) aMetaTileEntity;
             lensIndicator.updateRedstoneOutput(false);
             return true;
         }
         return false;
     }
 
-    private enum SpecialHatchElement implements IHatchElement<GT_MetaTileEntity_PurificationUnitUVTreatment> {
+    private enum SpecialHatchElement implements IHatchElement<MTEPurificationUnitUVTreatment> {
 
-        LensHousing(GT_MetaTileEntity_PurificationUnitUVTreatment::addLensHousingToMachineList,
-            GT_MetaTileEntity_LensHousing.class) {
+        LensHousing(MTEPurificationUnitUVTreatment::addLensHousingToMachineList, MTEHatchLensHousing.class) {
 
             @Override
-            public long count(
-                GT_MetaTileEntity_PurificationUnitUVTreatment gtMetaTileEntityPurificationUnitUVTreatment) {
+            public long count(MTEPurificationUnitUVTreatment gtMetaTileEntityPurificationUnitUVTreatment) {
                 if (gtMetaTileEntityPurificationUnitUVTreatment.lensInputBus == null) return 0;
                 else return 1;
             }
         },
 
-        LensIndicator(GT_MetaTileEntity_PurificationUnitUVTreatment::addLensIndicatorToMachineList,
-            GT_MetaTileEntity_LensHousing.class) {
+        LensIndicator(MTEPurificationUnitUVTreatment::addLensIndicatorToMachineList, MTEHatchLensHousing.class) {
 
             @Override
-            public long count(
-                GT_MetaTileEntity_PurificationUnitUVTreatment gtMetaTileEntityPurificationUnitUVTreatment) {
+            public long count(MTEPurificationUnitUVTreatment gtMetaTileEntityPurificationUnitUVTreatment) {
                 if (gtMetaTileEntityPurificationUnitUVTreatment.lensIndicator == null) return 0;
                 else return 1;
             }
         };
 
         private final List<Class<? extends IMetaTileEntity>> mteClasses;
-        private final IGT_HatchAdder<GT_MetaTileEntity_PurificationUnitUVTreatment> adder;
+        private final IGTHatchAdder<MTEPurificationUnitUVTreatment> adder;
 
         @SafeVarargs
-        SpecialHatchElement(IGT_HatchAdder<GT_MetaTileEntity_PurificationUnitUVTreatment> adder,
+        SpecialHatchElement(IGTHatchAdder<MTEPurificationUnitUVTreatment> adder,
             Class<? extends IMetaTileEntity>... mteClasses) {
             this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses));
             this.adder = adder;
@@ -514,7 +509,7 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment
             return mteClasses;
         }
 
-        public IGT_HatchAdder<? super GT_MetaTileEntity_PurificationUnitUVTreatment> adder() {
+        public IGTHatchAdder<? super MTEPurificationUnitUVTreatment> adder() {
             return adder;
         }
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/PurifiedWaterHelpers.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/PurifiedWaterHelpers.java
index ab397aac94..987a328f31 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/PurifiedWaterHelpers.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/PurifiedWaterHelpers.java
@@ -3,7 +3,7 @@ package gregtech.common.tileentities.machines.multi.purification;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 
 public class PurifiedWaterHelpers {
 
@@ -35,7 +35,7 @@ public class PurifiedWaterHelpers {
     }
 
     // Used to construct NEI comparator for water tier. Returns 0 if no water is used in this recipe
-    public static int getWaterTierFromRecipe(GT_Recipe recipe) {
+    public static int getWaterTierFromRecipe(GTRecipe recipe) {
         if (recipe.mFluidInputs.length == 0) return 0;
         else return getWaterTier(recipe.mFluidInputs[0]);
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalProcessor.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalProcessor.java
index 87e986f941..b553849d3a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalProcessor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalProcessor.java
@@ -40,18 +40,18 @@ import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.Materials;
-import gregtech.api.fluid.FluidTankGT;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.fluid.GTFluidTank;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.multitileentity.enums.GT_MultiTileCasing;
 import gregtech.api.multitileentity.multiblock.base.ComplexParallelController;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
+import gregtech.api.util.GTStructureUtility;
 import gregtech.api.util.GT_StructureUtilityMuTE;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.tileentities.machines.multiblock.logic.AdvChemicalProcessorProcessingLogic;
 
 public class AdvChemicalProcessor
@@ -89,7 +89,7 @@ public class AdvChemicalProcessor
             processWhitelistInventoryHandlers.add(new ItemStackHandler(ITEM_WHITELIST_SLOTS));
             ArrayList<IFluidTank> processFluidTanks = new ArrayList<>(FLUID_WHITELIST_SLOTS);
             for (int j = 0; j < FLUID_WHITELIST_SLOTS; j++) {
-                processFluidTanks.add(new FluidTankGT());
+                processFluidTanks.add(new GTFluidTank());
             }
             processFluidWhiteLists.add(processFluidTanks);
         }
@@ -102,8 +102,8 @@ public class AdvChemicalProcessor
         setMaxComplexParallels(nbt.getInteger("processors"), false);
         final NBTTagCompound processWhiteLists = nbt.getCompoundTag("whiteLists");
         long capacity = 1000;
-        if (nbt.hasKey(GT_Values.NBT.TANK_CAPACITY)) {
-            capacity = saturatedCast(nbt.getLong(GT_Values.NBT.TANK_CAPACITY));
+        if (nbt.hasKey(GTValues.NBT.TANK_CAPACITY)) {
+            capacity = saturatedCast(nbt.getLong(GTValues.NBT.TANK_CAPACITY));
         }
         for (int i = 0; i < MAX_PROCESSES; i++) {
 
@@ -178,8 +178,8 @@ public class AdvChemicalProcessor
     }
 
     @Override
-    public GT_Multiblock_Tooltip_Builder createTooltip() {
-        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    public MultiblockTooltipBuilder createTooltip() {
+        final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Chemical Reactor")
             .addInfo("Controller block for the Advanced Chemical Processor")
             .addInfo("Does not lose efficiency when overclocked")
@@ -188,7 +188,7 @@ public class AdvChemicalProcessor
             .addInfo("By using the whitelist filter a recipe can push its output")
             .addInfo("to a different recipes input to chain them")
             .addInfo("Disclaimer: Still WIP - Use at your own risk")
-            .addInfo(GT_Values.Authorminecraft7771)
+            .addInfo(GTValues.Authorminecraft7771)
             .addSeparator()
             .beginStructureBlock(5, 3, 3, false)
             .addController("Front center")
@@ -348,14 +348,14 @@ public class AdvChemicalProcessor
                     ofMuTECasings(
                         FLUID_IN | ITEM_IN | FLUID_OUT | ITEM_OUT | ENERGY_IN,
                         GT_MultiTileCasing.Chemical.getCasing()))
-                .addElement('P', ofBlock(GregTech_API.sBlockCasings8, 1))
+                .addElement('P', ofBlock(GregTechAPI.sBlockCasings8, 1))
                 .addElement('T', ofMuTECasings(NOTHING, MOTOR_CASINGS))
                 .addElement(
                     'W',
-                    GT_StructureUtility.ofCoil(AdvChemicalProcessor::setCoilTier, AdvChemicalProcessor::getCoilTier))
+                    GTStructureUtility.ofCoil(AdvChemicalProcessor::setCoilTier, AdvChemicalProcessor::getCoilTier))
                 .addElement('G', Glasses.chainAllGlasses())
-                .addElement('B', ofBlock(GregTech_API.sBlockCasings4, 1))
-                .addElement('F', GT_StructureUtility.ofFrame(Materials.Steel))
+                .addElement('B', ofBlock(GregTechAPI.sBlockCasings4, 1))
+                .addElement('F', GTStructureUtility.ofFrame(Materials.Steel))
                 .addElement(
                     'U',
                     ofMuTECasings(
@@ -384,7 +384,7 @@ public class AdvChemicalProcessor
                             if (!widget.isClient()) widget.getContext()
                                 .openSyncedWindow(PROCESS_WINDOW_BASE_ID + processIndex);
                         })
-                    .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_WHITELIST)
+                    .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_WHITELIST)
                     .setSize(18, 18)
                     .setEnabled((widget -> processIndex < maxComplexParallels))
                     .setPos(20 * (i % 4) + 18, 18 + (i / 4) * 20));
@@ -396,7 +396,7 @@ public class AdvChemicalProcessor
                 .setTextColor(Color.WHITE.normal)
                 .setTextAlignment(Alignment.Center)
                 .addTooltip("Tier")
-                .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                 .setSize(18, 18)
                 .setPos(130, 85));
         return child;
@@ -428,7 +428,7 @@ public class AdvChemicalProcessor
         builder.widget(
             new TextWidget("Process " + processIndex).setTextAlignment(Alignment.Center)
                 .setPos(13, 7));
-        builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
+        builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT);
         builder.widget(
             SlotGroup.ofItemHandler(processWhitelistInventoryHandlers.get(processIndex), 4)
                 .startFromSlot(0)
diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/CokeOven.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/CokeOven.java
index e8e31ba32c..b208e27fe3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multiblock/CokeOven.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/CokeOven.java
@@ -23,12 +23,12 @@ import com.gtnewhorizons.modularui.common.internal.network.NetworkUtils;
 import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.multitileentity.enums.GT_MultiTileCasing;
 import gregtech.api.multitileentity.multiblock.base.Controller;
 import gregtech.api.task.tasks.PollutionTask;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.tileentities.machines.multiblock.logic.CokeOvenProcessingLogic;
 
 public class CokeOven extends Controller<CokeOven, CokeOvenProcessingLogic> {
@@ -73,14 +73,14 @@ public class CokeOven extends Controller<CokeOven, CokeOvenProcessingLogic> {
     }
 
     @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("Coke Oven")
             .addInfo("Used for charcoal")
             .beginStructureBlock(3, 3, 3, true)
             .addCasingInfoExactly("Coke Oven Bricks", 25, false)
             .addPollutionAmount(POLLUTION_AMOUNT)
-            .toolTipFinisher(GT_Values.AuthorBlueWeabo);
+            .toolTipFinisher(GTValues.AuthorBlueWeabo);
         return tt;
     }
 
@@ -125,7 +125,7 @@ public class CokeOven extends Controller<CokeOven, CokeOvenProcessingLogic> {
         final TextWidget text = new TextWidget(title).setDefaultColor(getTitleColor())
             .setTextAlignment(Alignment.CenterLeft)
             .setMaxWidth(titleWidth);
-        if (GT_Mod.gregtechproxy.mTitleTabStyle == 1) {
+        if (GTMod.gregtechproxy.mTitleTabStyle == 1) {
             tab.setDrawable(getGUITextureSet().getTitleTabAngular())
                 .setPos(0, -(titleHeight + TAB_PADDING) + 1)
                 .setSize(getGUIWidth(), titleHeight + TAB_PADDING * 2);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java
index 59efd46c94..d4ac6241d2 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java
@@ -13,14 +13,14 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import com.gtnewhorizon.structurelib.util.Vec3Impl;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.HeatingCoilLevel;
 import gregtech.api.enums.Materials;
 import gregtech.api.multitileentity.enums.GT_MultiTileCasing;
 import gregtech.api.multitileentity.multiblock.base.StackableController;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.tileentities.machines.multiblock.logic.DistillationTowerProcessingLogic;
 
 public class DistillationTower extends StackableController<DistillationTower, DistillationTowerProcessingLogic> {
@@ -45,12 +45,12 @@ public class DistillationTower extends StackableController<DistillationTower, Di
     }
 
     @Override
-    public GT_Multiblock_Tooltip_Builder createTooltip() {
-        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+    public MultiblockTooltipBuilder createTooltip() {
+        final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Distillation Tower")
             .addInfo("Controller block for the Distillation Tower")
             .addInfo("Can be specialised to be a mega structure")
-            .addInfo(GT_Values.Authorminecraft7771)
+            .addInfo(GTValues.Authorminecraft7771)
             .addSeparator()
             .beginStructureBlock(5, 3, 3, false)
             .addController("Front center")
@@ -113,11 +113,11 @@ public class DistillationTower extends StackableController<DistillationTower, Di
                     ofMuTECasings(
                         FLUID_IN | ITEM_IN | FLUID_OUT | ITEM_OUT | ENERGY_IN,
                         GT_MultiTileCasing.Distillation.getCasing()))
-                .addElement('E', GT_StructureUtility.ofFrame(Materials.StainlessSteel))
-                .addElement('A', ofBlock(GregTech_API.sBlockCasings2, 0))
-                .addElement('B', ofBlock(GregTech_API.sBlockCasings2, 13))
+                .addElement('E', GTStructureUtility.ofFrame(Materials.StainlessSteel))
+                .addElement('A', ofBlock(GregTechAPI.sBlockCasings2, 0))
+                .addElement('B', ofBlock(GregTechAPI.sBlockCasings2, 13))
                 .addElement('X', ofMuTECasings(NOTHING, MOTOR_CASINGS))
-                .addElement('D', GT_StructureUtility.ofCoil((tile, meta) -> {}, (tile) -> HeatingCoilLevel.None))
+                .addElement('D', GTStructureUtility.ofCoil((tile, meta) -> {}, (tile) -> HeatingCoilLevel.None))
                 .build();
         }
         return STRUCTURE_DEFINITION_MEGA;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/LaserEngraver.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/LaserEngraver.java
index d4a7283f3e..36a1271e0d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multiblock/LaserEngraver.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/LaserEngraver.java
@@ -25,15 +25,15 @@ import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
 import com.gtnewhorizons.modularui.common.widget.MultiChildWidget;
 import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.multitileentity.enums.GT_MultiTileCasing;
 import gregtech.api.multitileentity.multiblock.base.ComplexParallelController;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
+import gregtech.api.util.GTStructureUtility;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.tileentities.machines.multiblock.logic.LaserEngraverProcessingLogic;
 
 public class LaserEngraver extends ComplexParallelController<LaserEngraver, LaserEngraverProcessingLogic> {
@@ -208,7 +208,7 @@ public class LaserEngraver extends ComplexParallelController<LaserEngraver, Lase
                     ofMuTECasings(NOTHING, CLEANROOM_CASINGS, GT_MultiTileCasing.LaserEngraver.getCasing()))
                 .addElement('D', ofMuTECasings(NOTHING, WIRELESS_CASINGS, GT_MultiTileCasing.LaserEngraver.getCasing()))
                 .addElement('E', ofMuTECasings(NOTHING, MOTOR_CASINGS))
-                .addElement('F', GT_StructureUtility.ofFrame(Materials.Naquadah)
+                .addElement('F', GTStructureUtility.ofFrame(Materials.Naquadah)
 
                 )
                 .addElement('H', ofMuTECasings(NOTHING, GT_MultiTileCasing.Mirror.getCasing()))
@@ -221,7 +221,7 @@ public class LaserEngraver extends ComplexParallelController<LaserEngraver, Lase
                         ofBlockUnlocalizedName(BartWorks.ID, "BW_GlasBlocks2", 0, true),
                         ofBlockUnlocalizedName(Thaumcraft.ID, "blockCosmeticOpaque", 2, false)))
                 .addElement('I', ofMuTECasings(NOTHING, EMITTER_CASINGS))
-                .addElement('K', ofBlock(GregTech_API.sBlockCasings3, 11))
+                .addElement('K', ofBlock(GregTechAPI.sBlockCasings3, 11))
                 .addElement('L', ofMuTECasings(NOTHING, ROBOT_ARM_CASINGS))
                 .addElement('M', ofMuTECasings(NOTHING, GT_MultiTileCasing.LaserEngraverUpgrade1.getCasing()))
                 .addElement('N', ofMuTECasings(NOTHING, GT_MultiTileCasing.LaserEngraverUpgrade2.getCasing()))
@@ -244,7 +244,7 @@ public class LaserEngraver extends ComplexParallelController<LaserEngraver, Lase
                             if (!widget.isClient()) widget.getContext()
                                 .openSyncedWindow(PROCESS_WINDOW_BASE_ID + processIndex);
                         })
-                    .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_WHITELIST)
+                    .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_WHITELIST)
                     .setSize(18, 18)
                     .setEnabled((widget -> processIndex < maxComplexParallels))
                     .setPos(20 * (i % 4) + 18, 18 + (i / 4) * 20));
@@ -256,7 +256,7 @@ public class LaserEngraver extends ComplexParallelController<LaserEngraver, Lase
                 .setTextColor(Color.WHITE.normal)
                 .setTextAlignment(Alignment.Center)
                 .addTooltip("Tier")
-                .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
+                .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD)
                 .setSize(18, 18)
                 .setPos(130, 85));
         return child;
@@ -285,14 +285,14 @@ public class LaserEngraver extends ComplexParallelController<LaserEngraver, Lase
     }
 
     @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("Laser Engraver")
             .addInfo("Used for Engraving")
             .addSeparator()
             .beginStructureBlock(3, 3, 5, true)
             .addController("Front right center")
-            .toolTipFinisher(GT_Values.AuthorTheEpicGamer274);
+            .toolTipFinisher(GTValues.AuthorTheEpicGamer274);
         return tt;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java
index e2f8dc9b6e..18ad381477 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java
@@ -33,14 +33,14 @@ import com.gtnewhorizon.structurelib.util.Vec3Impl;
 
 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.multitileentity.enums.GT_MultiTileCasing;
 import gregtech.api.multitileentity.multiblock.base.StackableModularController;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_StructureUtility;
+import gregtech.api.util.GTStructureUtility;
 import gregtech.api.util.GT_StructureUtilityMuTE.UpgradeCasings;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.tileentities.machines.multiblock.logic.LayeredCokeBatteryProcessingLogic;
 
 public class LayeredCokeBattery
@@ -155,8 +155,8 @@ public class LayeredCokeBattery
                     ofMuTECasings(
                         FLUID_IN | ITEM_IN | FLUID_OUT | ITEM_OUT | ENERGY_IN,
                         GT_MultiTileCasing.Distillation.getCasing()))
-                .addElement('C', ofBlock(GregTech_API.sBlockCasings4, 1))
-                .addElement('D', GT_StructureUtility.ofFrame(Materials.Steel))
+                .addElement('C', ofBlock(GregTechAPI.sBlockCasings4, 1))
+                .addElement('D', GTStructureUtility.ofFrame(Materials.Steel))
                 .addElement('E', ofMuTECasings(NOTHING, MOTOR_CASINGS))
                 .addElement(
                     'F',
@@ -238,8 +238,8 @@ public class LayeredCokeBattery
     }
 
     @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("Coke Oven")
             .addInfo("Controller for the Layered Coke Battery")
             .addSeparator()
diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/Macerator.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/Macerator.java
index dfdacfe7f2..7273ac8b8b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multiblock/Macerator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/Macerator.java
@@ -17,7 +17,7 @@ import com.gtnewhorizon.structurelib.util.Vec3Impl;
 
 import gregtech.api.multitileentity.enums.GT_MultiTileCasing;
 import gregtech.api.multitileentity.multiblock.base.StackableController;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.tileentities.machines.multiblock.logic.MaceratorProcessingLogic;
 
 public class Macerator extends StackableController<Macerator, MaceratorProcessingLogic> {
@@ -75,8 +75,8 @@ public class Macerator extends StackableController<Macerator, MaceratorProcessin
     }
 
     @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("Macerator")
             .addInfo("Controller for the Macerator")
             .addSeparator()
diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java
index 4e6c80f561..46e5cab9f0 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java
@@ -14,8 +14,8 @@ import gregtech.api.logic.FluidInventoryLogic;
 import gregtech.api.logic.ItemInventoryLogic;
 import gregtech.api.logic.MuTEProcessingLogic;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class CokeOvenProcessingLogic extends MuTEProcessingLogic<CokeOvenProcessingLogic> {
 
@@ -48,20 +48,20 @@ public class CokeOvenProcessingLogic extends MuTEProcessingLogic<CokeOvenProcess
     private ItemStack findRecipe(@Nonnull ItemStack input) {
         for (int oreId : getOreIDs(input)) {
             if (oreId == COAL_ORE_ID) {
-                return GT_OreDictUnificator.get("fuelCoke", null, 1);
+                return GTOreDictUnificator.get("fuelCoke", null, 1);
             } else if (oreId == COAL_BLOCK_ORE_ID) {
                 timeMultiplier = 9;
-                return GT_ModHandler.getModItem(Railcraft.ID, "cube", 1, 0);
+                return GTModHandler.getModItem(Railcraft.ID, "cube", 1, 0);
             } else if (oreId == WOOD_ORE_ID) {
                 return new ItemStack(Items.coal, 1, 1);
             } else if (oreId == SUGARCANE_ORE_ID) {
-                return GT_OreDictUnificator.get("itemCharcoalSugar", null, 1);
+                return GTOreDictUnificator.get("itemCharcoalSugar", null, 1);
             } else if (oreId == SUGAR_CHARCOAL_ORE_ID) {
-                return GT_OreDictUnificator.get("itemCokeSugar", null, 1);
+                return GTOreDictUnificator.get("itemCokeSugar", null, 1);
             } else if (oreId == CACTUS_ORE_ID) {
-                return GT_OreDictUnificator.get("itemCharcoalCactus", null, 1);
+                return GTOreDictUnificator.get("itemCharcoalCactus", null, 1);
             } else if (oreId == CACTUS_CHARCOAL_ORE_ID) {
-                return GT_OreDictUnificator.get("itemCokeCactus", null, 1);
+                return GTOreDictUnificator.get("itemCokeCactus", null, 1);
             }
         }
         return null;
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamAlloySmelterBronze.java
index 9b2c6b3ada..9953a55bca 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamAlloySmelterBronze.java
@@ -21,19 +21,19 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineBronze;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_AlloySmelter_Bronze extends GT_MetaTileEntity_BasicMachine_Bronze {
+public class MTESteamAlloySmelterBronze extends MTEBasicMachineBronze {
 
-    public GT_MetaTileEntity_AlloySmelter_Bronze(int aID, String aName, String aNameRegional) {
+    public MTESteamAlloySmelterBronze(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Combination Smelter", 2, 1, false);
     }
 
-    public GT_MetaTileEntity_AlloySmelter_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamAlloySmelterBronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 2, 1, false);
     }
 
@@ -44,7 +44,7 @@ public class GT_MetaTileEntity_AlloySmelter_Bronze extends GT_MetaTileEntity_Bas
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_AlloySmelter_Bronze(mName, mDescriptionArray, mTextures);
+        return new MTESteamAlloySmelterBronze(mName, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -56,7 +56,7 @@ public class GT_MetaTileEntity_AlloySmelter_Bronze extends GT_MetaTileEntity_Bas
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_INDUCTION_LOOP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_INDUCTION_LOOP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamAlloySmelterSteel.java
index 8b96906da1..f60de32cea 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamAlloySmelterSteel.java
@@ -21,19 +21,19 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Steel;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineSteel;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_AlloySmelter_Steel extends GT_MetaTileEntity_BasicMachine_Steel {
+public class MTESteamAlloySmelterSteel extends MTEBasicMachineSteel {
 
-    public GT_MetaTileEntity_AlloySmelter_Steel(int aID, String aName, String aNameRegional) {
+    public MTESteamAlloySmelterSteel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Combination Smelter", 2, 1, true);
     }
 
-    public GT_MetaTileEntity_AlloySmelter_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamAlloySmelterSteel(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 2, 1, true);
     }
 
@@ -44,7 +44,7 @@ public class GT_MetaTileEntity_AlloySmelter_Steel extends GT_MetaTileEntity_Basi
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_AlloySmelter_Steel(mName, mDescriptionArray, mTextures);
+        return new MTESteamAlloySmelterSteel(mName, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -56,7 +56,7 @@ public class GT_MetaTileEntity_AlloySmelter_Steel extends GT_MetaTileEntity_Basi
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_INDUCTION_LOOP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_INDUCTION_LOOP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamCompressorBronze.java
index ef91ed5baf..2895142f7e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamCompressorBronze.java
@@ -21,25 +21,25 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineBronze;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Compressor_Bronze extends GT_MetaTileEntity_BasicMachine_Bronze {
+public class MTESteamCompressorBronze extends MTEBasicMachineBronze {
 
-    public GT_MetaTileEntity_Compressor_Bronze(int aID, String aName, String aNameRegional) {
+    public MTESteamCompressorBronze(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Compressing Items", 1, 1, false);
     }
 
-    public GT_MetaTileEntity_Compressor_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamCompressorBronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 1, 1, false);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Compressor_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTESteamCompressorBronze(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_Compressor_Bronze extends GT_MetaTileEntity_Basic
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_COMPRESSOR_OP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_COMPRESSOR_OP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamCompressorSteel.java
index c213cf04f5..6fa7672d83 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamCompressorSteel.java
@@ -21,25 +21,25 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Steel;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineSteel;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Compressor_Steel extends GT_MetaTileEntity_BasicMachine_Steel {
+public class MTESteamCompressorSteel extends MTEBasicMachineSteel {
 
-    public GT_MetaTileEntity_Compressor_Steel(int aID, String aName, String aNameRegional) {
+    public MTESteamCompressorSteel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Compressing Items", 1, 1, true);
     }
 
-    public GT_MetaTileEntity_Compressor_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamCompressorSteel(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 1, 1, true);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Compressor_Steel(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTESteamCompressorSteel(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_Compressor_Steel extends GT_MetaTileEntity_BasicM
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_COMPRESSOR_OP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_COMPRESSOR_OP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamExtractorBronze.java
index 6e986992f3..a55105841d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamExtractorBronze.java
@@ -21,25 +21,25 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineBronze;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Extractor_Bronze extends GT_MetaTileEntity_BasicMachine_Bronze {
+public class MTESteamExtractorBronze extends MTEBasicMachineBronze {
 
-    public GT_MetaTileEntity_Extractor_Bronze(int aID, String aName, String aNameRegional) {
+    public MTESteamExtractorBronze(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Extracting your first Rubber", 1, 1, false);
     }
 
-    public GT_MetaTileEntity_Extractor_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamExtractorBronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 1, 1, false);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Extractor_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTESteamExtractorBronze(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_Extractor_Bronze extends GT_MetaTileEntity_BasicM
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_EXTRACTOR_OP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_EXTRACTOR_OP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamExtractorSteel.java
index 6a3d024e25..d91ff6fb98 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamExtractorSteel.java
@@ -21,25 +21,25 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Steel;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineSteel;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_Extractor_Steel extends GT_MetaTileEntity_BasicMachine_Steel {
+public class MTESteamExtractorSteel extends MTEBasicMachineSteel {
 
-    public GT_MetaTileEntity_Extractor_Steel(int aID, String aName, String aNameRegional) {
+    public MTESteamExtractorSteel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Extracting your first Rubber", 1, 1, true);
     }
 
-    public GT_MetaTileEntity_Extractor_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamExtractorSteel(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 1, 1, true);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Extractor_Steel(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTESteamExtractorSteel(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_Extractor_Steel extends GT_MetaTileEntity_BasicMa
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_EXTRACTOR_OP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_EXTRACTOR_OP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamForgeHammerBronze.java
index b7d25ac172..121778e198 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamForgeHammerBronze.java
@@ -28,26 +28,26 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineBronze;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
 
-public class GT_MetaTileEntity_ForgeHammer_Bronze extends GT_MetaTileEntity_BasicMachine_Bronze {
+public class MTESteamForgeHammerBronze extends MTEBasicMachineBronze {
 
-    public GT_MetaTileEntity_ForgeHammer_Bronze(int aID, String aName, String aNameRegional) {
+    public MTESteamForgeHammerBronze(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Forge Hammer", 1, 1, false);
     }
 
-    public GT_MetaTileEntity_ForgeHammer_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamForgeHammerBronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 1, 1, false);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ForgeHammer_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTESteamForgeHammerBronze(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -59,7 +59,7 @@ public class GT_MetaTileEntity_ForgeHammer_Bronze extends GT_MetaTileEntity_Basi
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.RANDOM_ANVIL_USE, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.RANDOM_ANVIL_USE, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamForgeHammerSteel.java
index 25785f3fa3..c3410232d0 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamForgeHammerSteel.java
@@ -28,26 +28,26 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Steel;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineSteel;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
 
-public class GT_MetaTileEntity_ForgeHammer_Steel extends GT_MetaTileEntity_BasicMachine_Steel {
+public class MTESteamForgeHammerSteel extends MTEBasicMachineSteel {
 
-    public GT_MetaTileEntity_ForgeHammer_Steel(int aID, String aName, String aNameRegional) {
+    public MTESteamForgeHammerSteel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Forge Hammer", 1, 1, true);
     }
 
-    public GT_MetaTileEntity_ForgeHammer_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamForgeHammerSteel(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 1, 1, true);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_ForgeHammer_Steel(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTESteamForgeHammerSteel(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -59,7 +59,7 @@ public class GT_MetaTileEntity_ForgeHammer_Steel extends GT_MetaTileEntity_Basic
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.RANDOM_ANVIL_USE, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.RANDOM_ANVIL_USE, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamFurnaceBronze.java
index 51a91874a0..419ad9a1cd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamFurnaceBronze.java
@@ -23,20 +23,20 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineBronze;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 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;
 
-public class GT_MetaTileEntity_Furnace_Bronze extends GT_MetaTileEntity_BasicMachine_Bronze {
+public class MTESteamFurnaceBronze extends MTEBasicMachineBronze {
 
-    public GT_MetaTileEntity_Furnace_Bronze(int aID, String aName, String aNameRegional) {
+    public MTESteamFurnaceBronze(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Smelting things with compressed Steam", 1, 1, false);
     }
 
-    public GT_MetaTileEntity_Furnace_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamFurnaceBronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 1, 1, false);
     }
 
@@ -47,7 +47,7 @@ public class GT_MetaTileEntity_Furnace_Bronze extends GT_MetaTileEntity_BasicMac
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Furnace_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTESteamFurnaceBronze(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -57,7 +57,7 @@ public class GT_MetaTileEntity_Furnace_Bronze extends GT_MetaTileEntity_BasicMac
 
     @Override
     public int checkRecipe() {
-        if (null != (this.mOutputItems[0] = GT_ModHandler.getSmeltingOutput(getInputAt(0), true, getOutputAt(0)))) {
+        if (null != (this.mOutputItems[0] = GTModHandler.getSmeltingOutput(getInputAt(0), true, getOutputAt(0)))) {
             this.mEUt = 4;
             this.mMaxProgresstime = 256;
             return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
@@ -69,14 +69,14 @@ public class GT_MetaTileEntity_Furnace_Bronze extends GT_MetaTileEntity_BasicMac
     protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
         return super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack)
-            && GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(64, aStack), false, null) != null;
+            && GTModHandler.getSmeltingOutput(GTUtility.copyAmount(64, aStack), false, null) != null;
     }
 
     @Override
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamFurnaceSteel.java
index a151c724f3..dd9dff4be4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamFurnaceSteel.java
@@ -23,20 +23,20 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Steel;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineSteel;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 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;
 
-public class GT_MetaTileEntity_Furnace_Steel extends GT_MetaTileEntity_BasicMachine_Steel {
+public class MTESteamFurnaceSteel extends MTEBasicMachineSteel {
 
-    public GT_MetaTileEntity_Furnace_Steel(int aID, String aName, String aNameRegional) {
+    public MTESteamFurnaceSteel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Smelting things with compressed Steam", 1, 1, true);
     }
 
-    public GT_MetaTileEntity_Furnace_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamFurnaceSteel(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 1, 1, true);
     }
 
@@ -47,7 +47,7 @@ public class GT_MetaTileEntity_Furnace_Steel extends GT_MetaTileEntity_BasicMach
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Furnace_Steel(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTESteamFurnaceSteel(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -57,7 +57,7 @@ public class GT_MetaTileEntity_Furnace_Steel extends GT_MetaTileEntity_BasicMach
 
     @Override
     public int checkRecipe() {
-        if (null != (this.mOutputItems[0] = GT_ModHandler.getSmeltingOutput(getInputAt(0), true, getOutputAt(0)))) {
+        if (null != (this.mOutputItems[0] = GTModHandler.getSmeltingOutput(getInputAt(0), true, getOutputAt(0)))) {
             this.mEUt = 8;
             this.mMaxProgresstime = 128;
             return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
@@ -69,14 +69,14 @@ public class GT_MetaTileEntity_Furnace_Steel extends GT_MetaTileEntity_BasicMach
     protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
         return super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack)
-            && GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(64, aStack), false, null) != null;
+            && GTModHandler.getSmeltingOutput(GTUtility.copyAmount(64, aStack), false, null) != null;
     }
 
     @Override
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorBronze.java
index cdbf9f2123..441bf266bf 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorBronze.java
@@ -28,27 +28,27 @@ import gregtech.api.enums.TierEU;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineBronze;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-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.WorldSpawnedEventBuilder.ParticleEventBuilder;
 
-public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicMachine_Bronze {
+public class MTESteamMaceratorBronze extends MTEBasicMachineBronze {
 
-    public GT_MetaTileEntity_Macerator_Bronze(int aID, String aName, String aNameRegional) {
+    public MTESteamMaceratorBronze(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Macerating your Ores", 1, 1, false);
     }
 
-    public GT_MetaTileEntity_Macerator_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamMaceratorBronze(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 1, 1, false);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Macerator_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTESteamMaceratorBronze(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -79,7 +79,7 @@ public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicM
 
     @Override
     public int checkRecipe() {
-        GT_Recipe tRecipe = getRecipeMap()
+        GTRecipe tRecipe = getRecipeMap()
             .findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, TierEU.LV, null, null, getAllInputs());
         if (tRecipe == null) return DID_NOT_FIND_RECIPE;
         if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;
@@ -99,14 +99,14 @@ public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicM
     protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
         return super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack)
-            && RecipeMaps.maceratorRecipes.containsInput(GT_Utility.copyAmount(64, aStack));
+            && RecipeMaps.maceratorRecipes.containsInput(GTUtility.copyAmount(64, aStack));
     }
 
     @Override
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_MACERATOR_OP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_MACERATOR_OP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorSteel.java
index 95d510ffa3..226d0d387a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/MTESteamMaceratorSteel.java
@@ -28,27 +28,27 @@ import gregtech.api.enums.TierEU;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Steel;
+import gregtech.api.metatileentity.implementations.MTEBasicMachineSteel;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-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.WorldSpawnedEventBuilder;
 
-public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMachine_Steel {
+public class MTESteamMaceratorSteel extends MTEBasicMachineSteel {
 
-    public GT_MetaTileEntity_Macerator_Steel(int aID, String aName, String aNameRegional) {
+    public MTESteamMaceratorSteel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, "Macerating your Ores", 1, 1, true);
     }
 
-    public GT_MetaTileEntity_Macerator_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESteamMaceratorSteel(String aName, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures, 1, 1, true);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Macerator_Steel(this.mName, this.mDescriptionArray, this.mTextures);
+        return new MTESteamMaceratorSteel(this.mName, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -78,7 +78,7 @@ public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMa
 
     @Override
     public int checkRecipe() {
-        GT_Recipe tRecipe = getRecipeMap()
+        GTRecipe tRecipe = getRecipeMap()
             .findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, TierEU.LV, null, null, getAllInputs());
         if (tRecipe == null) return DID_NOT_FIND_RECIPE;
         if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;
@@ -98,14 +98,14 @@ public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMa
     public boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
         return super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack)
-            && RecipeMaps.maceratorRecipes.containsInput(GT_Utility.copyAmount(64, aStack));
+            && RecipeMaps.maceratorRecipes.containsInput(GTUtility.copyAmount(64, aStack));
     }
 
     @Override
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 1) {
-            GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_MACERATOR_OP, 10, 1.0F, aX, aY, aZ);
+            GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_MACERATOR_OP, 10, 1.0F, aX, aY, aZ);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/render/TileDrone.java b/src/main/java/gregtech/common/tileentities/render/TileEntityDrone.java
index 625157ff37..e6f292d895 100644
--- a/src/main/java/gregtech/common/tileentities/render/TileDrone.java
+++ b/src/main/java/gregtech/common/tileentities/render/TileEntityDrone.java
@@ -3,7 +3,7 @@ package gregtech.common.tileentities.render;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 
-public class TileDrone extends TileEntity {
+public class TileEntityDrone extends TileEntity {
 
     public double rotation = 0;
 
diff --git a/src/main/java/gregtech/common/tileentities/render/TileLaser.java b/src/main/java/gregtech/common/tileentities/render/TileEntityLaser.java
index 848eecdcf2..b719039fe0 100644
--- a/src/main/java/gregtech/common/tileentities/render/TileLaser.java
+++ b/src/main/java/gregtech/common/tileentities/render/TileEntityLaser.java
@@ -10,7 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
 import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation;
 
-public class TileLaser extends TileEntity {
+public class TileEntityLaser extends TileEntity {
 
     public boolean shouldRender = false;
     public float red = 0, green = 0, blue = 0;
diff --git a/src/main/java/gregtech/common/tileentities/render/TileWormhole.java b/src/main/java/gregtech/common/tileentities/render/TileEntityWormhole.java
index d482fd7ce1..f3385b5ed6 100644
--- a/src/main/java/gregtech/common/tileentities/render/TileWormhole.java
+++ b/src/main/java/gregtech/common/tileentities/render/TileEntityWormhole.java
@@ -11,10 +11,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldProvider;
 
-import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks;
-import pers.gwyog.gtneioreplugin.util.DimensionHelper;
+import gtneioreplugin.plugin.block.ModBlocks;
+import gtneioreplugin.util.DimensionHelper;
 
-public class TileWormhole extends TileEntity {
+public class TileEntityWormhole extends TileEntity {
 
     public int dimID = 0;
 
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/MTEDigitalChestBase.java
index 1576f61ff8..96ec6c06ae 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/MTEDigitalChestBase.java
@@ -34,35 +34,35 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.util.item.AEItemStack;
 import appeng.util.item.ItemList;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.enums.GTValues;
+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.implementations.GT_MetaTileEntity_TieredMachineBlock;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
 import gregtech.api.objects.AE2DigitalChestHandler;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEntity_TieredMachineBlock
+public abstract class MTEDigitalChestBase extends MTETieredMachineBlock
     implements IMEMonitor<IAEItemStack>, IAddUIWidgets {
 
     protected boolean mVoidOverflow = false;
     protected boolean mDisableFilter;
     private Map<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = null;
 
-    public GT_MetaTileEntity_DigitalChestBase(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEDigitalChestBase(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
             aNameRegional,
             aTier,
             3,
-            new String[] { "This Chest stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + " Blocks",
+            new String[] { "This Chest stores " + GTUtility.formatNumbers(commonSizeCompute(aTier)) + " Blocks",
                 "Use a screwdriver to enable", "voiding items on overflow", "Will keep its contents when harvested", });
     }
 
@@ -82,12 +82,11 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         };
     }
 
-    public GT_MetaTileEntity_DigitalChestBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEDigitalChestBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_DigitalChestBase(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures) {
+    public MTEDigitalChestBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
@@ -99,14 +98,14 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
             final int tSize = stack.stackTagCompound.getInteger("mItemCount");
             if (tContents != null && tSize > 0) {
                 tooltip.add(
-                    GT_LanguageManager.addStringLocalization("TileEntity_CHEST_INFO", "Contains Item: ")
+                    GTLanguageManager.addStringLocalization("TileEntity_CHEST_INFO", "Contains Item: ")
                         + EnumChatFormatting.YELLOW
                         + tContents.getDisplayName()
                         + EnumChatFormatting.GRAY);
                 tooltip.add(
-                    GT_LanguageManager.addStringLocalization("TileEntity_CHEST_AMOUNT", "Item Amount: ")
+                    GTLanguageManager.addStringLocalization("TileEntity_CHEST_AMOUNT", "Item Amount: ")
                         + EnumChatFormatting.GREEN
-                        + GT_Utility.formatNumbers(tSize)
+                        + GTUtility.formatNumbers(tSize)
                         + EnumChatFormatting.GRAY);
             }
         }
@@ -219,7 +218,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         final long toAdd = input.getStackSize();
         final ItemStack storedStack = getItemStack();
 
-        if (storedStack != null && !GT_Utility.areStacksEqual(storedStack, inputStack)) {
+        if (storedStack != null && !GTUtility.areStacksEqual(storedStack, inputStack)) {
             // Can't stack with existing item, just return the input.
             return input;
         }
@@ -272,7 +271,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     @Override
     public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         mVoidOverflow = !mVoidOverflow;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             StatCollector.translateToLocal(
                 mVoidOverflow ? "GT5U.machines.digitalchest.voidoverflow.enabled"
@@ -284,7 +283,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         float aX, float aY, float aZ) {
         if (super.onSolderingToolRightClick(side, wrenchingSide, aPlayer, aX, aY, aZ)) return true;
         mDisableFilter = !mDisableFilter;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             StatCollector.translateToLocal(
                 mDisableFilter ? "GT5U.machines.digitalchest.inputfilter.disabled"
@@ -308,7 +307,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
             int savedCount = count;
 
             if ((mInventory[0] != null) && ((count < getMaxItemCount()) || mVoidOverflow)
-                && GT_Utility.areStacksEqual(mInventory[0], stack)) {
+                && GTUtility.areStacksEqual(mInventory[0], stack)) {
                 count += mInventory[0].stackSize;
                 if (count <= getMaxItemCount()) {
                     mInventory[0] = null;
@@ -325,7 +324,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
                 mInventory[1] = stack.copy();
                 mInventory[1].stackSize = Math.min(stack.getMaxStackSize(), count);
                 count -= mInventory[1].stackSize;
-            } else if ((count > 0) && GT_Utility.areStacksEqual(mInventory[1], stack)
+            } else if ((count > 0) && GTUtility.areStacksEqual(mInventory[1], stack)
                 && mInventory[1].getMaxStackSize() > mInventory[1].stackSize) {
                     int tmp = Math.min(count, mInventory[1].getMaxStackSize() - mInventory[1].stackSize);
                     mInventory[1].stackSize += tmp;
@@ -346,7 +345,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -396,16 +395,16 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
                     + EnumChatFormatting.RESET
                     + " "
                     + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(getMaxItemCount())
+                    + GTUtility.formatNumbers(getMaxItemCount())
                     + EnumChatFormatting.RESET };
         }
         return new String[] { EnumChatFormatting.BLUE + chestName() + EnumChatFormatting.RESET, "Stored Items:",
             EnumChatFormatting.GOLD + getItemStack().getDisplayName() + EnumChatFormatting.RESET,
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(getItemCount())
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(getItemCount())
                 + EnumChatFormatting.RESET
                 + " "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(getMaxItemCount())
+                + GTUtility.formatNumbers(getMaxItemCount())
                 + EnumChatFormatting.RESET };
     }
 
@@ -465,19 +464,19 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     @Override
     public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        if (GT_Values.disableDigitalChestsExternalAccess && hasActiveMEConnection()) return false;
+        if (GTValues.disableDigitalChestsExternalAccess && hasActiveMEConnection()) return false;
         return aIndex == 1;
     }
 
     @Override
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
         ItemStack aStack) {
-        if (GT_Values.disableDigitalChestsExternalAccess && hasActiveMEConnection()) return false;
+        if (GTValues.disableDigitalChestsExternalAccess && hasActiveMEConnection()) return false;
         if (aIndex != 0) return false;
-        if ((mInventory[0] != null && !GT_Utility.areStacksEqual(mInventory[0], aStack))) return false;
+        if ((mInventory[0] != null && !GTUtility.areStacksEqual(mInventory[0], aStack))) return false;
         if (mDisableFilter) return true;
-        if (getItemStack() == null) return mInventory[1] == null || GT_Utility.areStacksEqual(mInventory[1], aStack);
-        return GT_Utility.areStacksEqual(getItemStack(), aStack);
+        if (getItemStack() == null) return mInventory[1] == null || GTUtility.areStacksEqual(mInventory[1], aStack);
+        return GTUtility.areStacksEqual(getItemStack(), aStack);
     }
 
     @Override
@@ -497,7 +496,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         super.getWailaBody(itemStack, currenttip, accessor, config);
         final NBTTagCompound tag = accessor.getNBTData();
         if (tag.hasKey("itemType", Constants.NBT.TAG_COMPOUND)) {
-            currenttip.add("Item Count: " + GT_Utility.parseNumberToString(tag.getInteger("itemCount")));
+            currenttip.add("Item Count: " + GTUtility.parseNumberToString(tag.getInteger("itemCount")));
             currenttip.add(
                 "Item Type: " + ItemStack.loadItemStackFromNBT(tag.getCompoundTag("itemType"))
                     .getDisplayName());
@@ -511,9 +510,9 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         int z) {
         super.getWailaNBTData(player, tile, tag, world, x, y, z);
         ItemStack is = getItemStack();
-        if (GT_Utility.isStackInvalid(is)) return;
+        if (GTUtility.isStackInvalid(is)) return;
         int realItemCount = getItemCount();
-        if (GT_Utility.isStackValid(mInventory[1]) && GT_Utility.areStacksEqual(mInventory[1], is))
+        if (GTUtility.isStackValid(mInventory[1]) && GTUtility.areStacksEqual(mInventory[1], is))
             realItemCount += mInventory[1].stackSize;
         tag.setInteger("itemCount", realItemCount);
         tag.setTag("itemType", is.writeToNBT(new NBTTagCompound()));
@@ -525,21 +524,21 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
     @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())
@@ -550,9 +549,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
                     .setPos(10, 30))
             .widget(
                 new FakeSyncWidget.IntegerSyncer(
-                    () -> this instanceof GT_MetaTileEntity_QuantumChest
-                        ? ((GT_MetaTileEntity_QuantumChest) this).mItemCount
-                        : 0,
+                    () -> this instanceof MTEQuantumChest ? ((MTEQuantumChest) this).mItemCount : 0,
                     value -> clientItemCount = value));
 
     }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/MTEDigitalTankBase.java
index cd609af343..d4b8da15da 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/MTEDigitalTankBase.java
@@ -5,7 +5,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK_GLOW;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.List;
 
@@ -36,29 +36,29 @@ import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_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.IFluidLockable;
 import gregtech.api.interfaces.modularui.IAddGregtechLogo;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.metatileentity.implementations.MTEBasicTank;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import gregtech.common.gui.modularui.widget.FluidLockWidget;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntity_BasicTank
+public abstract class MTEDigitalTankBase extends MTEBasicTank
     implements IFluidLockable, IAddUIWidgets, IAddGregtechLogo {
 
     public boolean mOutputFluid = false, mVoidFluidPart = false, mVoidFluidFull = false, mLockFluid = false;
     protected String lockedFluidName = null;
     public boolean mAllowInputFromOutputSide = false;
 
-    public GT_MetaTileEntity_DigitalTankBase(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEDigitalTankBase(int aID, String aName, String aNameRegional, int aTier) {
         super(
             aID,
             aName,
@@ -104,11 +104,11 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
         };
     }
 
-    public GT_MetaTileEntity_DigitalTankBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEDigitalTankBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_DigitalTankBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEDigitalTankBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
     }
 
@@ -125,12 +125,12 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                 .loadFluidStackFromNBT(stack.stackTagCompound.getCompoundTag("mFluid"));
             if (tContents != null && tContents.amount > 0) {
                 tooltip.add(
-                    GT_LanguageManager.addStringLocalization("TileEntity_TANK_INFO", "Contains Fluid: ")
+                    GTLanguageManager.addStringLocalization("TileEntity_TANK_INFO", "Contains Fluid: ")
                         + EnumChatFormatting.YELLOW
                         + tContents.getLocalizedName()
                         + EnumChatFormatting.GRAY);
                 tooltip.add(
-                    GT_LanguageManager.addStringLocalization("TileEntity_TANK_AMOUNT", "Fluid Amount: ")
+                    GTLanguageManager.addStringLocalization("TileEntity_TANK_AMOUNT", "Fluid Amount: ")
                         + EnumChatFormatting.GREEN
                         + formatNumbers(tContents.amount)
                         + " L"
@@ -157,7 +157,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
         if (mVoidFluidPart) aNBT.setBoolean("mVoidOverflow", true);
         if (mVoidFluidFull) aNBT.setBoolean("mVoidFluidFull", true);
         if (mLockFluid) aNBT.setBoolean("mLockFluid", true);
-        if (mLockFluid && GT_Utility.isStringValid(lockedFluidName)) aNBT.setString("lockedFluidName", lockedFluidName);
+        if (mLockFluid && GTUtility.isStringValid(lockedFluidName)) aNBT.setString("lockedFluidName", lockedFluidName);
         if (this.mAllowInputFromOutputSide) aNBT.setBoolean("mAllowInputFromOutputSide", true);
 
         super.setItemNBT(aNBT);
@@ -170,7 +170,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
         aNBT.setBoolean("mVoidOverflow", this.mVoidFluidPart);
         aNBT.setBoolean("mVoidFluidFull", this.mVoidFluidFull);
         aNBT.setBoolean("mLockFluid", mLockFluid);
-        if (mLockFluid && GT_Utility.isStringValid(lockedFluidName)) aNBT.setString("lockedFluidName", lockedFluidName);
+        if (mLockFluid && GTUtility.isStringValid(lockedFluidName)) aNBT.setString("lockedFluidName", lockedFluidName);
         else aNBT.removeTag("lockedFluidName");
         aNBT.setBoolean("mAllowInputFromOutputSide", this.mAllowInputFromOutputSide);
     }
@@ -249,7 +249,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
 
     @Override
     public void setLockedFluidName(String lockedFluidName) {
-        lockedFluidName = GT_Utility.isStringInvalid(lockedFluidName) ? null : lockedFluidName;
+        lockedFluidName = GTUtility.isStringInvalid(lockedFluidName) ? null : lockedFluidName;
         this.lockedFluidName = lockedFluidName;
         if (lockedFluidName != null) {
             Fluid fluid = FluidRegistry.getFluid(lockedFluidName);
@@ -307,7 +307,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
 
     @Override
     public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -315,9 +315,9 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
     public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (side == getBaseMetaTileEntity().getFrontFacing()) {
             mAllowInputFromOutputSide = !mAllowInputFromOutputSide;
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
-                mAllowInputFromOutputSide ? GT_Utility.getTrans("095") : GT_Utility.getTrans("096"));
+                mAllowInputFromOutputSide ? GTUtility.getTrans("095") : GTUtility.getTrans("096"));
         }
     }
 
@@ -352,7 +352,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
             }
 
             if (doesEmptyContainers()) {
-                FluidStack tFluid = GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true);
+                FluidStack tFluid = GTUtility.getFluidForFilledItem(mInventory[getInputSlot()], true);
                 if (tFluid != null && isFluidInputAllowed(tFluid)) {
                     if (getFillableStack() == null) {
                         if (isFluidInputAllowed(tFluid)) {
@@ -360,7 +360,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                                 tFluid = tFluid.copy();
                                 if (aBaseMetaTileEntity.addStackToSlot(
                                     getOutputSlot(),
-                                    GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true),
+                                    GTUtility.getContainerForFilledItem(mInventory[getInputSlot()], true),
                                     1)) {
                                     setFillableStack(tFluid);
                                     this.onEmptyingContainerWhenEmpty();
@@ -375,7 +375,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                                 || mVoidFluidFull) {
                                 if (aBaseMetaTileEntity.addStackToSlot(
                                     getOutputSlot(),
-                                    GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true),
+                                    GTUtility.getContainerForFilledItem(mInventory[getInputSlot()], true),
                                     1)) {
                                     getFillableStack().amount += Math
                                         .min(tFluid.amount, getRealCapacity() - getFillableStack().amount);
@@ -388,10 +388,10 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
             }
 
             if (doesFillContainers()) {
-                ItemStack tOutput = GT_Utility
+                ItemStack tOutput = GTUtility
                     .fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true);
                 if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) {
-                    FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
+                    FluidStack tFluid = GTUtility.getFluidForFilledItem(tOutput, true);
                     aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
                     if (tFluid != null) getDrainableStack().amount -= tFluid.amount;
                     if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) setDrainableStack(null);
@@ -548,20 +548,20 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
 
         FluidSlotWidget fluidSlotWidget = new FluidSlotWidget(fluidTank);
         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, getInputSlot())
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_IN)
                     .setPos(79, 16))
             .widget(
                 new SlotWidget(inventoryHandler, getOutputSlot()).setAccess(true, false)
-                    .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+                    .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_OUT)
                     .setPos(79, 43))
             .widget(
                 fluidSlotWidget.setOnClickContainer(widget -> onEmptyingContainerWhenEmpty())
-                    .setBackground(GT_UITextures.TRANSPARENT)
+                    .setBackground(GTUITextures.TRANSPARENT)
                     .setPos(58, 41))
             .widget(
                 new TextWidget(StatCollector.translateToLocal("GT5U.machines.digitaltank.fluid.amount"))
@@ -572,7 +572,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                     .setDefaultColor(COLOR_TEXT_WHITE.get())
                     .setPos(10, 30))
             .widget(
-                new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+                new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
                     .setPos(98, 16)
                     .setSize(71, 45))
             .widget(new FluidLockWidget(this).setPos(149, 41))
@@ -592,17 +592,17 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
             .widget(new CycleButtonWidget().setToggle(() -> mOutputFluid, val -> {
                 mOutputFluid = val;
                 if (!mOutputFluid) {
-                    GT_Utility.sendChatToPlayer(
+                    GTUtility.sendChatToPlayer(
                         buildContext.getPlayer(),
-                        GT_Utility.trans("262", "Fluid Auto Output Disabled"));
+                        GTUtility.trans("262", "Fluid Auto Output Disabled"));
                 } else {
-                    GT_Utility.sendChatToPlayer(
+                    GTUtility.sendChatToPlayer(
                         buildContext.getPlayer(),
-                        GT_Utility.trans("263", "Fluid Auto Output Enabled"));
+                        GTUtility.trans("263", "Fluid Auto Output Enabled"));
                 }
             })
-                .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID)
+                .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                .setStaticTexture(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID)
                 .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.autooutput.tooltip"))
                 .setTooltipShowUpDelay(TOOLTIP_DELAY)
                 .setPos(7, 63)
@@ -615,7 +615,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                 if (mLockFluid) {
                     if (mFluid == null) {
                         setLockedFluidName(null);
-                        inBrackets = GT_Utility
+                        inBrackets = GTUtility
                             .trans("264", "currently none, will be locked to the next that is put in");
                     } else {
                         setLockedFluidName(
@@ -623,19 +623,18 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                                 .getName());
                         inBrackets = getDrainableStack().getLocalizedName();
                     }
-                    GT_Utility.sendChatToPlayer(
+                    GTUtility.sendChatToPlayer(
                         buildContext.getPlayer(),
-                        String.format("%s (%s)", GT_Utility.trans("265", "1 specific Fluid"), inBrackets));
+                        String.format("%s (%s)", GTUtility.trans("265", "1 specific Fluid"), inBrackets));
                 } else {
                     fluidTank.drain(0, true);
-                    GT_Utility.sendChatToPlayer(
-                        buildContext.getPlayer(),
-                        GT_Utility.trans("266", "Lock Fluid Mode Disabled"));
+                    GTUtility
+                        .sendChatToPlayer(buildContext.getPlayer(), GTUtility.trans("266", "Lock Fluid Mode Disabled"));
                 }
                 fluidSlotWidget.notifyTooltipChange();
             })
-                .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_LOCK)
+                .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                .setStaticTexture(GTUITextures.OVERLAY_BUTTON_LOCK)
                 .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.lockfluid.tooltip"))
                 .setTooltipShowUpDelay(TOOLTIP_DELAY)
                 .setPos(25, 63)
@@ -643,13 +642,13 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
             .widget(new CycleButtonWidget().setToggle(() -> mAllowInputFromOutputSide, val -> {
                 mAllowInputFromOutputSide = val;
                 if (!mAllowInputFromOutputSide) {
-                    GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("096"));
+                    GTUtility.sendChatToPlayer(buildContext.getPlayer(), GTUtility.getTrans("096"));
                 } else {
-                    GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("095"));
+                    GTUtility.sendChatToPlayer(buildContext.getPlayer(), GTUtility.getTrans("095"));
                 }
             })
-                .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE)
+                .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                .setStaticTexture(GTUITextures.OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE)
                 .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.inputfromoutput.tooltip"))
                 .setTooltipShowUpDelay(TOOLTIP_DELAY)
                 .setPos(43, 63)
@@ -658,17 +657,17 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                 mVoidFluidPart = val;
                 fluidTank.setAllowOverflow(allowOverflow());
                 if (!mVoidFluidPart) {
-                    GT_Utility.sendChatToPlayer(
+                    GTUtility.sendChatToPlayer(
                         buildContext.getPlayer(),
-                        GT_Utility.trans("267", "Overflow Voiding Mode Disabled"));
+                        GTUtility.trans("267", "Overflow Voiding Mode Disabled"));
                 } else {
-                    GT_Utility.sendChatToPlayer(
+                    GTUtility.sendChatToPlayer(
                         buildContext.getPlayer(),
-                        GT_Utility.trans("268", "Overflow Voiding Mode Enabled"));
+                        GTUtility.trans("268", "Overflow Voiding Mode Enabled"));
                 }
             })
-                .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_TANK_VOID_EXCESS)
+                .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                .setStaticTexture(GTUITextures.OVERLAY_BUTTON_TANK_VOID_EXCESS)
                 .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.voidoverflow.tooltip"))
                 .setTooltipShowUpDelay(TOOLTIP_DELAY)
                 .setPos(98, 63)
@@ -677,15 +676,15 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                 mVoidFluidFull = val;
                 fluidTank.setAllowOverflow(allowOverflow());
                 if (!mVoidFluidFull) {
-                    GT_Utility
-                        .sendChatToPlayer(buildContext.getPlayer(), GT_Utility.trans("269", "Void Full Mode Disabled"));
+                    GTUtility
+                        .sendChatToPlayer(buildContext.getPlayer(), GTUtility.trans("269", "Void Full Mode Disabled"));
                 } else {
-                    GT_Utility
-                        .sendChatToPlayer(buildContext.getPlayer(), GT_Utility.trans("270", "Void Full Mode Enabled"));
+                    GTUtility
+                        .sendChatToPlayer(buildContext.getPlayer(), GTUtility.trans("270", "Void Full Mode Enabled"));
                 }
             })
-                .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_TANK_VOID_ALL)
+                .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                .setStaticTexture(GTUITextures.OVERLAY_BUTTON_TANK_VOID_ALL)
                 .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.voidfull.tooltip"))
                 .setTooltipShowUpDelay(TOOLTIP_DELAY)
                 .setPos(116, 63)
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java b/src/main/java/gregtech/common/tileentities/storage/MTELocker.java
index abce9514de..6398f56bec 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
+++ b/src/main/java/gregtech/common/tileentities/storage/MTELocker.java
@@ -17,32 +17,33 @@ import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.SoundResource;
 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.metatileentity.implementations.MTETieredMachineBlock;
+import gregtech.api.objects.GTItemStack;
 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 mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
-public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlock {
+public class MTELocker extends MTETieredMachineBlock {
 
     private static final String CHARGE_SLOT_WAILA_TAG = "charge_slot_";
     public byte mType = 0;
 
-    public GT_MetaTileEntity_Locker(int aID, String aName, String aNameRegional, int aTier) {
+    public MTELocker(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 4, "Stores and recharges Armor");
     }
 
-    public GT_MetaTileEntity_Locker(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTELocker(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_Locker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTELocker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 4, aDescription, aTextures);
     }
 
@@ -80,7 +81,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Locker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+        return new MTELocker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -120,12 +121,12 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
 
     @Override
     public long maxEUStore() {
-        return gregtech.api.enums.GT_Values.V[this.mTier] * maxAmperesIn();
+        return GTValues.V[this.mTier] * maxAmperesIn();
     }
 
     @Override
     public long maxEUInput() {
-        return gregtech.api.enums.GT_Values.V[this.mTier];
+        return GTValues.V[this.mTier];
     }
 
     @Override
@@ -171,7 +172,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
     @Override
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         if (aIndex == 16) {
-            GT_Utility.doSoundAtClient(SoundResource.RANDOM_CLICK, 1, 1.0F);
+            GTUtility.doSoundAtClient(SoundResource.RANDOM_CLICK, 1, 1.0F);
         }
     }
 
@@ -183,7 +184,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return side != getBaseMetaTileEntity().getFrontFacing();
     }
 
@@ -235,7 +236,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
         final NBTTagCompound tag = accessor.getNBTData();
 
         for (int i = 0; i < 4; i++) {
-            final String index = GT_Utility.formatNumbers(i + 1);
+            final String index = GTUtility.formatNumbers(i + 1);
 
             if (tag.hasKey(CHARGE_SLOT_WAILA_TAG + i)) {
                 final ItemStack slotItem = ItemStack
@@ -243,7 +244,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
                 assert slotItem != null;
 
                 currentTip.add(
-                    GT_ModHandler.getElectricItemCharge(slotItem)
+                    GTModHandler.getElectricItemCharge(slotItem)
                         .map(chargeInfo -> {
                             final float ratio = (float) chargeInfo[0] / (float) chargeInfo[1];
                             final EnumChatFormatting chargeFormat;
@@ -267,7 +268,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
                                 index,
                                 slotItem.getDisplayName(),
                                 chargeFormat,
-                                GT_Utility.formatNumbers(ratio * 100));
+                                GTUtility.formatNumbers(ratio * 100));
                         })
                         .orElseGet(
                             // Lazy initialization
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/MTEQuantumChest.java
index c830cd4e52..5402ded873 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
+++ b/src/main/java/gregtech/common/tileentities/storage/MTEQuantumChest.java
@@ -14,27 +14,27 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_DigitalChestBase {
+public class MTEQuantumChest extends MTEDigitalChestBase {
 
     public int mItemCount = 0;
     public ItemStack mItemStack = null;
     NBTTagList mInvData = null;
 
-    public GT_MetaTileEntity_QuantumChest(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEQuantumChest(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_QuantumChest(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEQuantumChest(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_QuantumChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEQuantumChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_QuantumChest(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEQuantumChest(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/src/main/java/gregtech/common/tileentities/storage/MTEQuantumTank.java
index 4d51d0b634..5ec574a59f 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
+++ b/src/main/java/gregtech/common/tileentities/storage/MTEQuantumTank.java
@@ -5,25 +5,25 @@ import net.minecraft.util.EnumChatFormatting;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_DigitalTankBase {
+public class MTEQuantumTank extends MTEDigitalTankBase {
 
-    public GT_MetaTileEntity_QuantumTank(int aID, String aName, String aNameRegional, int aTier) {
+    public MTEQuantumTank(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_QuantumTank(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTEQuantumTank(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_QuantumTank(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTEQuantumTank(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_QuantumTank(mName, mTier, mDescriptionArray, mTextures);
+        return new MTEQuantumTank(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -37,18 +37,18 @@ public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_DigitalTank
                     + EnumChatFormatting.RESET
                     + " "
                     + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(getCapacity())
+                    + GTUtility.formatNumbers(getCapacity())
                     + " L"
                     + EnumChatFormatting.RESET };
         }
         return new String[] { EnumChatFormatting.BLUE + "Quantum Tank" + EnumChatFormatting.RESET, "Stored Fluid:",
             EnumChatFormatting.GOLD + mFluid.getLocalizedName() + EnumChatFormatting.RESET,
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid.amount)
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(mFluid.amount)
                 + " L"
                 + EnumChatFormatting.RESET
                 + " "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(getCapacity())
+                + GTUtility.formatNumbers(getCapacity())
                 + " L"
                 + EnumChatFormatting.RESET };
     }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java b/src/main/java/gregtech/common/tileentities/storage/MTESuperChest.java
index 271402f0de..8e3f35d2c1 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java
+++ b/src/main/java/gregtech/common/tileentities/storage/MTESuperChest.java
@@ -4,17 +4,17 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT_MetaTileEntity_SuperChest extends GT_MetaTileEntity_QuantumChest {
+public class MTESuperChest extends MTEQuantumChest {
 
-    public GT_MetaTileEntity_SuperChest(int aID, String aName, String aNameRegional, int aTier) {
+    public MTESuperChest(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_SuperChest(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTESuperChest(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_SuperChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESuperChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
@@ -25,6 +25,6 @@ public class GT_MetaTileEntity_SuperChest extends GT_MetaTileEntity_QuantumChest
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_SuperChest(mName, mTier, mDescriptionArray, mTextures);
+        return new MTESuperChest(mName, mTier, mDescriptionArray, mTextures);
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java b/src/main/java/gregtech/common/tileentities/storage/MTESuperTank.java
index 4f0bdbc237..1e1e2fb109 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
+++ b/src/main/java/gregtech/common/tileentities/storage/MTESuperTank.java
@@ -5,25 +5,25 @@ import net.minecraft.util.EnumChatFormatting;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
-public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_DigitalTankBase {
+public class MTESuperTank extends MTEDigitalTankBase {
 
-    public GT_MetaTileEntity_SuperTank(int aID, String aName, String aNameRegional, int aTier) {
+    public MTESuperTank(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public GT_MetaTileEntity_SuperTank(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public MTESuperTank(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_SuperTank(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+    public MTESuperTank(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_SuperTank(mName, mTier, mDescriptionArray, mTextures);
+        return new MTESuperTank(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -36,18 +36,18 @@ public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_DigitalTankBa
                     + EnumChatFormatting.RESET
                     + " "
                     + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(getCapacity())
+                    + GTUtility.formatNumbers(getCapacity())
                     + " L"
                     + EnumChatFormatting.RESET };
         }
         return new String[] { EnumChatFormatting.BLUE + "Super Tank" + EnumChatFormatting.RESET, "Stored Fluid:",
             EnumChatFormatting.GOLD + mFluid.getLocalizedName() + EnumChatFormatting.RESET,
-            EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid.amount)
+            EnumChatFormatting.GREEN + GTUtility.formatNumbers(mFluid.amount)
                 + " L"
                 + EnumChatFormatting.RESET
                 + " "
                 + EnumChatFormatting.YELLOW
-                + GT_Utility.formatNumbers(getCapacity())
+                + GTUtility.formatNumbers(getCapacity())
                 + " L"
                 + EnumChatFormatting.RESET };
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GTTool.java
index cb637a1bd5..436ec767a9 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ b/src/main/java/gregtech/common/tools/GTTool.java
@@ -15,12 +15,12 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.api.damagesources.GT_DamageSources;
+import gregtech.api.damagesources.GTDamageSources;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public abstract class GT_Tool implements IToolStats {
+public abstract class GTTool implements IToolStats {
 
     public static final Enchantment[] FORTUNE_ENCHANTMENT = { Enchantment.fortune };
     public static final Enchantment[] LOOTING_ENCHANTMENT = { Enchantment.looting };
@@ -129,7 +129,7 @@ public abstract class GT_Tool implements IToolStats {
 
     @Override
     public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) {
-        return GT_DamageSources.getCombatDamage(
+        return GTDamageSources.getCombatDamage(
             (aPlayer instanceof EntityPlayer) ? "player" : "mob",
             aPlayer,
             (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null);
@@ -169,7 +169,7 @@ public abstract class GT_Tool implements IToolStats {
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/ToolAxe.java
index c54ebac3c9..03b761227c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/src/main/java/gregtech/common/tools/ToolAxe.java
@@ -14,13 +14,13 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Axe extends GT_Tool {
+public class ToolAxe extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -94,16 +94,16 @@ public class GT_Tool_Axe extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.wood)
-            || GT_ToolHarvestHelper.isSpecialBlock(aBlock, Blocks.ladder);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.wood)
+            || GTToolHarvestHelper.isSpecialBlock(aBlock, Blocks.ladder);
     }
 
     @Override
     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
         int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
         int rAmount = 0;
-        if ((GregTech_API.sTimber) && (!aPlayer.isSneaking())
+        if ((GregTechAPI.sTimber) && (!aPlayer.isSneaking())
             && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {
             int tY = aY + 1;
             for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) {
@@ -125,7 +125,7 @@ public class GT_Tool_Axe extends GT_Tool {
             && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))) {
             float rAmount = 1.0F;
             float tIncrement = 1.0F;
-            if ((GregTech_API.sTimber) && !aPlayer.isSneaking()) {
+            if ((GregTechAPI.sTimber) && !aPlayer.isSneaking()) {
                 int tY = aY + 1;
                 for (int tH = aPlayer.worldObj.getHeight(); (tY < tH)
                     && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++) {
@@ -149,18 +149,18 @@ public class GT_Tool_Axe extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex]
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];
+            ? MetaGeneratedTool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex]
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/src/main/java/gregtech/common/tools/ToolBranchCutter.java
index a8b83a0221..c9ad255a45 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/ToolBranchCutter.java
@@ -16,12 +16,12 @@ import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.api.util.GTUtility;
 
-public class GT_Tool_BranchCutter extends GT_Tool {
+public class ToolBranchCutter extends GTTool {
 
     @Override
     public float getBaseDamage() {
@@ -63,9 +63,9 @@ public class GT_Tool_BranchCutter extends GT_Tool {
             } else if (aBlock == Blocks.leaves2) {
                 aDrops.clear();
                 aDrops.add(new ItemStack(Blocks.sapling, 1, (aMetaData & 0x3) + 4));
-            } else if (aBlock == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("rubberLeaves", 1L))) {
+            } else if (aBlock == GTUtility.getBlockFromStack(GTModHandler.getIC2Item("rubberLeaves", 1L))) {
                 aDrops.clear();
-                aDrops.add(GT_ModHandler.getIC2Item("rubberSapling", 1L));
+                aDrops.add(GTModHandler.getIC2Item("rubberSapling", 1L));
             }
         }
         return 0;
@@ -73,8 +73,8 @@ public class GT_Tool_BranchCutter extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "grafter")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.leaves);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "grafter")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.leaves);
     }
 
     @Override
@@ -84,8 +84,8 @@ public class GT_Tool_BranchCutter extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java b/src/main/java/gregtech/common/tools/ToolButcheryKnife.java
index bdfe66401a..43323b8404 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java
+++ b/src/main/java/gregtech/common/tools/ToolButcheryKnife.java
@@ -11,9 +11,9 @@ import net.minecraft.util.IChatComponent;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_ButcheryKnife extends GT_Tool {
+public class ToolButcheryKnife extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -72,7 +72,7 @@ public class GT_Tool_ButcheryKnife extends GT_Tool {
 
     @Override
     public int[] getEnchantmentLevels(ItemStack aStack) {
-        return new int[] { (2 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2 };
+        return new int[] { (2 + MetaGeneratedTool.getPrimaryMaterial(aStack).mToolQuality) / 2 };
     }
 
     @Override
@@ -82,8 +82,8 @@ public class GT_Tool_ButcheryKnife extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java b/src/main/java/gregtech/common/tools/ToolBuzzSaw.java
index 4d7192ce93..7e62ab7bb4 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java
+++ b/src/main/java/gregtech/common/tools/ToolBuzzSaw.java
@@ -10,9 +10,9 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_BuzzSaw extends GT_Tool_Saw {
+public class ToolBuzzSaw extends ToolSaw {
 
     @Override
     public int getToolDamagePerContainerCraft() {
@@ -57,15 +57,15 @@ public class GT_Tool_BuzzSaw extends GT_Tool_Saw {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return !aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadBuzzSaw.mTextureIndex]
             : Textures.ItemIcons.HANDLE_BUZZSAW;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java b/src/main/java/gregtech/common/tools/ToolChainsawHV.java
index 38c1d3acb8..f2dc1df3bf 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java
+++ b/src/main/java/gregtech/common/tools/ToolChainsawHV.java
@@ -4,8 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Chainsaw_HV extends GT_Tool_Chainsaw_LV {
+public class ToolChainsawHV extends ToolChainsawLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -50,7 +51,7 @@ public class GT_Tool_Chainsaw_HV extends GT_Tool_Chainsaw_LV {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_HV;
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/ToolChainsawLV.java
index 142b0c50d2..ad47ae2cdc 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
+++ b/src/main/java/gregtech/common/tools/ToolChainsawLV.java
@@ -15,15 +15,15 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.IShearable;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
+public class ToolChainsawLV extends ToolSaw {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -99,8 +99,8 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
         super.onToolCrafted(aStack, aPlayer);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "brrrr");
-            GT_Mod.achievements.issueAchievement(aPlayer, "buildChainsaw");
+            GTMod.achievements.issueAchievement(aPlayer, "brrrr");
+            GTMod.achievements.issueAchievement(aPlayer, "buildChainsaw");
         } catch (Exception ignored) {}
     }
 
@@ -122,7 +122,7 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
                 aEvent.dropChance = 1.0F;
                 return 1;
             }
-        if ((GregTech_API.sTimber) && (!aPlayer.isSneaking())
+        if ((GregTechAPI.sTimber) && (!aPlayer.isSneaking())
             && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {
             int tY = aY + 1;
             for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) {
@@ -143,7 +143,7 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
             && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))) {
             float rAmount = 1.0F;
             float tIncrement = 1.0F;
-            if ((GregTech_API.sTimber) && !aPlayer.isSneaking()) {
+            if ((GregTechAPI.sTimber) && !aPlayer.isSneaking()) {
                 int tY = aY + 1;
                 for (int tH = aPlayer.worldObj.getHeight(); (tY < tH)
                     && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++) {
@@ -161,15 +161,15 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_LV;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java b/src/main/java/gregtech/common/tools/ToolChainsawMV.java
index 6c88895e48..48fc79f86d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java
+++ b/src/main/java/gregtech/common/tools/ToolChainsawMV.java
@@ -4,8 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Chainsaw_MV extends GT_Tool_Chainsaw_LV {
+public class ToolChainsawMV extends ToolChainsawLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -50,7 +51,7 @@ public class GT_Tool_Chainsaw_MV extends GT_Tool_Chainsaw_LV {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_MV;
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java b/src/main/java/gregtech/common/tools/ToolCrowbar.java
index 3db30faca1..db72d65a6d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java
+++ b/src/main/java/gregtech/common/tools/ToolCrowbar.java
@@ -13,11 +13,11 @@ import com.google.common.base.Strings;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.behaviors.Behaviour_Crowbar;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.MetaGeneratedTool01;
+import gregtech.common.items.behaviors.BehaviourCrowbar;
 
-public class GT_Tool_Crowbar extends GT_Tool {
+public class ToolCrowbar extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -96,8 +96,8 @@ public class GT_Tool_Crowbar extends GT_Tool {
         }
         String tTool = aBlock.getHarvestTool(aMetaData);
         if (Strings.isNullOrEmpty(tTool)) {
-            for (IToolStats i : GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values()) {
-                if (i instanceof GT_Tool_Crowbar && i != this && !i.isMinableBlock(aBlock, aMetaData)) {
+            for (IToolStats i : MetaGeneratedTool01.INSTANCE.mToolStats.values()) {
+                if (i instanceof ToolCrowbar && i != this && !i.isMinableBlock(aBlock, aMetaData)) {
                     return false;
                 }
             }
@@ -118,12 +118,12 @@ public class GT_Tool_Crowbar extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : null;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Crowbar(1, 1000));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourCrowbar(1, 1000));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java b/src/main/java/gregtech/common/tools/ToolDrillHV.java
index 597e8b0725..fb1d2b421a 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
+++ b/src/main/java/gregtech/common/tools/ToolDrillHV.java
@@ -3,11 +3,12 @@ package gregtech.common.tools;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Drill_HV extends GT_Tool_Drill_LV {
+public class ToolDrillHV extends ToolDrillLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -53,15 +54,15 @@ public class GT_Tool_Drill_HV extends GT_Tool_Drill_LV {
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
         super.onToolCrafted(aStack, aPlayer);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "highpowerdrill");
-            GT_Mod.achievements.issueAchievement(aPlayer, "buildDDrill");
+            GTMod.achievements.issueAchievement(aPlayer, "highpowerdrill");
+            GTMod.achievements.issueAchievement(aPlayer, "buildDDrill");
         } catch (Exception ignored) {}
     }
 
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_HV;
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java b/src/main/java/gregtech/common/tools/ToolDrillLV.java
index f06c2c812d..1c6dfd7de3 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
+++ b/src/main/java/gregtech/common/tools/ToolDrillLV.java
@@ -10,14 +10,14 @@ 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.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Drill_LV extends GT_Tool {
+public class ToolDrillLV extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -91,8 +91,8 @@ public class GT_Tool_Drill_LV extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe", "shovel")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe", "shovel")
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock,
                 Material.rock,
                 Material.iron,
@@ -113,19 +113,19 @@ public class GT_Tool_Drill_LV extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_LV;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
@@ -133,8 +133,8 @@ public class GT_Tool_Drill_LV extends GT_Tool {
         aPlayer.triggerAchievement(AchievementList.buildPickaxe);
         aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "driltime");
-            GT_Mod.achievements.issueAchievement(aPlayer, "buildDrill");
+            GTMod.achievements.issueAchievement(aPlayer, "driltime");
+            GTMod.achievements.issueAchievement(aPlayer, "buildDrill");
         } catch (Exception ignored) {}
     }
 
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java b/src/main/java/gregtech/common/tools/ToolDrillMV.java
index 7b6b54d4b5..b1694ee74d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java
+++ b/src/main/java/gregtech/common/tools/ToolDrillMV.java
@@ -4,8 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Drill_MV extends GT_Tool_Drill_LV {
+public class ToolDrillMV extends ToolDrillLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -50,7 +51,7 @@ public class GT_Tool_Drill_MV extends GT_Tool_Drill_LV {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_MV;
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_File.java b/src/main/java/gregtech/common/tools/ToolFile.java
index 0a8610a462..8e64dafdd2 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_File.java
+++ b/src/main/java/gregtech/common/tools/ToolFile.java
@@ -9,10 +9,10 @@ import net.minecraft.util.IChatComponent;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_File extends GT_Tool {
+public class ToolFile extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -86,7 +86,7 @@ public class GT_Tool_File extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "file");
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "file");
     }
 
     @Override
@@ -97,19 +97,19 @@ public class GT_Tool_File extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return !aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadFile.mTextureIndex]
             : Textures.ItemIcons.HANDLE_FILE;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java b/src/main/java/gregtech/common/tools/ToolHardHammer.java
index 066abd48b8..d26fe2b43d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java
+++ b/src/main/java/gregtech/common/tools/ToolHardHammer.java
@@ -1,6 +1,6 @@
 package gregtech.common.tools;
 
-import static gregtech.GT_Mod.MAX_IC2;
+import static gregtech.GTMod.MAX_IC2;
 
 import java.util.Arrays;
 import java.util.List;
@@ -17,17 +17,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.SoundResource;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.behaviors.Behaviour_Prospecting;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.behaviors.BehaviourProspecting;
 
-public class GT_Tool_HardHammer extends GT_Tool {
+public class ToolHardHammer extends GTTool {
 
     public static final List<String> mEffectiveList = Arrays
         .asList(EntityIronGolem.class.getName(), "EntityTowerGuardian");
@@ -123,8 +123,8 @@ public class GT_Tool_HardHammer extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "hammer", "pickaxe")
-            || GT_ToolHarvestHelper
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "hammer", "pickaxe")
+            || GTToolHarvestHelper
                 .isAppropriateMaterial(aBlock, Material.rock, Material.glass, Material.ice, Material.packedIce)
             || RecipeMaps.hammerRecipes.containsInput(new ItemStack(aBlock, 1, aMetaData));
     }
@@ -133,19 +133,19 @@ public class GT_Tool_HardHammer extends GT_Tool {
     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
         int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
         int rConversions = 0;
-        GT_Recipe tRecipe = RecipeMaps.hammerRecipes
+        GTRecipe tRecipe = RecipeMaps.hammerRecipes
             .findRecipe(null, true, MAX_IC2, null, new ItemStack(aBlock, 1, aMetaData));
         if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
             for (ItemStack tDrop : aDrops) {
                 tRecipe = RecipeMaps.hammerRecipes
-                    .findRecipe(null, true, MAX_IC2, null, GT_Utility.copyAmount(1, tDrop));
+                    .findRecipe(null, true, MAX_IC2, null, GTUtility.copyAmount(1, tDrop));
                 if (tRecipe != null) {
                     ItemStack tHammeringOutput = tRecipe.getOutput(0);
                     if (tHammeringOutput != null) {
                         rConversions += tDrop.stackSize;
                         tDrop.stackSize *= tHammeringOutput.stackSize;
                         tHammeringOutput.stackSize = tDrop.stackSize;
-                        GT_Utility.setStack(tDrop, tHammeringOutput);
+                        GTUtility.setStack(tDrop, tHammeringOutput);
                     }
                 }
             }
@@ -165,21 +165,21 @@ public class GT_Tool_HardHammer extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadHammer.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Prospecting(1, 1000));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourProspecting(1, 1000));
     }
 
     @Override
@@ -197,7 +197,7 @@ public class GT_Tool_HardHammer extends GT_Tool {
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
         super.onToolCrafted(aStack, aPlayer);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "tools");
+            GTMod.achievements.issueAchievement(aPlayer, "tools");
         } catch (Exception ignored) {}
     }
 }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java b/src/main/java/gregtech/common/tools/ToolHoe.java
index 2dc5496176..8c68d41b44 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java
+++ b/src/main/java/gregtech/common/tools/ToolHoe.java
@@ -11,11 +11,11 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Hoe;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourHoe;
 
-public class GT_Tool_Hoe extends GT_Tool {
+public class ToolHoe extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -84,8 +84,8 @@ public class GT_Tool_Hoe extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "hoe")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.gourd);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "hoe")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.gourd);
     }
 
     @Override
@@ -96,21 +96,21 @@ public class GT_Tool_Hoe extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool
+            ? MetaGeneratedTool
                 .getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadHoe.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Hoe(100));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourHoe(100));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/src/main/java/gregtech/common/tools/ToolJackHammer.java
index 7c8b17f711..6c46a4c9be 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java
+++ b/src/main/java/gregtech/common/tools/ToolJackHammer.java
@@ -12,15 +12,15 @@ 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.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.api.util.GTUtility;
 
-public class GT_Tool_JackHammer extends GT_Tool_Drill_LV {
+public class ToolJackHammer extends ToolDrillLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -64,8 +64,8 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe") //
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe") //
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock, //
                 Material.rock, //
                 Material.glass, //
@@ -78,19 +78,19 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV {
     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
         int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
         int rConversions = 0;
-        GT_Recipe tRecipe = RecipeMaps.hammerRecipes
+        GTRecipe tRecipe = RecipeMaps.hammerRecipes
             .findRecipe(null, true, 2147483647L, null, new ItemStack(aBlock, 1, aMetaData));
         if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
             for (ItemStack tDrop : aDrops) {
                 tRecipe = RecipeMaps.hammerRecipes
-                    .findRecipe(null, true, 2147483647L, null, GT_Utility.copyAmount(1, tDrop));
+                    .findRecipe(null, true, 2147483647L, null, GTUtility.copyAmount(1, tDrop));
                 if (tRecipe != null) {
                     ItemStack tHammeringOutput = tRecipe.getOutput(0);
                     if (tHammeringOutput != null) {
                         rConversions += tDrop.stackSize;
                         tDrop.stackSize *= tHammeringOutput.stackSize;
                         tHammeringOutput.stackSize = tDrop.stackSize;
-                        GT_Utility.setStack(tDrop, tHammeringOutput);
+                        GTUtility.setStack(tDrop, tHammeringOutput);
                     }
                 }
             }
@@ -106,7 +106,7 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV {
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
         super.onToolCrafted(aStack, aPlayer);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "hammertime");
+            GTMod.achievements.issueAchievement(aPlayer, "hammertime");
         } catch (Exception ignored) {}
     }
 
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java b/src/main/java/gregtech/common/tools/ToolKnife.java
index 152476fa2d..908a9daaad 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java
+++ b/src/main/java/gregtech/common/tools/ToolKnife.java
@@ -10,7 +10,7 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
-public class GT_Tool_Knife extends GT_Tool_Sword {
+public class ToolKnife extends ToolSword {
 
     @Override
     public int getToolDamagePerBlockBreak() {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java b/src/main/java/gregtech/common/tools/ToolMortar.java
index 8e74d3bcc1..e67e5924de 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java
+++ b/src/main/java/gregtech/common/tools/ToolMortar.java
@@ -10,9 +10,9 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Mortar extends GT_Tool {
+public class ToolMortar extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -101,11 +101,11 @@ public class GT_Tool_Mortar extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java b/src/main/java/gregtech/common/tools/ToolPickaxe.java
index b755869112..91be7dae29 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java
+++ b/src/main/java/gregtech/common/tools/ToolPickaxe.java
@@ -10,12 +10,12 @@ 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.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Pickaxe extends GT_Tool {
+public class ToolPickaxe extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -84,8 +84,8 @@ public class GT_Tool_Pickaxe extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe") //
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe") //
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock, //
                 Material.rock,
                 Material.iron,
@@ -101,20 +101,20 @@ public class GT_Tool_Pickaxe extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadPickaxe.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
@@ -122,7 +122,7 @@ public class GT_Tool_Pickaxe extends GT_Tool {
         aPlayer.triggerAchievement(AchievementList.buildPickaxe);
         aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "flintpick");
+            GTMod.achievements.issueAchievement(aPlayer, "flintpick");
         } catch (Exception ignored) {}
     }
 
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java b/src/main/java/gregtech/common/tools/ToolPlow.java
index b6f4be25b5..e0f25fa2f1 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java
+++ b/src/main/java/gregtech/common/tools/ToolPlow.java
@@ -17,10 +17,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Plow extends GT_Tool {
+public class ToolPlow extends GTTool {
 
     private final ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal<>();
 
@@ -37,8 +37,8 @@ public class GT_Tool_Plow extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "plow")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.snow, Material.craftedSnow);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "plow")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.snow, Material.craftedSnow);
     }
 
     @Override
@@ -85,16 +85,16 @@ public class GT_Tool_Plow extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadPlow.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java b/src/main/java/gregtech/common/tools/ToolPlunger.java
index 76c1ccbc24..f4dc8bd77d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
+++ b/src/main/java/gregtech/common/tools/ToolPlunger.java
@@ -11,14 +11,14 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.behaviors.Behaviour_Plunger_Fluid;
-import gregtech.common.items.behaviors.Behaviour_Plunger_Item;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.behaviors.BehaviourPlungerFluid;
+import gregtech.common.items.behaviors.BehaviourPlungerItem;
 
-public class GT_Tool_Plunger extends GT_Tool {
+public class ToolPlunger extends GTTool {
 
     @Override
     public float getBaseDamage() {
@@ -47,7 +47,7 @@ public class GT_Tool_Plunger extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "plunger");
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "plunger");
     }
 
     @Override
@@ -57,24 +57,24 @@ public class GT_Tool_Plunger extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
     @SuppressWarnings("unchecked") // the IItemBehaviour cast cannot be expressed strictly via generics
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Plunger_Item(getToolDamagePerDropConversion()));
-        aItem.addItemBehavior(aID, new Behaviour_Plunger_Fluid(getToolDamagePerDropConversion()));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourPlungerItem(getToolDamagePerDropConversion()));
+        aItem.addItemBehavior(aID, new BehaviourPlungerFluid(getToolDamagePerDropConversion()));
         try {
-            Object tObject = GT_Utility.callConstructor(
+            Object tObject = GTUtility.callConstructor(
                 "gregtech.common.items.behaviors.Behaviour_Plunger_Essentia",
                 0,
                 null,
                 false,
                 getToolDamagePerDropConversion());
             if ((tObject instanceof IItemBehaviour)) {
-                aItem.addItemBehavior(aID, (IItemBehaviour<GT_MetaBase_Item>) tObject);
+                aItem.addItemBehavior(aID, (IItemBehaviour<MetaBaseItem>) tObject);
             }
         } catch (Throwable ignored) {}
     }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java b/src/main/java/gregtech/common/tools/ToolRollingPin.java
index 9933c4eb13..1af17f3072 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java
+++ b/src/main/java/gregtech/common/tools/ToolRollingPin.java
@@ -10,9 +10,9 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_RollingPin extends GT_Tool {
+public class ToolRollingPin extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -46,11 +46,11 @@ public class GT_Tool_RollingPin extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java b/src/main/java/gregtech/common/tools/ToolSaw.java
index b2c85e2a5e..ca1ec81b13 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java
+++ b/src/main/java/gregtech/common/tools/ToolSaw.java
@@ -17,10 +17,10 @@ import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Saw extends GT_Tool {
+public class ToolSaw extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -102,8 +102,8 @@ public class GT_Tool_Saw extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe", "saw")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe", "saw")
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock,
                 Material.leaves,
                 Material.vine,
@@ -111,7 +111,7 @@ public class GT_Tool_Saw extends GT_Tool {
                 Material.cactus,
                 Material.ice,
                 Material.packedIce)
-            || GT_ToolHarvestHelper.isSpecialBlock(aBlock, Blocks.ladder);
+            || GTToolHarvestHelper.isSpecialBlock(aBlock, Blocks.ladder);
     }
 
     @Override
@@ -122,19 +122,19 @@ public class GT_Tool_Saw extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool
+            ? MetaGeneratedTool
                 .getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadSaw.mTextureIndex]
             : Textures.ItemIcons.HANDLE_SAW;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/ToolScoop.java
index 3181e108bf..6f740da95e 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
+++ b/src/main/java/gregtech/common/tools/ToolScoop.java
@@ -12,12 +12,12 @@ import net.minecraft.util.IChatComponent;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_None;
-import gregtech.common.items.behaviors.Behaviour_Scoop;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourNone;
+import gregtech.common.items.behaviors.BehaviourScoop;
 
-public class GT_Tool_Scoop extends GT_Tool {
+public class ToolScoop extends GTTool {
 
     public static Material sBeeHiveMaterial;
 
@@ -88,8 +88,8 @@ public class GT_Tool_Scoop extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "scoop")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, sBeeHiveMaterial);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "scoop")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, sBeeHiveMaterial);
     }
 
     @Override
@@ -104,16 +104,16 @@ public class GT_Tool_Scoop extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         if (Forestry.isModLoaded()) {
-            aItem.addItemBehavior(aID, new Behaviour_Scoop(200));
+            aItem.addItemBehavior(aID, new BehaviourScoop(200));
         } else {
-            aItem.addItemBehavior(aID, new Behaviour_None());
+            aItem.addItemBehavior(aID, new BehaviourNone());
         }
     }
 
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java b/src/main/java/gregtech/common/tools/ToolScrewdriver.java
index 1d7f4e655d..b73f1371aa 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java
+++ b/src/main/java/gregtech/common/tools/ToolScrewdriver.java
@@ -18,11 +18,11 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Screwdriver;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourScrewdriver;
 
-public class GT_Tool_Screwdriver extends GT_Tool {
+public class ToolScrewdriver extends GTTool {
 
     public static final List<String> mEffectiveList = Arrays.asList(
         EntityCaveSpider.class.getName(),
@@ -118,8 +118,8 @@ public class GT_Tool_Screwdriver extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "screwdriver")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.circuits);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "screwdriver")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.circuits);
     }
 
     @Override
@@ -130,20 +130,20 @@ public class GT_Tool_Screwdriver extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return !aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadScrewdriver.mTextureIndex]
             : Textures.ItemIcons.HANDLE_SCREWDRIVER;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Screwdriver(1, 200));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourScrewdriver(1, 200));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver_LV.java b/src/main/java/gregtech/common/tools/ToolScrewdriverLV.java
index e49e020b7b..31a4ffaad2 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver_LV.java
+++ b/src/main/java/gregtech/common/tools/ToolScrewdriverLV.java
@@ -4,9 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Screwdriver_LV extends GT_Tool_Screwdriver {
+public class ToolScrewdriverLV extends ToolScrewdriver {
 
     @Override
     public float getMaxDurabilityMultiplier() {
@@ -21,14 +21,14 @@ public class GT_Tool_Screwdriver_LV extends GT_Tool_Screwdriver {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return !aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadScrewdriver.mTextureIndex]
             : Textures.ItemIcons.HANDLE_ELECTRIC_SCREWDRIVER;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java b/src/main/java/gregtech/common/tools/ToolSense.java
index 013c0f800c..55a3882db5 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java
+++ b/src/main/java/gregtech/common/tools/ToolSense.java
@@ -15,11 +15,11 @@ import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Sense;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourSense;
 
-public class GT_Tool_Sense extends GT_Tool {
+public class ToolSense extends GTTool {
 
     private final ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal<>();
 
@@ -35,8 +35,8 @@ public class GT_Tool_Sense extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "sense", "scythe")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.plants, Material.leaves);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "sense", "scythe")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.plants, Material.leaves);
     }
 
     @Override
@@ -83,21 +83,21 @@ public class GT_Tool_Sense extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadSense.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Sense(getToolDamagePerBlockBreak()));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourSense(getToolDamagePerBlockBreak()));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java b/src/main/java/gregtech/common/tools/ToolShovel.java
index 886ca126e0..d4676efeed 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java
+++ b/src/main/java/gregtech/common/tools/ToolShovel.java
@@ -9,10 +9,10 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Shovel extends GT_Tool {
+public class ToolShovel extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -81,8 +81,8 @@ public class GT_Tool_Shovel extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "shovel")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "shovel")
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock,
                 Material.sand,
                 Material.grass,
@@ -99,20 +99,20 @@ public class GT_Tool_Shovel extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadShovel.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java b/src/main/java/gregtech/common/tools/ToolSoftHammer.java
index cc3f5e738b..0cd3aa2eac 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java
+++ b/src/main/java/gregtech/common/tools/ToolSoftHammer.java
@@ -10,11 +10,11 @@ import net.minecraft.util.IChatComponent;
 
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_SoftHammer;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourSoftHammer;
 
-public class GT_Tool_SoftHammer extends GT_Tool {
+public class ToolSoftHammer extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -98,7 +98,7 @@ public class GT_Tool_SoftHammer extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "softhammer");
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "softhammer");
     }
 
     @Override
@@ -109,21 +109,21 @@ public class GT_Tool_SoftHammer extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadMallet.mTextureIndex]
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(
+            : MetaGeneratedTool.getSecondaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.handleMallet.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_SoftHammer(100));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourSoftHammer(100));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java b/src/main/java/gregtech/common/tools/ToolSolderingIron.java
index 9b5ef3a638..9ae4fade4c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java
+++ b/src/main/java/gregtech/common/tools/ToolSolderingIron.java
@@ -18,11 +18,11 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Screwdriver;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourScrewdriver;
 
-public class GT_Tool_Soldering_Iron extends GT_Tool {
+public class ToolSolderingIron extends GTTool {
 
     public static final List<String> mEffectiveList = Arrays.asList(
         EntityCaveSpider.class.getName(),
@@ -113,8 +113,8 @@ public class GT_Tool_Soldering_Iron extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "soldering_iron")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.circuits);
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "soldering_iron")
+            || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.circuits);
     }
 
     @Override
@@ -124,19 +124,19 @@ public class GT_Tool_Soldering_Iron extends GT_Tool {
 
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[49]
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mIconSet.mTextures[49]
             : Textures.ItemIcons.HANDLE_SOLDERING;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Screwdriver(1, 200));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourScrewdriver(1, 200));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sword.java b/src/main/java/gregtech/common/tools/ToolSword.java
index 7bfaaee797..03c76f92c6 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Sword.java
+++ b/src/main/java/gregtech/common/tools/ToolSword.java
@@ -8,10 +8,10 @@ import net.minecraft.stats.AchievementList;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_Sword extends GT_Tool {
+public class ToolSword extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -85,8 +85,8 @@ public class GT_Tool_Sword extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "sword")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "sword")
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock,
                 Material.leaves,
                 Material.gourd,
@@ -109,15 +109,15 @@ public class GT_Tool_Sword extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return !aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadSword.mTextureIndex]
             : Textures.ItemIcons.HANDLE_SWORD;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine.java b/src/main/java/gregtech/common/tools/ToolTurbine.java
index daaf2c4438..ace22b06ba 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine.java
+++ b/src/main/java/gregtech/common/tools/ToolTurbine.java
@@ -8,9 +8,9 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public abstract class GT_Tool_Turbine extends GT_Tool {
+public abstract class ToolTurbine extends GTTool {
 
     @Override
     public abstract float getBaseDamage();
@@ -27,7 +27,7 @@ public abstract class GT_Tool_Turbine extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : null;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java b/src/main/java/gregtech/common/tools/ToolTurbineHuge.java
index 46b0de72d9..94b85f0d5c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java
+++ b/src/main/java/gregtech/common/tools/ToolTurbineHuge.java
@@ -3,7 +3,7 @@ package gregtech.common.tools;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
-public class GT_Tool_Turbine_Huge extends GT_Tool_Turbine {
+public class ToolTurbineHuge extends ToolTurbine {
 
     @Override
     public float getSpeedMultiplier() {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java b/src/main/java/gregtech/common/tools/ToolTurbineLarge.java
index 7e8307f6b0..59b6a3afe1 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java
+++ b/src/main/java/gregtech/common/tools/ToolTurbineLarge.java
@@ -3,7 +3,7 @@ package gregtech.common.tools;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
-public class GT_Tool_Turbine_Large extends GT_Tool_Turbine {
+public class ToolTurbineLarge extends ToolTurbine {
 
     @Override
     public float getSpeedMultiplier() {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java b/src/main/java/gregtech/common/tools/ToolTurbineNormal.java
index ac2fc29a89..33328db96e 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java
+++ b/src/main/java/gregtech/common/tools/ToolTurbineNormal.java
@@ -3,7 +3,7 @@ package gregtech.common.tools;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
-public class GT_Tool_Turbine_Normal extends GT_Tool_Turbine {
+public class ToolTurbineNormal extends ToolTurbine {
 
     @Override
     public float getSpeedMultiplier() {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java b/src/main/java/gregtech/common/tools/ToolTurbineSmall.java
index fab527386e..8313ed1818 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java
+++ b/src/main/java/gregtech/common/tools/ToolTurbineSmall.java
@@ -3,7 +3,7 @@ package gregtech.common.tools;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 
-public class GT_Tool_Turbine_Small extends GT_Tool_Turbine {
+public class ToolTurbineSmall extends ToolTurbine {
 
     @Override
     public float getSpeedMultiplier() {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java b/src/main/java/gregtech/common/tools/ToolUniversalSpade.java
index 184d506872..9333e1f19c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java
+++ b/src/main/java/gregtech/common/tools/ToolUniversalSpade.java
@@ -10,13 +10,13 @@ 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.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Crowbar;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourCrowbar;
 
-public class GT_Tool_UniversalSpade extends GT_Tool {
+public class ToolUniversalSpade extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -90,8 +90,8 @@ public class GT_Tool_UniversalSpade extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "shovel", "axe", "saw", "sword", "crowbar")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "shovel", "axe", "saw", "sword", "crowbar")
+            || GTToolHarvestHelper.isAppropriateMaterial(
                 aBlock,
                 Material.sand,
                 Material.grass,
@@ -121,21 +121,21 @@ public class GT_Tool_UniversalSpade extends GT_Tool {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadUniversalSpade.mTextureIndex]
-            : GT_MetaGenerated_Tool
+            : MetaGeneratedTool
                 .getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Crowbar(2, 2000));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourCrowbar(2, 2000));
     }
 
     @Override
@@ -143,7 +143,7 @@ public class GT_Tool_UniversalSpade extends GT_Tool {
         super.onToolCrafted(aStack, aPlayer);
         aPlayer.triggerAchievement(AchievementList.buildSword);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
+            GTMod.achievements.issueAchievement(aPlayer, "unitool");
         } catch (Exception ignored) {}
     }
 
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java b/src/main/java/gregtech/common/tools/ToolWireCutter.java
index 54b76e6d81..6009504d80 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java
+++ b/src/main/java/gregtech/common/tools/ToolWireCutter.java
@@ -10,10 +10,10 @@ import net.minecraft.util.IChatComponent;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
 
-public class GT_Tool_WireCutter extends GT_Tool {
+public class ToolWireCutter extends GTTool {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -82,7 +82,7 @@ public class GT_Tool_WireCutter extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "cutter");
+        return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "cutter");
     }
 
     @Override
@@ -97,12 +97,12 @@ public class GT_Tool_WireCutter extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
 
     @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java b/src/main/java/gregtech/common/tools/ToolWrench.java
index fbca109f21..3d2adf4896 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
+++ b/src/main/java/gregtech/common/tools/ToolWrench.java
@@ -1,6 +1,6 @@
 package gregtech.common.tools;
 
-import static gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial;
+import static gregtech.api.items.MetaGeneratedTool.getPrimaryMaterial;
 
 import java.util.Arrays;
 import java.util.List;
@@ -30,13 +30,13 @@ import appeng.util.Platform;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.common.items.behaviors.Behaviour_Switch_Mode;
-import gregtech.common.items.behaviors.Behaviour_Wrench;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.common.items.behaviors.BehaviourSwitchMode;
+import gregtech.common.items.behaviors.BehaviourWrench;
 import ic2.api.tile.IWrenchable;
 
-public class GT_Tool_Wrench extends GT_Tool {
+public class ToolWrench extends GTTool {
 
     public static final List<String> mEffectiveList = Arrays
         .asList(EntityIronGolem.class.getName(), "EntityTowerGuardian");
@@ -127,12 +127,12 @@ public class GT_Tool_Wrench extends GT_Tool {
 
     @Override
     public boolean isMinableBlock(Block block, byte aMetaData) {
-        return GT_ToolHarvestHelper.isAppropriateTool(block, aMetaData, "wrench")
-            || GT_ToolHarvestHelper.isAppropriateMaterial(block, Material.piston)
+        return GTToolHarvestHelper.isAppropriateTool(block, aMetaData, "wrench")
+            || GTToolHarvestHelper.isAppropriateMaterial(block, Material.piston)
             || block instanceof AEBaseTileBlock
-            || GT_ToolHarvestHelper.isSpecialBlock(block, Blocks.crafting_table, Blocks.bookshelf)
-            || Behaviour_Wrench.isVanillaRotatable(block)
-            || GT_ToolHarvestHelper.isIC2Wrenchable(block);
+            || GTToolHarvestHelper.isSpecialBlock(block, Blocks.crafting_table, Blocks.bookshelf)
+            || BehaviourWrench.isVanillaRotatable(block)
+            || GTToolHarvestHelper.isIC2Wrenchable(block);
     }
 
     @Override
@@ -151,9 +151,9 @@ public class GT_Tool_Wrench extends GT_Tool {
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Mode());
-        aItem.addItemBehavior(aID, new Behaviour_Wrench(100));
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourSwitchMode());
+        aItem.addItemBehavior(aID, new BehaviourWrench(100));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_HV.java b/src/main/java/gregtech/common/tools/ToolWrenchHV.java
index 7a7c725f8f..f8e9e11244 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_HV.java
+++ b/src/main/java/gregtech/common/tools/ToolWrenchHV.java
@@ -4,9 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Wrench_HV extends GT_Tool_Wrench_LV {
+public class ToolWrenchHV extends ToolWrenchLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -56,14 +56,14 @@ public class GT_Tool_Wrench_HV extends GT_Tool_Wrench_LV {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadWrench.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_HV;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_LV.java b/src/main/java/gregtech/common/tools/ToolWrenchLV.java
index 5f82a7d5b1..69e9b9f230 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_LV.java
+++ b/src/main/java/gregtech/common/tools/ToolWrenchLV.java
@@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Wrench_LV extends GT_Tool_Wrench {
+public class ToolWrenchLV extends ToolWrench {
 
     @Override
     public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
@@ -64,14 +64,14 @@ public class GT_Tool_Wrench_LV extends GT_Tool_Wrench {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadWrench.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_LV;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_MV.java b/src/main/java/gregtech/common/tools/ToolWrenchMV.java
index cc5b649647..e1f1cf223d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_MV.java
+++ b/src/main/java/gregtech/common/tools/ToolWrenchMV.java
@@ -4,9 +4,9 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 
-public class GT_Tool_Wrench_MV extends GT_Tool_Wrench_LV {
+public class ToolWrenchMV extends ToolWrenchLV {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -56,14 +56,14 @@ public class GT_Tool_Wrench_MV extends GT_Tool_Wrench_LV {
     @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead
-            ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+            ? MetaGeneratedTool.getPrimaryMaterial(
                 aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadWrench.mTextureIndex]
             : Textures.ItemIcons.POWER_UNIT_MV;
     }
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-            : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+            : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_BranchCutter.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketBranchCutter.java
index b831306df9..a1bf6d9c8b 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketBranchCutter.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_BranchCutter;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolBranchCutter;
 
-public class GT_Tool_Pocket_BranchCutter extends GT_Tool_BranchCutter {
+public class ToolPocketBranchCutter extends ToolBranchCutter {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_BranchCutter(int aSwitchIndex) {
+    public ToolPocketBranchCutter(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_BranchCutter extends GT_Tool_BranchCutter {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_File.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketFile.java
index 84372b1d98..cd598437ab 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_File.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketFile.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_File;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolFile;
 
-public class GT_Tool_Pocket_File extends GT_Tool_File {
+public class ToolPocketFile extends ToolFile {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_File(int aSwitchIndex) {
+    public ToolPocketFile(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_File extends GT_Tool_File {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Knife.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketKnife.java
index 2b43984c51..9dd2492a89 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Knife.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketKnife.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_Knife;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolKnife;
 
-public class GT_Tool_Pocket_Knife extends GT_Tool_Knife {
+public class ToolPocketKnife extends ToolKnife {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Knife(int aSwitchIndex) {
+    public ToolPocketKnife(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_Knife extends GT_Tool_Knife {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Multitool.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketMultitool.java
index 16ab9229c6..e55671d486 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Multitool.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketMultitool.java
@@ -5,15 +5,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.GTTool;
 
-public class GT_Tool_Pocket_Multitool extends GT_Tool {
+public class ToolPocketMultitool extends GTTool {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Multitool(int aSwitchIndex) {
+    public ToolPocketMultitool(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -29,13 +29,13 @@ public class GT_Tool_Pocket_Multitool extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Saw.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketSaw.java
index 579f809f2a..4f73109d59 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Saw.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketSaw.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_Saw;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolSaw;
 
-public class GT_Tool_Pocket_Saw extends GT_Tool_Saw {
+public class ToolPocketSaw extends ToolSaw {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Saw(int aSwitchIndex) {
+    public ToolPocketSaw(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_Saw extends GT_Tool_Saw {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Screwdriver.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketScrewdriver.java
index ce04ba2d15..f4a53ed6f6 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Screwdriver.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketScrewdriver.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_Screwdriver;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolScrewdriver;
 
-public class GT_Tool_Pocket_Screwdriver extends GT_Tool_Screwdriver {
+public class ToolPocketScrewdriver extends ToolScrewdriver {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Screwdriver(int aSwitchIndex) {
+    public ToolPocketScrewdriver(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_Screwdriver extends GT_Tool_Screwdriver {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_WireCutter.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketWireCutter.java
index 6907ff6735..5dcd03c53b 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_WireCutter.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketWireCutter.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_WireCutter;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolWireCutter;
 
-public class GT_Tool_Pocket_WireCutter extends GT_Tool_WireCutter {
+public class ToolPocketWireCutter extends ToolWireCutter {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_WireCutter(int aSwitchIndex) {
+    public ToolPocketWireCutter(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_WireCutter extends GT_Tool_WireCutter {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }